diff --git a/.appveyor.yml b/.appveyor.yml
index 39a64f6d13efe..2ed100c749580 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -96,7 +96,6 @@ install:
     - appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
     - cd C:\projects\joomla-cms
     - appveyor-retry composer install --no-progress --profile
-    - appveyor-retry composer update joomla/test-unit --no-progress --profile
 before_test:
 #  Database setup for MySQL via PowerShell tools
   - >
@@ -113,4 +112,4 @@ before_test:
 
 test_script:
   - cd C:\projects\joomla-cms
-  - libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist
+  - libraries/vendor/bin/phpunit
diff --git a/.drone.yml b/.drone.yml
index de3758236c4e2..04370afd1bd4e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,10 +23,9 @@ pipeline:
     image: joomlaprojects/docker-tools:develop
     commands:
       - composer install --no-progress --no-suggest
-      # needed for unit testing
-      - composer update joomla/test-unit --no-progress --no-suggest
       # needed for system testing
       - composer update joomla/test-system --no-progress --no-suggest
+      - composer update joomla/test-api --no-progress --no-suggest
       - composer update joomla-projects/selenium-server-standalone --no-progress --no-suggest
       - composer update joomla-projects/joomla-browser --no-progress --no-suggest
       - npm install --unsafe-perm
@@ -44,19 +43,19 @@ pipeline:
     group: unit
     image: joomlaprojects/docker-php70:develop
     commands:
-      - ./libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist
+      - ./libraries/vendor/bin/phpunit
 
   php71-unit:
     group: unit
     image: joomlaprojects/docker-php71:develop
     commands:
-      - ./libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist
+      - ./libraries/vendor/bin/phpunit
 
   php72-unit:
     group: unit
     image: joomlaprojects/docker-php72:develop
     commands:
-      - ./libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist
+      - ./libraries/vendor/bin/phpunit
 
   javascript-cs:
     image: joomlaprojects/docker-systemtests:develop
@@ -65,7 +64,7 @@ pipeline:
       - Xvfb -screen 0 1024x768x24 -ac +extension GLX +render -noreset > /dev/null 2>&1 &
       - sleep 3
       - fluxbox  > /dev/null 2>&1 &
-      - cd /drone/src/github.com/joomla/joomla-cms && npm run lint:js
+      - npm run lint:js
 
   javascript-tests:
     image: joomlaprojects/docker-systemtests:develop
@@ -81,8 +80,13 @@ pipeline:
       commands:
         - bash libraries/vendor/joomla/test-system/src/drone-run.sh "$(pwd)"
 
+  api-tests:
+    image: joomlaprojects/docker-systemtests:latest
+    commands:
+      - bash libraries/vendor/joomla/test-api/drone-run.sh "$(pwd)"
+
   analysis3x:
-      image: rips/rips-cli
+      image: rips/rips-cli:1.2.1
       secrets:  [rips_username, rips_password]
       when:
         branch: staging
@@ -91,10 +95,10 @@ pipeline:
         - export RIPS_USERNAME=$RIPS_USERNAME
         - export RIPS_PASSWORD=$RIPS_PASSWORD
         - if [ $DRONE_REPO_OWNER != 'joomla' ]; then echo "The analysis check only run on the main repos"; exit 0; fi
-        - rips-cli rips:scan:start -a 1 -t 1 -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
+        - rips-cli rips:scan:start -a 1 -t 1 -R -k -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
 
   analysis4x:
-    image: rips/rips-cli
+    image: rips/rips-cli:1.2.1
     secrets:  [rips_username, rips_password]
     when:
       branch: 4.0-dev
@@ -103,7 +107,7 @@ pipeline:
       - export RIPS_USERNAME=$RIPS_USERNAME
       - export RIPS_PASSWORD=$RIPS_PASSWORD
       - if [ $DRONE_REPO_OWNER != 'joomla' ]; then echo "The analysis check only run on the main repos"; exit 0; fi
-      - rips-cli rips:scan:start -a 3 -t 1 -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
+      - rips-cli rips:scan:start -a 3 -t 1 -R -k -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
 
 branches:
   exclude: [ l10n_* ]
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000..287896868eaa4
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+indent_style = tab
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/.eslintignore b/.eslintignore
index bb3c737a70835..0948100b4106f 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,6 +1,16 @@
 # A list of files to ignore from linting
-# TODO: Fix the webcomponents codestyle then also allow linting on them
 *.js
 !*.es6.js
 administrator/components/com_media/node_modules/uri-js/node_modules/punycode/punycode.es6.js
+media
 *.vue
+# TODO: Fix the webcomponents codestyle then also allow linting on them
+joomla-editor-codemirror.w-c.es6.js
+joomla-field-fancy-select.w-c.es6.js
+joomla-field-module-order.w-c.es6.js
+joomla-field-permissions.w-c.es6.js
+joomla-field-send-test-mail.w-c.es6.js
+joomla-field-simple-color.w-c.es6.js
+joomla-field-subform.w-c.es6.js
+joomla-field-switcher.w-c.es6.js
+# End of TODO
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a26c804e9aa8c..a11b0d0ab7de0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -57,7 +57,7 @@ RoboFile.php  @rdeutz
 travis-phpunit.xml  @rdeutz
 
 # Core JS
-media/*/js/*  @dgt41
+media/*/js/*  @dgrammatiko
 
 # CSP Tooling
 plugins/system/httpheaders/*  @zero-24
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index caf403a10e050..3e1635228df47 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -19,6 +19,6 @@ There are other branches available which serve specific purposes.
 
 | Branch | Purpose |
 | ------ | ------- |
-| staging | Current codebase. Branch for the next minor Joomla version. New backward compatible features go into this branch. |
-| 3.9-dev | Branch for the next minor Joomla version. The 3.9.0 release will only include compatibility features for 4.0. Commits to staging will be applied to this branch as well. |
+| staging | Current codebase. Branch for the next minor Joomla version. New backward compatible features go into this branch. The 3.9.0 release will include the Privacy Tools Suite features. |
+| 3.10-dev | Branch for the next minor Joomla version. The 3.10.0 release will only include compatibility features for 4.0. Commits to staging will be applied to this branch as well. |
 | 4.0-dev | Branch for the next major Joomla version. New features go into this branch. Commits to staging will be applied to this branch as well. |
diff --git a/.github/ISSUE_TEMPLATE/Security.md b/.github/ISSUE_TEMPLATE/Security.md
new file mode 100644
index 0000000000000..d7ff7ea26e670
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Security.md
@@ -0,0 +1,11 @@
+---
+name: Security
+about: Report a security issue
+
+---
+
+Security issues should **NOT** be reported on this repository.
+
+If you believe you have found a security issue, please contact the Joomla Security Strike Team via email at security@joomla.org or through the contact form at https://developer.joomla.org/security/contact-the-team.html.
+
+Please see https://developer.joomla.org/security.html for more information on how the Joomla project responds to security issues.
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
index 1f4c40264b859..0de43064ffe21 100644
--- a/.github/SUPPORT.md
+++ b/.github/SUPPORT.md
@@ -1,8 +1,8 @@
 Where can you get support and help?
 ====================
-* [The Joomla! Documentation](https://docs.joomla.org/Special:MyLanguage/Main_Page);
-* [Frequently Asked Questions](https://docs.joomla.org/Special:MyLanguage/Category:FAQ) (FAQ);
-* Find the [information you need](https://docs.joomla.org/Special:MyLanguage/Start_here);
-* Find [help and other users](https://www.joomla.org/about-joomla/create-and-share.html);
-* Post questions at [our forums](https://forum.joomla.org);
+* [The Joomla! Documentation](https://docs.joomla.org/Special:MyLanguage/Main_Page).
+* [Frequently Asked Questions](https://docs.joomla.org/Special:MyLanguage/Category:FAQ) (FAQ).
+* Find the [information you need](https://docs.joomla.org/Special:MyLanguage/Start_here).
+* Find [help and other users](https://www.joomla.org/about-joomla/create-and-share.html).
+* Post questions at [our forums](https://forum.joomla.org).
 * [Joomla Resources Directory](https://resources.joomla.org) (JRD).
diff --git a/.gitignore b/.gitignore
index 875e93f47524e..89f7804d40967 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 # IDE & System Related Files #
 .buildpath
-.editorconfig
 .project
 .settings
 .DS_Store
diff --git a/.travis.yml b/.travis.yml
index 1f4feb5c9a4d4..96e849aa76a2c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ before_script:
   - composer install --ignore-platform-reqs
 
 script:
-  - libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist
+  - libraries/vendor/bin/phpunit
 
 branches:
   except:
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000000..990fc7493fc7f
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,62 @@
+# Joomla Contributor Covenant Code of Conduct
+
+This document outlines the Code of Conduct for all persons volunteering their service to the Joomla Project and/or Open Source Matters. It covers your behaviour as a member of the Joomla community, in any forum, mailing list, Wiki, Web site, IRC channel, install-fest, public meeting or private correspondence. 
+
+If you cannot agree to any of these principles, then volunteering in the Joomla Project is not for you. Contributing to our community assumes acceptance of these principles:
+## Be Considerate
+
+You are working with others as a team so be considerate of how your actions or contribution affects your colleagues and the community as a whole.
+## Be Respectful
+
+Treat one another and members of the community with respect. Everyone can make a valuable contribution to Joomla. We may not always agree, but disagreement is no excuse for poor behavior or poor manners.
+
+We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It's important to remember that a community where people feel uncomfortable or threatened is not a productive one. We expect the members of Joomla community to be respectful when dealing with other volunteers as well as with people from outside projects and initiatives and with users.
+
+Avoid becoming involved in flame wars, trolling, personal attacks, and repetitive arguments. Take the matters "outside" (off-list, etc) if it helps resolve the situation, and do not use communal methods of communication to be a vehicle for your private "wall of shame."
+## Be Collaborative
+
+Joomla is free software and about collaboration and working together. Collaboration reduces redundancy of work done in the free software world, and improves the quality of the software produced regardless of whether you are writing code or performing some other task.
+
+When you disagree, consult others. Disagreements, both political and technical, happen all the time, and Joomla is no exception. Disagreement, debate and constructive criticism is often how progress is made and are a necessary part of doing complex work in a team.
+
+The important goal is not to avoid disagreements or differing views but to resolve them constructively. Above all, avoid making conflicts about the work into personal conflicts. Debate should never include reference to someone's nationality, gender, religion or other personal characteristics.
+
+You should turn to the community and to the community process to seek advice and to resolve disagreements. Team leaders and Department Coordinators are able to help you figure out which direction will be most acceptable.
+
+When you are unsure, ask for help. Nobody knows everything and nobody is expected to be perfect. Asking questions avoids many problems down the road and so questions are encouraged. Those who are asked should be responsive and helpful. However, when asking a question, care must be taken to do so in an appropriate forum. Off-topic questions, such as requests for help on a development mailing list, detract from productive discussion.
+## Step Down Considerately
+
+People on every project come and go, and Joomla is no different. When you leave or disengage from the community, in whole or in part, we ask that you do so in a way that minimizes disruption to the Project. This means you should tell people you are leaving and take the proper steps to ensure that others can pick up where you leave off.
+## Be Available
+
+Check your e-mails regularly and answer them promptly—even if it's "I'll get back to you."
+## Be Honest
+
+Sometimes the hardest thing to say is "no" or admit you've forgotten do something. Be honest with each other and yourself with regards to what you say and what you can realistically commit to.
+## Follow the Rules
+
+Volunteers are expected to uphold Joomla's licensing and trademark requirements including, but not limited to, compliance on their own or affiliate Web sites and extensions. Make sure you have sought the appropriate approvals for domain name, name and logo usage prior to volunteering and that any extensions you distribute comply with the Joomla license.
+
+All work contributed to the Project, whether code, documentation or other material, must observe the appropriate licenses as set down by the Core Team and Open Source Matters.
+
+Some contributors represent the Joomla Project in specific areas, but you should not speak on behalf of the Project or present yourself as an official representative of the Project unless you are specifically authorized to do so, and you should never state your opinions as the official policies of the Project.
+## Exercise Discretion and Confidentiality at Appropriate Times
+
+Depending on your role, you will be privy to various levels of information. As a volunteer you are expected to keep site access details (such as logins, FTP details, etc.) secure at all times.
+
+Information contained within private forums (for example, about serious security matters, legal cases, or personal details), private mailing lists, chats or other mediums is also to be kept confidential even after you have discontinued your service. Breaches in the area of privacy and confidentiality are taken very seriously by the Project.
+## Conflict of Interest
+
+When using Project resources or making decisions within the board, your department, team, or subteam or the concerning Project's policy positions, you must do so based only on the best interests of the Project and its user community. If you have a situation or affiliation that might constitute or lead to a conflict of interest or might be perceived by a reasonable person in the community to be a conflict of interest, disclose this to your Team Leaders or the team as a whole. If appropriate, after discussing with your team, you should remove yourself from specific decisions or discussions in which you may have a conflict of interest.
+## Conflict Resolution Team
+
+Should you wish to make a CoC violation report or are facing a conflict that has failed to be resolved in the manner set out in this CoC, please [click here](https://docs.google.com/forms/d/e/1FAIpQLSea_VL9NUvUM3iX-gptNuJe5oz5-jp9y5Y4v9ZyKImblfYTcQ/viewform) to access the report form.
+## The Fine Print
+
+Members of the board of Open Source Matters are governed by additional guidelines and requirements and, where a conflict exists, these take precedence over this Code of Conduct.
+## The Last Bit
+
+This Code of Conduct has changed over time and will continue to develop, but was originally derived, with permission, from the Ubuntu CoC.
+
+Last Updated 8th of June 2017
+Online version of this document is available at https://www.joomla.org/about-joomla/the-project/code-of-conduct.html 
diff --git a/README.md b/README.md
index 962f48dc23a14..7ca0dfcdad9a7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Joomla! CMS™ [![Analytics](https://ga-beacon.appspot.com/UA-544070-3/joomla-cms/readme)](https://github.com/igrigorik/ga-beacon)
+Joomla! CMS™ [![Analytics](https://ga-beacon.appspot.com/UA-544070-3/joomla-cms/readme)](https://github.com/igrigorik/ga-beacon) [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
 ====================
 
 Build Status
@@ -64,7 +64,7 @@ Do you want to improve Joomla?
 
 Copyright
 ---------------------
-* Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+* Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 * [Special Thanks](https://docs.joomla.org/Special:MyLanguage/Joomla!_Credits_and_Thanks)
 * Distributed under the GNU General Public License version 2 or later
 * See [License details](https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses)
diff --git a/README.txt b/README.txt
index 006fedcd41833..75a33e037933b 100644
--- a/README.txt
+++ b/README.txt
@@ -13,7 +13,7 @@
 3- Is Joomla! for you?
 	* Joomla! is the right solution for most content web projects: https://docs.joomla.org/Special:MyLanguage/Portal:Learn_More
 	* See Joomla's core features - https://www.joomla.org/core-features.html
-	* Try out our online demo: https://demo.joomla.org
+	* Try out our free hosting service: https://launch.joomla.org
 
 4- How to find a Joomla! translation?
 	* Repository of accredited language packs: https://community.joomla.org/translations.html
@@ -67,7 +67,7 @@
 	* Documentation for Web designers: https://docs.joomla.org/Special:MyLanguage/Web_designers
 
 Copyright:
-	* Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+	* Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 	* Special Thanks: https://docs.joomla.org/Special:MyLanguage/Joomla!_Credits_and_Thanks
 	* Distributed under the GNU General Public License version 2 or later
 	* See Licenses details at https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses
diff --git a/RoboFile.php b/RoboFile.php
index 9f20da0847b70..996c9fb035479 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  RoboFile
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_actionlogs/actionlogs.php b/administrator/components/com_actionlogs/actionlogs.php
new file mode 100644
index 0000000000000..5f467d68d378f
--- /dev/null
+++ b/administrator/components/com_actionlogs/actionlogs.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+if (!JFactory::getUser()->authorise('core.admin'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('Actionlogs');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/administrator/components/com_actionlogs/actionlogs.xml b/administrator/components/com_actionlogs/actionlogs.xml
new file mode 100644
index 0000000000000..0258379f0c3ef
--- /dev/null
+++ b/administrator/components/com_actionlogs/actionlogs.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension version="3.9" type="component" method="upgrade">
+	<name>com_actionlogs</name>
+	<author>Joomla! Project</author>
+	<creationDate>May 2018</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>COM_ACTIONLOGS_XML_DESCRIPTION</description>
+	<administration>
+		<menu>COM_ACTIONLOGS</menu>
+		<files folder="admin">
+			<file>actionlogs.php</file>
+			<file>config.xml</file>
+			<file>access.xml</file>
+			<file>controller.php</file>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_actionlogs.ini</language>
+			<language tag="en-GB">language/en-GB.com_actionlogs.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/administrator/components/com_actionlogs/config.xml b/administrator/components/com_actionlogs/config.xml
new file mode 100644
index 0000000000000..c8450079348ff
--- /dev/null
+++ b/administrator/components/com_actionlogs/config.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset name="actionlogs" label="COM_ACTIONLOGS_OPTIONS" addfieldpath="/administrator/components/com_actionlogs/models/fields">
+		<field
+			name="ip_logging"
+			type="radio"
+			label="COM_ACTIONLOGS_IP_LOGGING_LABEL"
+			description="COM_ACTIONLOGS_IP_LOGGING_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+		<field
+			name="csv_delimiter"
+			type="list"
+			label="COM_ACTIONLOGS_CSV_DELIMITER_LABEL"
+			description="COM_ACTIONLOGS_CSV_DELIMITER_DESC"
+			default=","
+			>
+			<option value=",">COM_ACTIONLOGS_COMMA</option>
+			<option value=";">COM_ACTIONLOGS_SEMICOLON</option>
+		</field>
+		<field
+			name="loggable_extensions"
+			type="logtype"
+			label="COM_ACTIONLOGS_LOG_EXTENSIONS_LABEL"
+			description="COM_ACTIONLOGS_LOG_EXTENSIONS_DESC"
+			multiple="true"
+			default="com_banners,com_cache,com_categories,com_config,com_contact,com_content,com_installer,com_media,com_menus,com_messages,com_modules,com_newsfeeds,com_plugins,com_redirect,com_tags,com_templates,com_users"
+		/>
+	</fieldset>
+</config>
diff --git a/administrator/components/com_actionlogs/controller.php b/administrator/components/com_actionlogs/controller.php
new file mode 100644
index 0000000000000..0967bcd774970
--- /dev/null
+++ b/administrator/components/com_actionlogs/controller.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Actionlogs Controller
+ *
+ * @since  3.9.0
+ */
+class ActionlogsController extends JControllerLegacy
+{
+}
diff --git a/administrator/components/com_actionlogs/controllers/actionlogs.php b/administrator/components/com_actionlogs/controllers/actionlogs.php
new file mode 100644
index 0000000000000..b5fc0dace1246
--- /dev/null
+++ b/administrator/components/com_actionlogs/controllers/actionlogs.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('ActionlogsHelper', JPATH_ADMINISTRATOR . '/components/com_actionlogs/helpers/actionlogs.php');
+
+/**
+ * Actionlogs list controller class.
+ *
+ * @since  3.9.0
+ */
+class ActionlogsControllerActionlogs extends JControllerAdmin
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   3.9.0
+	 */
+	public function __construct(array $config = array())
+	{
+		parent::__construct($config);
+
+		$this->registerTask('exportSelectedLogs', 'exportLogs');
+	}
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
+	 * @since   3.9.0
+	 */
+	public function getModel($name = 'Actionlogs', $prefix = 'ActionlogsModel', $config = array('ignore_request' => true))
+	{
+		// Return the model
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Method to export logs
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function exportLogs()
+	{
+		// Check for request forgeries.
+		$this->checkToken();
+
+		$task = $this->getTask();
+
+		$pks = array();
+
+		if ($task == 'exportSelectedLogs')
+		{
+			// Get selected logs
+			$pks = ArrayHelper::toInteger(explode(',', $this->input->post->getString('cids')));
+		}
+
+		/** @var ActionlogsModelActionlogs $model */
+		$model = $this->getModel();
+
+		// Get the logs data
+		$data = $model->getLogDataAsIterator($pks);
+
+		if (count($data))
+		{
+
+			try
+			{
+				$rows = ActionlogsHelper::getCsvData($data);
+			}
+			catch (InvalidArgumentException $exception)
+			{
+				$this->setMessage(JText::_('COM_ACTIONLOGS_ERROR_COULD_NOT_EXPORT_DATA'), 'error');
+				$this->setRedirect(JRoute::_('index.php?option=com_actionlogs&view=actionlogs', false));
+
+				return;
+			}
+
+			// Destroy the iterator now
+			unset($data);
+
+			$date     = new JDate('now', new DateTimeZone('UTC'));
+			$filename = 'logs_' . $date->format('Y-m-d_His_T');
+
+			$csvDelimiter = ComponentHelper::getComponent('com_actionlogs')->getParams()->get('csv_delimiter', ',');
+
+			$app = JFactory::getApplication();
+			$app->setHeader('Content-Type', 'application/csv', true)
+				->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '.csv"', true)
+				->setHeader('Cache-Control', 'must-revalidate', true)
+				->sendHeaders();
+
+			$output = fopen("php://output", "w");
+
+			foreach ($rows as $row)
+			{
+				fputcsv($output, $row, $csvDelimiter);
+			}
+
+			fclose($output);
+
+			$app->close();
+		}
+		else
+		{
+			$this->setMessage(JText::_('COM_ACTIONLOGS_NO_LOGS_TO_EXPORT'));
+			$this->setRedirect(JRoute::_('index.php?option=com_actionlogs&view=actionlogs', false));
+		}
+	}
+
+	/**
+	 * Clean out the logs
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function purge()
+	{
+		// Check for request forgeries.
+		$this->checkToken();
+
+		$model = $this->getModel();
+
+		if ($model->purge())
+		{
+			$message = JText::_('COM_ACTIONLOGS_PURGE_SUCCESS');
+		}
+		else
+		{
+			$message = JText::_('COM_ACTIONLOGS_PURGE_FAIL');
+		}
+
+		$this->setRedirect(JRoute::_('index.php?option=com_actionlogs&view=actionlogs', false), $message);
+	}
+}
diff --git a/administrator/components/com_actionlogs/helpers/actionlogs.php b/administrator/components/com_actionlogs/helpers/actionlogs.php
new file mode 100644
index 0000000000000..be9351d7ef0a4
--- /dev/null
+++ b/administrator/components/com_actionlogs/helpers/actionlogs.php
@@ -0,0 +1,317 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Filesystem\Path;
+use Joomla\String\StringHelper;
+
+/**
+ * Actionlogs component helper.
+ *
+ * @since  3.9.0
+ */
+class ActionlogsHelper
+{
+	/**
+	 * Method to convert logs objects array to an iterable type for use with a CSV export
+	 *
+	 * @param   array|Traversable  $data  The logs data objects to be exported
+	 *
+	 * @return  array|Generator  For PHP 5.5 and newer, a Generator is returned; PHP 5.4 and earlier use an array
+	 *
+	 * @since   3.9.0
+	 * @throws  InvalidArgumentException
+	 */
+	public static function getCsvData($data)
+	{
+		if (!is_iterable($data))
+		{
+			throw new InvalidArgumentException(
+				sprintf(
+					'%s() requires an array or object implementing the Traversable interface, a %s was given.',
+					__METHOD__,
+					gettype($data) === 'object' ? get_class($data) : gettype($data)
+				)
+			);
+		}
+
+		if (version_compare(PHP_VERSION, '5.5', '>='))
+		{
+			// Only include the PHP 5.5 helper in this conditional to prevent the potential of parse errors for PHP 5.4 or earlier
+			JLoader::register('ActionlogsHelperPhp55', __DIR__ . '/actionlogsphp55.php');
+
+			return ActionlogsHelperPhp55::getCsvAsGenerator($data);
+		}
+
+		$rows = array();
+
+		// Header row
+		$rows[] = array('Id', 'Message', 'Date', 'Extension', 'User', 'Ip');
+
+		foreach ($data as $log)
+		{
+			$date      = new JDate($log->log_date, new DateTimeZone('UTC'));
+			$extension = strtok($log->extension, '.');
+
+			static::loadTranslationFiles($extension);
+
+			$rows[] = array(
+				'id'         => $log->id,
+				'message'    => strip_tags(static::getHumanReadableLogMessage($log, false)),
+				'date'       => $date->format('Y-m-d H:i:s T'),
+				'extension'  => JText::_($extension),
+				'name'       => $log->name,
+				'ip_address' => JText::_($log->ip_address),
+			);
+		}
+
+		return $rows;
+	}
+
+	/**
+	 * Load the translation files for an extension
+	 *
+	 * @param   string  $extension  Extension name
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public static function loadTranslationFiles($extension)
+	{
+		static $cache = array();
+		$extension = strtolower($extension);
+
+		if (isset($cache[$extension]))
+		{
+			return;
+		}
+
+		$lang   = JFactory::getLanguage();
+
+		switch (substr($extension, 0, 3))
+		{
+			case 'com':
+			default:
+				$source = JPATH_ADMINISTRATOR . '/components/' . $extension;
+				break;
+
+			case 'lib':
+				$source = JPATH_LIBRARIES . '/' . substr($extension, 4);
+				break;
+
+			case 'mod':
+				$source = JPATH_SITE . '/modules/' . $extension;
+				break;
+
+			case 'plg':
+				$parts = explode('_', $extension, 3);
+				$source = JPATH_PLUGINS . '/' . $parts[1] . '/' . $parts[2];
+				break;
+
+			case 'tpl':
+				$source = JPATH_BASE . '/templates/' . substr($extension, 4);
+				break;
+
+		}
+
+		$lang->load($extension, JPATH_ADMINISTRATOR, null, false, true)
+			|| $lang->load($extension, $source, null, false, true);
+
+		if (!$lang->hasKey(strtoupper($extension)))
+		{
+			$lang->load($extension . '.sys', JPATH_ADMINISTRATOR, null, false, true)
+				|| $lang->load($extension . '.sys', $source, null, false, true);
+		}
+
+		$cache[$extension] = true;
+	}
+
+	/**
+	 * Get parameters to be
+	 *
+	 * @param   string  $context  The context of the content
+	 *
+	 * @return  mixed  An object contains content type parameters, or null if not found
+	 *
+	 * @since   3.9.0
+	 */
+	public static function getLogContentTypeParams($context)
+	{
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('a.*')
+			->from($db->quoteName('#__action_log_config', 'a'))
+			->where($db->quoteName('a.type_alias') . ' = ' . $db->quote($context));
+
+		$db->setQuery($query);
+
+		return $db->loadObject();
+	}
+
+	/**
+	 * Get human readable log message for a User Action Log
+	 *
+	 * @param   stdClass  $log            A User Action log message record
+	 * @param   boolean   $generateLinks  Flag to disable link generation when creating a message
+	 *
+	 * @return  string
+	 *
+	 * @since   3.9.0
+	 */
+	public static function getHumanReadableLogMessage($log, $generateLinks = true)
+	{
+		static $links = array();
+
+		$message     = JText::_($log->message_language_key);
+		$messageData = json_decode($log->message, true);
+
+		// Special handling for translation extension name
+		if (isset($messageData['extension_name']))
+		{
+			static::loadTranslationFiles($messageData['extension_name']);
+			$messageData['extension_name'] = JText::_($messageData['extension_name']);
+		}
+
+		$linkMode = JFactory::getApplication()->get('force_ssl', 0) >= 1 ? 1 : -1;
+
+		foreach ($messageData as $key => $value)
+		{
+			// Convert relative url to absolute url so that it is clickable in action logs notification email
+			if ($generateLinks && StringHelper::strpos($value, 'index.php?') === 0)
+			{
+				if (!isset($links[$value]))
+				{
+					$links[$value] = JRoute::link('administrator', $value, false, $linkMode);
+				}
+
+				$value = $links[$value];
+			}
+
+			$message = str_replace('{' . $key . '}', JText::_($value), $message);
+		}
+
+		return $message;
+	}
+
+	/**
+	 * Get link to an item of given content type
+	 *
+	 * @param   string   $component
+	 * @param   string   $contentType
+	 * @param   integer  $id
+	 * @param   string   $urlVar
+	 *
+	 * @return  string  Link to the content item
+	 *
+	 * @since   3.9.0
+	 */
+	public static function getContentTypeLink($component, $contentType, $id, $urlVar = 'id')
+	{
+		// Try to find the component helper.
+		$eName = str_replace('com_', '', $component);
+		$file  = Path::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/helpers/' . $eName . '.php');
+
+		if (file_exists($file))
+		{
+			$prefix = ucfirst(str_replace('com_', '', $component));
+			$cName  = $prefix . 'Helper';
+
+			JLoader::register($cName, $file);
+
+			if (class_exists($cName) && is_callable(array($cName, 'getContentTypeLink')))
+			{
+				return $cName::getContentTypeLink($contentType, $id);
+			}
+		}
+
+		if (empty($urlVar))
+		{
+			$urlVar = 'id';
+		}
+
+		// Return default link to avoid having to implement getContentTypeLink in most of our components
+		return 'index.php?option=' . $component . '&task=' . $contentType . '.edit&' . $urlVar . '=' . $id;
+	}
+
+	/**
+	 * Load both enabled and disabled actionlog plugins language file.
+	 *
+	 * It is used to make sure actions log is displayed properly instead of only language items displayed when a plugin is disabled.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public static function loadActionLogPluginsLanguage()
+	{
+		$lang = JFactory::getLanguage();
+		$db   = JFactory::getDbo();
+
+		// Get all (both enabled and disabled) actionlog plugins
+		$query = $db->getQuery(true)
+			->select(
+				$db->quoteName(
+					array(
+						'folder',
+						'element',
+						'params',
+						'extension_id'
+					),
+					array(
+						'type',
+						'name',
+						'params',
+						'id'
+					)
+				)
+			)
+			->from('#__extensions')
+			->where('type = ' . $db->quote('plugin'))
+			->where('folder = ' . $db->quote('actionlog'))
+			->where('state IN (0,1)')
+			->order('ordering');
+		$db->setQuery($query);
+
+		try
+		{
+			$rows = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			$rows = array();
+		}
+
+		if (empty($rows))
+		{
+			return;
+		}
+
+		foreach ($rows as $row)
+		{
+			$name      = $row->name;
+			$type      = $row->type;
+			$extension = 'Plg_' . $type . '_' . $name;
+			$extension = strtolower($extension);
+
+			// If language already loaded, don't load it again.
+			if ($lang->getPaths($extension))
+			{
+				continue;
+			}
+
+			$lang->load($extension, JPATH_ADMINISTRATOR, null, false, true)
+			|| $lang->load($extension, JPATH_PLUGINS . '/' . $type . '/' . $name, null, false, true);
+		}
+
+		// Load com_privacy too.
+		$lang->load('com_privacy', JPATH_ADMINISTRATOR, null, false, true);
+	}
+}
diff --git a/administrator/components/com_actionlogs/helpers/actionlogsphp55.php b/administrator/components/com_actionlogs/helpers/actionlogsphp55.php
new file mode 100644
index 0000000000000..37e9d718ad23e
--- /dev/null
+++ b/administrator/components/com_actionlogs/helpers/actionlogsphp55.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Actionlogs component helper for newer PHP versions.
+ *
+ * This file should only be included in environments running PHP 5.5 or newer and may potentially cause a parse error on older versions.
+ *
+ * @since       3.9.0
+ * @deprecated  Will be inlined back into ActionlogsHelper when PHP 5.5 or newer is the minimum supported PHP version
+ * @internal
+ */
+class ActionlogsHelperPhp55
+{
+	/**
+	 * Method to convert logs objects array to a Generator for use with a CSV export
+	 *
+	 * @param   array|Traversable  $data  The logs data objects to be exported
+	 *
+	 * @return  Generator
+	 *
+	 * @since   3.9.0
+	 * @throws  InvalidArgumentException
+	 */
+	public static function getCsvAsGenerator($data)
+	{
+		if (!is_iterable($data))
+		{
+			throw new InvalidArgumentException(
+				sprintf(
+					'%s() requires an array or object implementing the Traversable interface, a %s was given.',
+					__METHOD__,
+					gettype($data) === 'object' ? get_class($data) : gettype($data)
+				)
+			);
+		}
+
+		// Header row
+		yield array('Id', 'Message', 'Date', 'Extension', 'User', 'Ip');
+
+		foreach ($data as $log)
+		{
+			$extension = strtok($log->extension, '.');
+
+			ActionlogsHelper::loadTranslationFiles($extension);
+
+			yield array(
+				'id'         => $log->id,
+				'message'    => strip_tags(ActionlogsHelper::getHumanReadableLogMessage($log, false)),
+				'date'       => (new JDate($log->log_date, new DateTimeZone('UTC')))->format('Y-m-d H:i:s T'),
+				'extension'  => JText::_($extension),
+				'name'       => $log->name,
+				'ip_address' => JText::_($log->ip_address),
+			);
+		}
+	}
+}
diff --git a/administrator/components/com_actionlogs/layouts/logstable.php b/administrator/components/com_actionlogs/layouts/logstable.php
new file mode 100644
index 0000000000000..2aca08c590e3b
--- /dev/null
+++ b/administrator/components/com_actionlogs/layouts/logstable.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JFactory::getLanguage()->load("com_actionlogs", JPATH_ADMINISTRATOR, null, false, true);
+
+$messages = $displayData['messages'];
+$showIpColumn = $displayData['showIpColumn'];
+?>
+<h1>
+	<?php echo JText::_('COM_ACTIONLOGS_EMAIL_SUBJECT'); ?>
+</h1>
+<h2>
+	<?php echo JText::_('COM_ACTIONLOGS_EMAIL_DESC'); ?>
+</h2>
+<table>
+	<thead>
+		<th><?php echo JText::_('COM_ACTIONLOGS_ACTION'); ?></th>
+		<th><?php echo JText::_('COM_ACTIONLOGS_DATE'); ?></th>
+		<th><?php echo JText::_('COM_ACTIONLOGS_EXTENSION'); ?></th>
+		<th><?php echo JText::_('COM_ACTIONLOGS_NAME'); ?></th>
+		<?php if ($showIpColumn) : ?>
+			<th><?php echo JText::_('COM_ACTIONLOGS_IP_ADDRESS'); ?></th>
+		<?php endif; ?>
+	</thead>
+	<tbody>
+		<?php foreach ($messages as $message) : ?>
+			<tr>
+				<td><?php echo $message->message; ?></td>
+				<td><?php echo JHtml::_('date', $message->log_date, 'Y-m-d H:i:s T', 'UTC'); ?></td>
+				<td><?php echo $message->extension; ?></td>
+				<td><?php echo $displayData['username']; ?></td>
+				<?php if ($showIpColumn) : ?>
+					<td><?php echo JText::_($message->ip_address); ?></td>
+				<?php endif; ?>
+			</tr>
+		<?php endforeach; ?>
+	</tbody>
+</table>
diff --git a/administrator/components/com_actionlogs/libraries/actionlogplugin.php b/administrator/components/com_actionlogs/libraries/actionlogplugin.php
new file mode 100644
index 0000000000000..e9e1819829a77
--- /dev/null
+++ b/administrator/components/com_actionlogs/libraries/actionlogplugin.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+use \Joomla\CMS\MVC\Model\BaseModel;
+
+BaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_actionlogs/models', 'ActionlogsModel');
+
+/**
+ * Abstract Action Log Plugin
+ *
+ * @since  3.9.0
+ */
+abstract class ActionLogPlugin extends JPlugin
+{
+	/**
+	 * Application object.
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.9.0
+	 */
+	protected $app;
+
+	/**
+	 * Database object.
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.9.0
+	 */
+	protected $db;
+
+	/**
+	 * Load plugin language file automatically so that it can be used inside component
+	 *
+	 * @var    boolean
+	 * @since  3.9.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Proxy for ActionlogsModelUserlog addLog method
+	 *
+	 * This method adds a record to #__action_logs contains (message_language_key, message, date, context, user)
+	 *
+	 * @param   array   $messages            The contents of the messages to be logged
+	 * @param   string  $messageLanguageKey  The language key of the message
+	 * @param   string  $context             The context of the content passed to the plugin
+	 * @param   int     $userId              ID of user perform the action, usually ID of current logged in user
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function addLog($messages, $messageLanguageKey, $context, $userId = null)
+	{
+		$user = JFactory::getUser();
+
+		foreach ($messages as $index => $message)
+		{
+			if (!array_key_exists('userid', $message))
+			{
+				$message['userid'] = $user->id;
+			}
+
+			if (!array_key_exists('username', $message))
+			{
+				$message['username'] = $user->username;
+			}
+
+			if (!array_key_exists('accountlink', $message))
+			{
+				$message['accountlink'] = 'index.php?option=com_users&task=user.edit&id=' . $user->id;
+			}
+
+			if (array_key_exists('type', $message))
+			{
+				$message['type'] = strtoupper($message['type']);
+			}
+
+			if (array_key_exists('app', $message))
+			{
+				$message['app'] = strtoupper($message['app']);
+			}
+
+			$messages[$index] = $message;
+		}
+
+		/** @var ActionlogsModelActionlog $model **/
+		$model = BaseModel::getInstance('Actionlog', 'ActionlogsModel');
+		$model->addLog($messages, strtoupper($messageLanguageKey), $context, $userId);
+	}
+}
diff --git a/administrator/components/com_actionlogs/models/actionlog.php b/administrator/components/com_actionlogs/models/actionlog.php
new file mode 100644
index 0000000000000..61f0016ee0701
--- /dev/null
+++ b/administrator/components/com_actionlogs/models/actionlog.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\Utilities\IpHelper;
+
+JLoader::register('ActionlogsHelper', JPATH_ADMINISTRATOR . '/components/com_actionlogs/helpers/actionlogs.php');
+
+/**
+ * Methods supporting a list of Actionlog records.
+ *
+ * @since  3.9.0
+ */
+class ActionlogsModelActionlog extends JModelLegacy
+{
+	/**
+	 * Function to add logs to the database
+	 * This method adds a record to #__action_logs contains (message_language_key, message, date, context, user)
+	 *
+	 * @param   array    $messages            The contents of the messages to be logged
+	 * @param   string   $messageLanguageKey  The language key of the message
+	 * @param   string   $context             The context of the content passed to the plugin
+	 * @param   integer  $userId              ID of user perform the action, usually ID of current logged in user
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function addLog($messages, $messageLanguageKey, $context, $userId = null)
+	{
+		$user   = JFactory::getUser($userId);
+		$db     = $this->getDbo();
+		$date   = JFactory::getDate();
+		$params = ComponentHelper::getComponent('com_actionlogs')->getParams();
+
+		if ($params->get('ip_logging', 0))
+		{
+			$ip = IpHelper::getIp();
+
+			if (!filter_var($ip, FILTER_VALIDATE_IP))
+			{
+				$ip = 'COM_ACTIONLOGS_IP_INVALID';
+			}
+		}
+		else
+		{
+			$ip = 'COM_ACTIONLOGS_DISABLED';
+		}
+
+		$loggedMessages = array();
+
+		foreach ($messages as $message)
+		{
+			$logMessage                       = new stdClass;
+			$logMessage->message_language_key = $messageLanguageKey;
+			$logMessage->message              = json_encode($message);
+			$logMessage->log_date             = (string) $date;
+			$logMessage->extension            = $context;
+			$logMessage->user_id              = $user->id;
+			$logMessage->ip_address           = $ip;
+			$logMessage->item_id              = isset($message['id']) ? (int) $message['id'] : 0;
+
+			try
+			{
+				$db->insertObject('#__action_logs', $logMessage);
+				$loggedMessages[] = $logMessage;
+			}
+			catch (RuntimeException $e)
+			{
+				// Ignore it
+			}
+		}
+
+		// Send notification email to users who choose to be notified about the action logs
+		$this->sendNotificationEmails($loggedMessages, $user->name, $context);
+	}
+
+	/**
+	 * Send notification emails about the action log
+	 *
+	 * @param   array   $messages  The logged messages
+	 * @param   string  $username  The username
+	 * @param   string  $context   The Context
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function sendNotificationEmails($messages, $username, $context)
+	{
+		$db           = $this->getDbo();
+		$query        = $db->getQuery(true);
+		$params       = ComponentHelper::getParams('com_actionlogs');
+		$showIpColumn = (bool) $params->get('ip_logging', 0);
+
+		$query
+			->select($db->quoteName(array('u.email', 'l.extensions')))
+			->from($db->quoteName('#__users', 'u'))
+			->join(
+				'INNER',
+				$db->quoteName('#__action_logs_users', 'l') . ' ON ( ' . $db->quoteName('l.notify') . ' = 1 AND '
+				. $db->quoteName('l.user_id') . ' = ' . $db->quoteName('u.id') . ')'
+			);
+
+		$db->setQuery($query);
+
+		try
+		{
+			$users = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+
+			return;
+		}
+
+		$recipients = array();
+
+		foreach ($users as $user)
+		{
+			$extensions = json_decode($user->extensions, true);
+
+			if ($extensions && in_array(strtok($context, '.'), $extensions))
+			{
+				$recipients[] = $user->email;
+			}
+		}
+
+		if (empty($recipients))
+		{
+			return;
+		}
+
+		$layout    = new JLayoutFile('components.com_actionlogs.layouts.logstable', JPATH_ADMINISTRATOR);
+		$extension = strtok($context, '.');
+		ActionlogsHelper::loadTranslationFiles($extension);
+
+		foreach ($messages as $message)
+		{
+			$message->extension = JText::_($extension);
+			$message->message   = ActionlogsHelper::getHumanReadableLogMessage($message);
+		}
+
+		$displayData = array(
+			'messages'     => $messages,
+			'username'     => $username,
+			'showIpColumn' => $showIpColumn,
+		);
+
+		$body   = $layout->render($displayData);
+		$mailer = JFactory::getMailer();
+		$mailer->addRecipient($recipients);
+		$mailer->setSubject(JText::_('COM_ACTIONLOGS_EMAIL_SUBJECT'));
+		$mailer->isHTML(true);
+		$mailer->Encoding = 'base64';
+		$mailer->setBody($body);
+
+		if (!$mailer->Send())
+		{
+			JError::raiseWarning(500, JText::_('JERROR_SENDING_EMAIL'));
+		}
+	}
+}
diff --git a/administrator/components/com_actionlogs/models/actionlogs.php b/administrator/components/com_actionlogs/models/actionlogs.php
new file mode 100644
index 0000000000000..8efc01d4d0088
--- /dev/null
+++ b/administrator/components/com_actionlogs/models/actionlogs.php
@@ -0,0 +1,389 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Methods supporting a list of article records.
+ *
+ * @since  3.9.0
+ */
+class ActionlogsModelActionlogs extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   3.9.0
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'a.id', 'id',
+				'a.extension', 'extension',
+				'a.user_id', 'user',
+				'a.message', 'message',
+				'a.log_date', 'log_date',
+				'a.ip_address', 'ip_address',
+				'dateRange',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function populateState($ordering = 'a.id', $direction = 'desc')
+	{
+		$app = JFactory::getApplication();
+
+		$search = $app->getUserStateFromRequest($this->context . 'filter.search', 'filter_search', '', 'string');
+		$this->setState('filter.search', $search);
+
+		$user = $app->getUserStateFromRequest($this->context . 'filter.user', 'filter_user', '', 'string');
+		$this->setState('filter.user', $user);
+
+		$extension = $app->getUserStateFromRequest($this->context . 'filter.extension', 'filter_extension', '', 'string');
+		$this->setState('filter.extension', $extension);
+
+		$ip_address = $app->getUserStateFromRequest($this->context . 'filter.ip_address', 'filter_ip_address', '', 'string');
+		$this->setState('filter.ip_address', $ip_address);
+
+		$dateRange = $app->getUserStateFromRequest($this->context . 'filter.dateRange', 'filter_dateRange', '', 'string');
+		$this->setState('filter.dateRange', $dateRange);
+
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   3.9.0
+	 */
+	protected function getListQuery()
+	{
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('a.*, u.name')
+			->from('#__action_logs AS a')
+			->leftJoin('#__users AS u ON a.user_id = u.id');
+
+		// Get ordering
+		$fullorderCol = $this->state->get('list.fullordering', 'a.id DESC');
+
+		// Apply ordering
+		if (!empty($fullorderCol))
+		{
+			$query->order($db->escape($fullorderCol));
+		}
+
+		// Get filter by user
+		$user = $this->getState('filter.user');
+
+		// Apply filter by user
+		if (!empty($user))
+		{
+			$query->where($db->quoteName('a.user_id') . ' = ' . (int) $user);
+		}
+
+		// Get filter by extension
+		$extension = $this->getState('filter.extension');
+
+		// Apply filter by extension
+		if (!empty($extension))
+		{
+			$query->where($db->quoteName('a.extension') . ' LIKE ' . $db->quote($extension . '%'));
+		}
+
+		// Get filter by date range
+		$dateRange = $this->getState('filter.dateRange');
+
+		// Apply filter by date range
+		if (!empty($dateRange))
+		{
+			$date = $this->buildDateRange($dateRange);
+
+			// If the chosen range is not more than a year ago
+			if ($date['dNow'] != false)
+			{
+				$query->where(
+					$db->qn('a.log_date') . ' >= ' . $db->quote($date['dStart']->format('Y-m-d H:i:s')) .
+					' AND ' . $db->qn('a.log_date') . ' <= ' . $db->quote($date['dNow']->format('Y-m-d H:i:s'))
+				);
+			}
+		}
+
+		// Filter the items over the search string if set.
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where($db->quoteName('a.id') . ' = ' . (int) substr($search, 3));
+			}
+			elseif (stripos($search, 'item_id:') === 0)
+			{
+				$query->where($db->quoteName('a.item_id') . ' = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . $db->escape($search, true) . '%');
+				$query->where('(' . $db->quoteName('u.username') . ' LIKE ' . $search . ')');
+			}
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Construct the date range to filter on.
+	 *
+	 * @param   string  $range  The textual range to construct the filter for.
+	 *
+	 * @return  array  The date range to filter on.
+	 *
+	 * @since   3.9.0
+	 */
+	private function buildDateRange($range)
+	{
+		// Get UTC for now.
+		$dNow   = new JDate;
+		$dStart = clone $dNow;
+
+		switch ($range)
+		{
+			case 'past_week':
+				$dStart->modify('-7 day');
+				break;
+
+			case 'past_1month':
+				$dStart->modify('-1 month');
+				break;
+
+			case 'past_3month':
+				$dStart->modify('-3 month');
+				break;
+
+			case 'past_6month':
+				$dStart->modify('-6 month');
+				break;
+
+			case 'past_year':
+				$dStart->modify('-1 year');
+				break;
+
+			case 'today':
+				// Ranges that need to align with local 'days' need special treatment.
+				$offset = JFactory::getApplication()->get('offset');
+
+				// Reset the start time to be the beginning of today, local time.
+				$dStart = new JDate('now', $offset);
+				$dStart->setTime(0, 0, 0);
+
+				// Now change the timezone back to UTC.
+				$tz = new DateTimeZone('GMT');
+				$dStart->setTimezone($tz);
+				break;
+		}
+
+		return array('dNow' => $dNow, 'dStart' => $dStart);
+	}
+
+	/**
+	 * Get all log entries for an item
+	 *
+	 * @param   string   $extension  The extension the item belongs to
+	 * @param   integer  $itemId     The item ID
+	 *
+	 * @return  array
+	 *
+	 * @since   3.9.0
+	 */
+	public function getLogsForItem($extension, $itemId)
+	{
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('a.*, u.name')
+			->from('#__action_logs AS a')
+			->innerJoin('#__users AS u ON a.user_id = u.id')
+			->where($db->quoteName('a.extension') . ' = ' . $db->quote($extension))
+			->where($db->quoteName('a.item_id') . ' = ' . (int) $itemId);
+
+		// Get ordering
+		$fullorderCol = $this->getState('list.fullordering', 'a.id DESC');
+
+		// Apply ordering
+		if (!empty($fullorderCol))
+		{
+			$query->order($db->escape($fullorderCol));
+		}
+
+		$db->setQuery($query);
+
+		return $db->loadObjectList();
+	}
+
+	/**
+	 * Get logs data into JTable object
+	 *
+	 * @param   integer[]|null  $pks  An optional array of log record IDs to load
+	 *
+	 * @return  array  All logs in the table
+	 *
+	 * @since   3.9.0
+	 */
+	public function getLogsData($pks = null)
+	{
+		$db    = $this->getDbo();
+		$query = $this->getLogDataQuery($pks);
+
+		$db->setQuery($query);
+
+		return $db->loadObjectList();
+	}
+
+	/**
+	 * Get logs data as a database iterator
+	 *
+	 * @param   integer[]|null  $pks  An optional array of log record IDs to load
+	 *
+	 * @return  JDatabaseIterator
+	 *
+	 * @since   3.9.0
+	 */
+	public function getLogDataAsIterator($pks = null)
+	{
+		$db    = $this->getDbo();
+		$query = $this->getLogDataQuery($pks);
+
+		$db->setQuery($query);
+
+		return $db->getIterator();
+	}
+
+	/**
+	 * Get the query for loading logs data
+	 *
+	 * @param   integer[]|null  $pks  An optional array of log record IDs to load
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   3.9.0
+	 */
+	private function getLogDataQuery($pks = null)
+	{
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('a.*, u.name')
+			->from('#__action_logs AS a')
+			->innerJoin('#__users AS u ON a.user_id = u.id');
+
+		if (is_array($pks) && count($pks) > 0)
+		{
+			$query->where($db->quoteName('a.id') . ' IN (' . implode(',', ArrayHelper::toInteger($pks)) . ')');
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Delete logs
+	 *
+	 * @param   array  $pks  Primary keys of logs
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function delete(&$pks)
+	{
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__action_logs'))
+			->where($db->quoteName('id') . ' IN (' . implode(',', ArrayHelper::toInteger($pks)) . ')');
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+
+			return true;
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+	}
+
+	/**
+	 * Removes all of logs from the table.
+	 *
+	 * @return  boolean result of operation
+	 *
+	 * @since   3.9.0
+	 */
+	public function purge()
+	{
+		try
+		{
+			$this->getDbo()->truncateTable('#__action_logs');
+
+			return true;
+		}
+		catch (Exception $e)
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Get the filter form
+	 *
+	 * @param   array    $data      data
+	 * @param   boolean  $loadData  load current data
+	 *
+	 * @return  \JForm|boolean  The \JForm object or false on error
+	 *
+	 * @since  3.9.0
+	 */
+	public function getFilterForm($data = array(), $loadData = true)
+	{
+		$form      = parent::getFilterForm($data, $loadData);
+		$params    = ComponentHelper::getParams('com_actionlogs');
+		$ipLogging = (bool) $params->get('ip_logging', 0);
+
+		// Add ip sort options to sort dropdown
+		if ($form && $ipLogging)
+		{
+			/* @var JFormFieldList $field */
+			$field = $form->getField('fullordering', 'list');
+			$field->addOption(JText::_('COM_ACTIONLOGS_IP_ADDRESS_ASC'), array('value' => 'a.ip_address ASC'));
+			$field->addOption(JText::_('COM_ACTIONLOGS_IP_ADDRESS_DESC'), array('value' => 'a.ip_address DESC'));
+		}
+
+		return $form;
+	}
+}
diff --git a/administrator/components/com_actionlogs/models/fields/extension.php b/administrator/components/com_actionlogs/models/fields/extension.php
new file mode 100644
index 0000000000000..4eb3153662d32
--- /dev/null
+++ b/administrator/components/com_actionlogs/models/fields/extension.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('_JEXEC') or die;
+
+JFormHelper::loadFieldClass('list');
+JLoader::register('ActionlogsHelper', JPATH_ADMINISTRATOR . '/components/com_actionlogs/helpers/actionlogs.php');
+
+/**
+ * Field to load a list of all extensions that have logged actions
+ *
+ * @since  3.9.0
+ */
+class JFormFieldExtension extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	protected $type = 'extension';
+
+	/**
+	 * Method to get the options to populate list
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.9.0
+	 */
+	public function getOptions()
+	{
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('DISTINCT ' . $db->quoteName('extension'))
+			->from($db->quoteName('#__action_logs'))
+			->order($db->quoteName('extension'));
+
+		$db->setQuery($query);
+		$context = $db->loadColumn();
+
+		$options = array();
+
+		if (count($context) > 0)
+		{
+			foreach ($context as $item)
+			{
+				$extensions[] = strtok($item, '.');
+			}
+
+			$extensions = array_unique($extensions);
+
+			foreach ($extensions as $extension)
+			{
+				ActionlogsHelper::loadTranslationFiles($extension);
+				$options[] = JHtml::_('select.option', $extension, JText::_($extension));
+			}
+		}
+
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/administrator/components/com_actionlogs/models/fields/logcreator.php b/administrator/components/com_actionlogs/models/fields/logcreator.php
new file mode 100644
index 0000000000000..c93081555d9a1
--- /dev/null
+++ b/administrator/components/com_actionlogs/models/fields/logcreator.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('_JEXEC') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Field to load a list of all users that have logged actions
+ *
+ * @since  3.9.0
+ */
+class JFormFieldLogCreator extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	protected $type = 'LogCreator';
+
+	/**
+	 * Cached array of the category items.
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 */
+	protected static $options = array();
+
+	/**
+	 * Method to get the options to populate list
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.9.0
+	 */
+	protected function getOptions()
+	{
+		// Accepted modifiers
+		$hash = md5($this->element);
+
+		if (!isset(static::$options[$hash]))
+		{
+			static::$options[$hash] = parent::getOptions();
+
+			$options = array();
+
+			$db = JFactory::getDbo();
+
+			// Construct the query
+			$query = $db->getQuery(true)
+				->select($db->quoteName('u.id', 'value'))
+				->select($db->quoteName('u.name', 'text'))
+				->from($db->quoteName('#__users', 'u'))
+				->join('INNER', $db->quoteName('#__action_logs', 'c') . ' ON ' . $db->quoteName('c.user_id') . ' = ' . $db->quoteName('u.id'))
+				->group($db->quoteName('u.id'))
+				->group($db->quoteName('u.name'))
+				->order($db->quoteName('u.name'));
+
+			// Setup the query
+			$db->setQuery($query);
+
+			// Return the result
+			if ($options = $db->loadObjectList())
+			{
+				static::$options[$hash] = array_merge(static::$options[$hash], $options);
+			}
+		}
+
+		return static::$options[$hash];
+	}
+}
diff --git a/administrator/components/com_actionlogs/models/fields/logsdaterange.php b/administrator/components/com_actionlogs/models/fields/logsdaterange.php
new file mode 100644
index 0000000000000..f415254455b21
--- /dev/null
+++ b/administrator/components/com_actionlogs/models/fields/logsdaterange.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('_JEXEC') or die;
+
+JFormHelper::loadFieldClass('predefinedlist');
+
+/**
+ * Field to show a list of range dates to sort with
+ *
+ * @since  3.9.0
+ */
+class JFormFieldLogsDateRange extends JFormFieldPredefinedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 * @since   3.9.0
+	 */
+	protected $type = 'logsdaterange';
+
+	/**
+	 * Available options
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 */
+	protected $predefinedOptions = array(
+		'today'       => 'COM_ACTIONLOGS_OPTION_RANGE_TODAY',
+		'past_week'   => 'COM_ACTIONLOGS_OPTION_RANGE_PAST_WEEK',
+		'past_1month' => 'COM_ACTIONLOGS_OPTION_RANGE_PAST_1MONTH',
+		'past_3month' => 'COM_ACTIONLOGS_OPTION_RANGE_PAST_3MONTH',
+		'past_6month' => 'COM_ACTIONLOGS_OPTION_RANGE_PAST_6MONTH',
+		'past_year'   => 'COM_ACTIONLOGS_OPTION_RANGE_PAST_YEAR',
+	);
+
+	/**
+	 * Method to instantiate the form field object.
+	 *
+	 * @param   JForm  $form  The form to attach to the form field object.
+	 *
+	 * @since  3.9.0
+	 */
+	public function __construct($form = null)
+	{
+		parent::__construct($form);
+
+		// Load the required language
+		$lang = JFactory::getLanguage();
+		$lang->load('com_actionlogs', JPATH_ADMINISTRATOR);
+	}
+}
diff --git a/administrator/components/com_actionlogs/models/fields/logtype.php b/administrator/components/com_actionlogs/models/fields/logtype.php
new file mode 100644
index 0000000000000..c8f0ef56b08e5
--- /dev/null
+++ b/administrator/components/com_actionlogs/models/fields/logtype.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  System.actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+
+JFormHelper::loadFieldClass('checkboxes');
+JLoader::register('ActionlogsHelper', JPATH_ADMINISTRATOR . '/components/com_actionlogs/helpers/actionlogs.php');
+
+/**
+ * Field to load a list of all users that have logged actions
+ *
+ * @since 3.9.0
+ */
+class JFormFieldLogType extends JFormFieldCheckboxes
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	protected $type = 'LogType';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.9.0
+	 */
+	public function getOptions()
+	{
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('extension'))
+			->from($db->quoteName('#__action_logs_extensions'));
+
+		$extensions = $db->setQuery($query)->loadColumn();
+
+		$options = array();
+		$tmp     = array('checked' => true);
+
+		foreach ($extensions as $extension)
+		{
+			ActionlogsHelper::loadTranslationFiles($extension);
+			$option = JHtml::_('select.option', $extension, JText::_($extension));
+			$options[ApplicationHelper::stringURLSafe(JText::_($extension)) . '_' . $extension] = (object) array_merge($tmp, (array) $option);
+		}
+
+		ksort($options);
+
+		return array_merge(parent::getOptions(), array_values($options));
+	}
+}
diff --git a/administrator/components/com_actionlogs/models/forms/filter_actionlogs.xml b/administrator/components/com_actionlogs/models/forms/filter_actionlogs.xml
new file mode 100644
index 0000000000000..bb41c4087922c
--- /dev/null
+++ b/administrator/components/com_actionlogs/models/forms/filter_actionlogs.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_ACTIONLOGS_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			name="extension"
+			type="extension"
+			label="COM_ACTIONLOGS_EXTENSION"
+			description="COM_ACTIONLOGS_EXTENSION_FILTER_DESC"
+			onchange="this.form.submit()"
+			>
+			<option value="">COM_ACTIONLOGS_SELECT_EXTENSION</option>
+		</field>
+		<field
+			name="dateRange"
+			type="logsdaterange"
+			label="COM_ACTIONLOGS_OPTION_FILTER_DATE"
+			description="COM_ACTIONLOGS_OPTION_FILTER_DATE"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_ACTIONLOGS_OPTION_FILTER_DATE</option>
+		</field>
+		<field
+			name="user"
+			type="logcreator"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_ACTIONLOGS_SELECT_USER</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_ACTIONLOGS_LIST_FULL_ORDERING"
+			description="COM_ACTIONLOGS_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.message ASC">COM_ACTIONLOGS_ACTION_ASC</option>
+			<option value="a.message DESC">COM_ACTIONLOGS_ACTION_DESC</option>
+			<option value="a.extension ASC">COM_ACTIONLOGS_EXTENSION_ASC</option>
+			<option value="a.extension DESC">COM_ACTIONLOGS_EXTENSION_DESC</option>
+			<option value="a.log_date ASC">JDATE_ASC</option>
+			<option value="a.log_date DESC">JDATE_DESC</option>
+			<option value="a.user_id ASC">COM_ACTIONLOGS_NAME_ASC</option>
+			<option value="a.user_id DESC">COM_ACTIONLOGS_NAME_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_ACTIONLOGS_LIST_LIMIT"
+			description="COM_ACTIONLOGS_LIST_LIMIT_DESC"
+			class="input-mini"
+			onchange="this.form.submit();"
+			default="25"
+		/>
+	</fields>
+</form>
diff --git a/administrator/components/com_actionlogs/views/actionlogs/tmpl/default.php b/administrator/components/com_actionlogs/views/actionlogs/tmpl/default.php
new file mode 100644
index 0000000000000..74b9e0f8658da
--- /dev/null
+++ b/administrator/components/com_actionlogs/views/actionlogs/tmpl/default.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var ActionlogsViewActionlogs $this */
+
+JLoader::register('ActionlogsHelper', JPATH_ADMINISTRATOR . '/components/com_actionlogs/helpers/actionlogs.php');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$listOrder  = $this->escape($this->state->get('list.ordering'));
+$listDirn   = $this->escape($this->state->get('list.direction'));
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(task)
+	{
+		if (task == "actionlogs.exportLogs")
+		{
+			Joomla.submitform(task, document.getElementById("exportForm"));
+			
+			return;
+		}
+
+		if (task == "actionlogs.exportSelectedLogs")
+		{
+			// Get id of selected action logs item and pass it to export form hidden input
+			var cids = [];
+
+			jQuery("input[name=\'cid[]\']:checked").each(function() {
+					cids.push(jQuery(this).val());
+			});
+
+			document.exportForm.cids.value = cids.join(",");
+			Joomla.submitform(task, document.getElementById("exportForm"));
+
+			return;
+		}
+
+		Joomla.submitform(task);
+	};
+');
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_actionlogs&view=actionlogs'); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped table-hover" id="logsList">
+				<thead>
+					<th width="1%" class="center">
+						<?php echo JHtml::_('grid.checkall'); ?>
+					</th>
+					<th>
+						<?php echo JHtml::_('searchtools.sort', 'COM_ACTIONLOGS_ACTION', 'a.message', $listDirn, $listOrder); ?>
+					</th>
+					<th width="15%" class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'COM_ACTIONLOGS_EXTENSION', 'a.extension', $listDirn, $listOrder); ?>
+					</th>
+					<th width="15%" class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'COM_ACTIONLOGS_DATE', 'a.log_date', $listDirn, $listOrder); ?>
+					</th>
+					<th width="10%" class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'COM_ACTIONLOGS_NAME', 'a.user_id', $listDirn, $listOrder); ?>
+					</th>
+					<?php if ($this->showIpColumn) : ?>
+						<th width="10%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_ACTIONLOGS_IP_ADDRESS', 'a.ip_address', $listDirn, $listOrder); ?>
+						</th>
+					<?php endif; ?>
+					<th width="1%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+					</th>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="7">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+					<?php foreach ($this->items as $i => $item) :
+						$extension = strtok($item->extension, '.');
+						ActionlogsHelper::loadTranslationFiles($extension); ?>
+						<tr class="row<?php echo $i % 2; ?>">
+							<td class="center">
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							</td>
+							<td>
+								<?php echo ActionlogsHelper::getHumanReadableLogMessage($item); ?>
+							</td>
+							<td>
+								<?php echo $this->escape(JText::_($extension)); ?>
+							</td>
+							<td>
+								<span class="hasTooltip" title="<?php echo JHtml::_('date', $item->log_date, JText::_('DATE_FORMAT_LC6')); ?>">
+									<?php echo JHtml::_('date.relative', $item->log_date); ?>
+								</span>
+							</td>
+							<td>
+								<?php echo $item->name; ?>
+							</td>
+							<?php if ($this->showIpColumn) : ?>
+								<td>
+									<?php echo JText::_($this->escape($item->ip_address)); ?>
+								</td>
+							<?php endif;?>
+							<td class="hidden-phone">
+								<?php echo (int) $item->id; ?>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif;?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
+<form action="<?php echo JRoute::_('index.php?option=com_actionlogs&view=actionlogs'); ?>" method="post" name="exportForm" id="exportForm">
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="cids" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/administrator/components/com_actionlogs/views/actionlogs/view.html.php b/administrator/components/com_actionlogs/views/actionlogs/view.html.php
new file mode 100644
index 0000000000000..9bbf6cb63ddad
--- /dev/null
+++ b/administrator/components/com_actionlogs/views/actionlogs/view.html.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+
+JLoader::register('ActionlogsHelper', JPATH_ADMINISTRATOR . '/components/com_actionlogs/helpers/actionlogs.php');
+
+/**
+ * View class for a list of logs.
+ *
+ * @since  3.9.0
+ */
+class ActionlogsViewActionlogs extends JViewLegacy
+{
+	/**
+	 * An array of items.
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 */
+	protected $items;
+
+	/**
+	 * The model state
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 */
+	protected $state;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var    JPagination
+	 * @since  3.9.0
+	 */
+	protected $pagination;
+
+	/**
+	 * The active search filters
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 */
+	public $activeFilters;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  A template file to load. [optional]
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   3.9.0
+	 */
+	public function display($tpl = null)
+	{
+		$params = ComponentHelper::getParams('com_actionlogs');
+
+		$this->items         = $this->get('Items');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+		$this->pagination    = $this->get('Pagination');
+		$this->showIpColumn  = (bool) $params->get('ip_logging', 0);
+
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseError(500, implode("\n", $errors));
+
+			return false;
+		}
+
+		$this->addToolBar();
+
+		// Load all actionlog plugins language files
+		ActionlogsHelper::loadActionLogPluginsLanguage();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function addToolbar()
+	{
+		JToolbarHelper::title(JText::_('COM_ACTIONLOGS_MANAGER_USERLOGS'), 'list-2');
+
+		JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'actionlogs.delete');
+		$bar = JToolbar::getInstance('toolbar');
+		$bar->appendButton('Confirm', 'COM_ACTIONLOGS_PURGE_CONFIRM', 'delete', 'COM_ACTIONLOGS_TOOLBAR_PURGE', 'actionlogs.purge', false);
+		JToolbarHelper::preferences('com_actionlogs');
+		JToolbarHelper::help('JHELP_COMPONENTS_ACTIONLOGS');
+		JToolBarHelper::custom('actionlogs.exportSelectedLogs', 'download', '', 'COM_ACTIONLOGS_EXPORT_CSV', true);
+		JToolBarHelper::custom('actionlogs.exportLogs', 'download', '', 'COM_ACTIONLOGS_EXPORT_ALL_CSV', false);
+	}
+}
diff --git a/administrator/components/com_admin/Controller/DisplayController.php b/administrator/components/com_admin/Controller/DisplayController.php
index 29166badb2589..eb99ab1bdad6b 100644
--- a/administrator/components/com_admin/Controller/DisplayController.php
+++ b/administrator/components/com_admin/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/Controller/ProfileController.php b/administrator/components/com_admin/Controller/ProfileController.php
deleted file mode 100644
index b629ce35ad5bc..0000000000000
--- a/administrator/components/com_admin/Controller/ProfileController.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Admin\Administrator\Controller;
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\Router\Route;
-
-/**
- * User profile controller class.
- *
- * @since  1.6
- */
-class ProfileController extends FormController
-{
-	/**
-	 * Method to check if you can edit a record.
-	 *
-	 * Extended classes can override this if necessary.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = array(), $key = 'id')
-	{
-		return isset($data['id']) && $data['id'] == $this->app->getIdentity()->id;
-	}
-
-	/**
-	 * Overrides parent save method to check the submitted passwords match.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   3.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		$this->setRedirect(Route::_('index.php?option=com_admin&view=profile&layout=edit&id=' . $this->app->getIdentity()->id, false));
-
-		$return = parent::save();
-
-		if ($this->getTask() != 'apply')
-		{
-			// Redirect to the main page.
-			$this->setRedirect(Route::_('index.php', false));
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   1.6
-	 */
-	public function cancel($key = null)
-	{
-		$return = parent::cancel($key);
-
-		// Redirect to the main page.
-		$this->setRedirect(Route::_('index.php', false));
-
-		return $return;
-	}
-}
diff --git a/administrator/components/com_admin/Dispatcher/Dispatcher.php b/administrator/components/com_admin/Dispatcher/Dispatcher.php
index 59670da27b3cc..0e245d801a42c 100644
--- a/administrator/components/com_admin/Dispatcher/Dispatcher.php
+++ b/administrator/components/com_admin/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/Extension/AdminComponent.php b/administrator/components/com_admin/Extension/AdminComponent.php
index c98d04b864901..b5425b88de0d3 100644
--- a/administrator/components/com_admin/Extension/AdminComponent.php
+++ b/administrator/components/com_admin/Extension/AdminComponent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/Model/HelpModel.php b/administrator/components/com_admin/Model/HelpModel.php
index 8f04d780c3c6c..874000402423a 100644
--- a/administrator/components/com_admin/Model/HelpModel.php
+++ b/administrator/components/com_admin/Model/HelpModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/Model/ProfileModel.php b/administrator/components/com_admin/Model/ProfileModel.php
deleted file mode 100644
index 884d4b5413b7b..0000000000000
--- a/administrator/components/com_admin/Model/ProfileModel.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Admin\Administrator\Model;
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Multilanguage;
-use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\Component\Users\Administrator\Model\UserModel;
-
-/**
- * User model.
- *
- * @since  1.6
- */
-class ProfileModel extends UserModel
-{
-	/**
-	 * Method to get the record form.
-	 *
-	 * @param   array    $data      An optional array of data for the form to interrogate.
-	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
-	 *
-	 * @return  \JForm    A \JForm object on success, false on failure
-	 *
-	 * @since   1.6
-	 */
-	public function getForm($data = array(), $loadData = true)
-	{
-		// Get the form.
-		$form = $this->loadForm('com_admin.profile', 'profile', array('control' => 'jform', 'load_data' => $loadData));
-
-		if (empty($form))
-		{
-			return false;
-		}
-
-		// Check for username compliance and parameter set
-		$isUsernameCompliant = true;
-
-		if ($this->loadFormData()->username)
-		{
-			$username = $this->loadFormData()->username;
-			$isUsernameCompliant = !(preg_match('#[<>"\'%;()&\\\\]|\\.\\./#', $username) || strlen(utf8_decode($username)) < 2
-				|| trim($username) != $username);
-		}
-
-		$this->setState('user.username.compliant', $isUsernameCompliant);
-
-		if (!ComponentHelper::getParams('com_users')->get('change_login_name') && $isUsernameCompliant)
-		{
-			$form->setFieldAttribute('username', 'required', 'false');
-			$form->setFieldAttribute('username', 'readonly', 'true');
-			$form->setFieldAttribute('username', 'description', 'COM_ADMIN_USER_FIELD_NOCHANGE_USERNAME_DESC');
-		}
-
-		// When multilanguage is set, a user's default site language should also be a Content Language
-		if (Multilanguage::isEnabled())
-		{
-			$form->setFieldAttribute('language', 'type', 'frontend_language', 'params');
-		}
-
-		// If the user needs to change their password, mark the password fields as required
-		if (Factory::getUser()->requireReset)
-		{
-			$form->setFieldAttribute('password', 'required', 'true');
-			$form->setFieldAttribute('password2', 'required', 'true');
-		}
-
-		return $form;
-	}
-
-	/**
-	 * Method to get the data that should be injected in the form.
-	 *
-	 * @return  mixed  The data for the form.
-	 *
-	 * @since   1.6
-	 */
-	protected function loadFormData()
-	{
-		// Check the session for previously entered form data.
-		$data = Factory::getApplication()->getUserState('com_users.edit.user.data', array());
-
-		if (empty($data))
-		{
-			$data = $this->getItem();
-		}
-
-		// Load the users plugins.
-		PluginHelper::importPlugin('user');
-
-		$this->preprocessData('com_admin.profile', $data);
-
-		return $data;
-	}
-
-	/**
-	 * Method to get a single record.
-	 *
-	 * @param   integer  $pk  The id of the primary key.
-	 *
-	 * @return  mixed  Object on success, false on failure.
-	 *
-	 * @since   1.6
-	 */
-	public function getItem($pk = null)
-	{
-		return parent::getItem(Factory::getUser()->id);
-	}
-
-	/**
-	 * Method to save the form data.
-	 *
-	 * @param   array  $data  The form data.
-	 *
-	 * @return  boolean  True on success.
-	 *
-	 * @since   1.6
-	 */
-	public function save($data)
-	{
-		$user = Factory::getUser();
-
-		unset($data['id']);
-		unset($data['groups']);
-		unset($data['sendEmail']);
-		unset($data['block']);
-
-		$isUsernameCompliant = $this->getState('user.username.compliant');
-
-		if (!ComponentHelper::getParams('com_users')->get('change_login_name') && $isUsernameCompliant)
-		{
-			unset($data['username']);
-		}
-
-		// Bind the data.
-		if (!$user->bind($data))
-		{
-			$this->setError($user->getError());
-
-			return false;
-		}
-
-		$user->groups = null;
-
-		// Store the data.
-		if (!$user->save())
-		{
-			$this->setError($user->getError());
-
-			return false;
-		}
-
-		$this->setState('user.id', $user->id);
-
-		return true;
-	}
-}
diff --git a/administrator/components/com_admin/Model/SysinfoModel.php b/administrator/components/com_admin/Model/SysinfoModel.php
index 2547dce21b0a2..acb50cf8eb7be 100644
--- a/administrator/components/com_admin/Model/SysinfoModel.php
+++ b/administrator/components/com_admin/Model/SysinfoModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -309,7 +309,7 @@ public function &getInfo()
 
 		$this->info = array(
 			'php'                   => php_uname(),
-			'dbserver'		=> $db->getServerType(),
+			'dbserver'              => $db->getServerType(),
 			'dbversion'             => $db->getVersion(),
 			'dbcollation'           => $db->getCollation(),
 			'dbconnectioncollation' => $db->getConnectionCollation(),
diff --git a/administrator/components/com_admin/Service/HTML/Directory.php b/administrator/components/com_admin/Service/HTML/Directory.php
index 78f05e8877968..4844c60a8eb6d 100644
--- a/administrator/components/com_admin/Service/HTML/Directory.php
+++ b/administrator/components/com_admin/Service/HTML/Directory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/Service/HTML/PhpSetting.php b/administrator/components/com_admin/Service/HTML/PhpSetting.php
index 8ad8674eba67e..c5ae964c3e832 100644
--- a/administrator/components/com_admin/Service/HTML/PhpSetting.php
+++ b/administrator/components/com_admin/Service/HTML/PhpSetting.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/Service/HTML/System.php b/administrator/components/com_admin/Service/HTML/System.php
index d717e4a235f48..d340234e6153c 100644
--- a/administrator/components/com_admin/Service/HTML/System.php
+++ b/administrator/components/com_admin/Service/HTML/System.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/View/Help/HtmlView.php b/administrator/components/com_admin/View/Help/HtmlView.php
index 3c5bdfaf57ec3..086ce8e1e3c14 100644
--- a/administrator/components/com_admin/View/Help/HtmlView.php
+++ b/administrator/components/com_admin/View/Help/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/View/Profile/HtmlView.php b/administrator/components/com_admin/View/Profile/HtmlView.php
deleted file mode 100644
index 8b6185ff31d71..0000000000000
--- a/administrator/components/com_admin/View/Profile/HtmlView.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Admin\Administrator\View\Profile;
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Toolbar\ToolbarHelper;
-
-/**
- * View class to allow users edit their own profile.
- *
- * @since  1.6
- */
-class HtmlView extends BaseHtmlView
-{
-	/**
-	 * The \JForm object
-	 *
-	 * @var    \JForm
-	 * @since  1.6
-	 */
-	protected $form;
-
-	/**
-	 * The item being viewed
-	 *
-	 * @var    object
-	 * @since  1.6
-	 */
-	protected $item;
-
-	/**
-	 * The model state
-	 *
-	 * @var    object
-	 * @since  1.6
-	 */
-	protected $state;
-
-	/**
-	 * Execute and display a template script.
-	 *
-	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
-	 *
-	 * @return  mixed  A string if successful, otherwise an Error object.
-	 *
-	 * @since   1.6
-	 */
-	public function display($tpl = null)
-	{
-		$this->form  = $this->get('Form');
-		$this->item  = $this->get('Item');
-		$this->state = $this->get('State');
-
-		// Check for errors.
-		if (count($errors = $this->get('Errors')))
-		{
-			throw new \JViewGenericdataexception(implode("\n", $errors), 500);
-		}
-
-		$this->form->setValue('password',	null);
-		$this->form->setValue('password2',	null);
-
-		$this->addToolbar();
-
-		return parent::display($tpl);
-	}
-
-	/**
-	 * Add the page title and toolbar.
-	 *
-	 * @return  void
-	 *
-	 * @since   1.6
-	 */
-	protected function addToolbar()
-	{
-		Factory::getApplication()->input->set('hidemainmenu', 1);
-
-		ToolbarHelper::title(Text::_('COM_ADMIN_VIEW_PROFILE_TITLE'), 'user user-profile');
-
-		ToolbarHelper::saveGroup(
-			[
-				['apply', 'profile.apply'],
-				['save', 'profile.save']
-			],
-			'btn-success'
-		);
-
-		ToolbarHelper::cancel('profile.cancel', 'JTOOLBAR_CLOSE');
-		ToolbarHelper::divider();
-		ToolbarHelper::help('JHELP_ADMIN_USER_PROFILE_EDIT');
-	}
-}
diff --git a/administrator/components/com_admin/View/Sysinfo/HtmlView.php b/administrator/components/com_admin/View/Sysinfo/HtmlView.php
index 4f393f6e82b36..f361e6c184690 100644
--- a/administrator/components/com_admin/View/Sysinfo/HtmlView.php
+++ b/administrator/components/com_admin/View/Sysinfo/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/View/Sysinfo/JsonView.php b/administrator/components/com_admin/View/Sysinfo/JsonView.php
index 55f460b00b0bc..f92afdfc71e4b 100644
--- a/administrator/components/com_admin/View/Sysinfo/JsonView.php
+++ b/administrator/components/com_admin/View/Sysinfo/JsonView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/View/Sysinfo/TextView.php b/administrator/components/com_admin/View/Sysinfo/TextView.php
index 4167fc76e7bb8..3f7af346b5e8e 100644
--- a/administrator/components/com_admin/View/Sysinfo/TextView.php
+++ b/administrator/components/com_admin/View/Sysinfo/TextView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/admin.xml b/administrator/components/com_admin/admin.xml
index 5a4d7223533c1..2614d4fc380eb 100644
--- a/administrator/components/com_admin/admin.xml
+++ b/administrator/components/com_admin/admin.xml
@@ -3,7 +3,7 @@
 	<name>com_admin</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_admin/forms/profile.xml b/administrator/components/com_admin/forms/profile.xml
deleted file mode 100644
index e1daa6ed6a1c4..0000000000000
--- a/administrator/components/com_admin/forms/profile.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<form>
-	<fieldset name="user_details">
-		<field 
-			name="name" 
-			type="text"
-			label="COM_ADMIN_USER_HEADING_NAME"
-			required="true"
-			size="30"
-		/>
-
-		<field 
-			name="username" 
-			type="text"
-			label="COM_ADMIN_USER_FIELD_USERNAME_LABEL"
-			required="true"
-			size="30"
-		/>
-
-		<field 
-			name="password2" 
-			type="password"
-			label="JGLOBAL_PASSWORD"
-			autocomplete="off"
-			class="validate-password"
-			field="password"
-			filter="raw"
-			message="COM_ADMIN_USER_FIELD_PASSWORD1_MESSAGE"
-			size="30"
-			validate="equals"
-		/>
-
-		<field 
-			name="password" 
-			type="password"
-			label="COM_ADMIN_USER_FIELD_PASSWORD2_LABEL"
-			autocomplete="off"
-			class="validate-password"
-			filter="raw"
-			size="30"
-			validate="password"
-		/>
-
-		<field 
-			name="email" 
-			type="email"
-			label="JGLOBAL_EMAIL"
-			class="validate-email"
-			required="true"
-			size="30"
-			validate="email"
-		/>
-
-		<field
-			name="registerDate"
-			type="calendar"
-			label="COM_ADMIN_USER_FIELD_REGISTERDATE_LABEL"
-			class="readonly"
-			readonly="true"
-			translateformat="true"
-			showtime="true"
-			size="22"
-			filter="user_utc"
-		/>
-
-		<field
-			name="lastvisitDate"
-			type="calendar"
-			label="COM_ADMIN_USER_FIELD_LASTVISIT_LABEL"
-			class="readonly"
-			readonly="true"
-			translateformat="true"
-			showtime="true"
-			size="22"
-			filter="user_utc"
-		/>
-
-		<field
-			name="id"
-			type="number"
-			label="JGLOBAL_FIELD_ID_LABEL"
-			class="readonly"
-			default="0"
-			readonly="true"
-			filter="unset"
-		/>
-
-	</fieldset>
-
-	<fields name="params">
-
-		<!--  Basic user account settings. -->
-		<fieldset name="settings" label="COM_ADMIN_USER_SETTINGS_FIELDSET_LABEL">
-
-			<field 
-				name="admin_style" 
-				type="templatestyle"
-				label="COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_LABEL"
-				client="administrator"
-				filter="uint"
-				>
-				<option value="">JOPTION_USE_DEFAULT</option>
-			</field>
-
-			<field 
-				name="admin_language" 
-				type="language"
-				label="COM_ADMIN_USER_FIELD_BACKEND_LANGUAGE_LABEL"
- 				client="administrator"
-				>
-				<option value="">JOPTION_USE_DEFAULT</option>
-			</field>
-
-			<field 
-				name="language"
-				type="language"
-				label="COM_ADMIN_USER_FIELD_FRONTEND_LANGUAGE_LABEL"
-				client="site"
-				>
-				<option value="">JOPTION_USE_DEFAULT</option>
-			</field>
-
-			<field 
-				name="editor" 
-				type="plugins" 
-				label="COM_ADMIN_USER_FIELD_EDITOR_LABEL"
-				folder="editors"
-				useaccess="true"
-				>
-				<option value="">JOPTION_USE_DEFAULT</option>
-			</field>
-
-			<field 
-				name="helpsite" 
-				type="helpsite"
-				label="COM_ADMIN_USER_FIELD_HELPSITE_LABEL"
-				>
-				<option value="">JOPTION_USE_DEFAULT</option>
-			</field>
-
-			<field 
-				name="timezone" 
-				type="timezone"
-				label="COM_ADMIN_USER_FIELD_TIMEZONE_LABEL"
-				>
-				<option value="">JOPTION_USE_DEFAULT</option>
-			</field>
-		</fieldset>
-	</fields>
-</form>
diff --git a/administrator/components/com_admin/postinstall/eaccelerator.php b/administrator/components/com_admin/postinstall/eaccelerator.php
index 312ffbece0a53..0be79e70fcef8 100644
--- a/administrator/components/com_admin/postinstall/eaccelerator.php
+++ b/administrator/components/com_admin/postinstall/eaccelerator.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
  * This file contains post-installation message handling for eAccelerator compatibility.
diff --git a/administrator/components/com_admin/postinstall/htaccess.php b/administrator/components/com_admin/postinstall/htaccess.php
index 7a1ff985e4def..1d568615181cd 100644
--- a/administrator/components/com_admin/postinstall/htaccess.php
+++ b/administrator/components/com_admin/postinstall/htaccess.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
  * This file contains post-installation message handling for notifying users of a change
diff --git a/administrator/components/com_admin/postinstall/languageaccess340.php b/administrator/components/com_admin/postinstall/languageaccess340.php
index b9fab5252bbf8..e504082c8e3d7 100644
--- a/administrator/components/com_admin/postinstall/languageaccess340.php
+++ b/administrator/components/com_admin/postinstall/languageaccess340.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
  * This file contains post-installation message handling for the checks if the installation is
diff --git a/administrator/components/com_admin/postinstall/statscollection.php b/administrator/components/com_admin/postinstall/statscollection.php
index 1d8fde9d94ce8..4d4a3053df195 100644
--- a/administrator/components/com_admin/postinstall/statscollection.php
+++ b/administrator/components/com_admin/postinstall/statscollection.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
  * This file contains post-installation message handling for the checking minimum PHP version support
diff --git a/administrator/components/com_admin/postinstall/updatedefaultsettings.php b/administrator/components/com_admin/postinstall/updatedefaultsettings.php
index d111f4d50c799..5d9a2ebdda109 100644
--- a/administrator/components/com_admin/postinstall/updatedefaultsettings.php
+++ b/administrator/components/com_admin/postinstall/updatedefaultsettings.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
  * This file contains post-installation message handling for notifying users of a change
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index eaa8f892e28d7..aa768e509e263 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -931,6 +931,7 @@ public function deleteUnexistingFiles()
 			'/administrator/components/com_languages/helpers/languages.php',
 			'/administrator/components/com_languages/helpers/multilangstatus.php',
 			'/administrator/components/com_languages/languages.php',
+			'/administrator/components/com_languages/layouts/joomla/searchtools/default/bar.php',
 			'/administrator/components/com_languages/models/forms/filter_installed.xml',
 			'/administrator/components/com_languages/models/forms/filter_languages.xml',
 			'/administrator/components/com_languages/models/forms/language.xml',
diff --git a/administrator/components/com_admin/services/provider.php b/administrator/components/com_admin/services/provider.php
index 84234da102984..1d3e4f9e6436c 100644
--- a/administrator/components/com_admin/services/provider.php
+++ b/administrator/components/com_admin/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-02.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-02.sql
new file mode 100644
index 0000000000000..ef74036ca361b
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-02.sql
@@ -0,0 +1,16 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(35, 0, 'com_privacy', 'component', 'com_privacy', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+CREATE TABLE IF NOT EXISTS `#__privacy_requests` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `email` varchar(100) NOT NULL DEFAULT '',
+  `requested_at` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `status` tinyint(4) NOT NULL DEFAULT '0',
+  `request_type` varchar(25) NOT NULL DEFAULT '',
+  `confirm_token` varchar(100) NOT NULL DEFAULT '',
+  `confirm_token_created_at` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `checked_out` int(11) NOT NULL DEFAULT '0',
+  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  KEY `idx_checkout` (`checked_out`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-03.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-03.sql
new file mode 100644
index 0000000000000..d1f294af6a0ff
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-03.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(482, 0, 'plg_content_confirmconsent', 'plugin', 'confirmconsent', 'content', 0, 0, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-05.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-05.sql
new file mode 100644
index 0000000000000..78db9a8d1cc88
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-05.sql
@@ -0,0 +1,85 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(36, 0, 'com_actionlogs', 'component', 'com_actionlogs', '', 1, 1, 1, 1, '', '{"ip_logging":0,"csv_delimiter":",","loggable_extensions":["com_banners","com_cache","com_categories","com_config","com_contact","com_content","com_installer","com_media","com_menus","com_messages","com_modules","com_newsfeeds","com_plugins","com_redirect","com_tags","com_templates","com_users"]}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(483, 0, 'plg_system_actionlogs', 'plugin', 'actionlogs', 'system', 0, 0, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(484, 0, 'plg_actionlog_joomla', 'plugin', 'joomla', 'actionlog', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+
+--
+-- Table structure for table `#__action_logs`
+--
+
+CREATE TABLE IF NOT EXISTS `#__action_logs` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `message_language_key` varchar(255) NOT NULL DEFAULT '',
+  `message` text NOT NULL,
+  `log_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `extension` varchar(50) NOT NULL DEFAULT '',
+  `user_id` int(11) NOT NULL DEFAULT 0,
+  `item_id` int(11) NOT NULL DEFAULT 0,
+  `ip_address` VARCHAR(40) NOT NULL DEFAULT '0.0.0.0',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+--
+-- Table structure for table `#__action_logs_extensions`
+--
+
+CREATE TABLE IF NOT EXISTS `#__action_logs_extensions` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `extension` varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+INSERT INTO `#__action_logs_extensions` (`id`, `extension`) VALUES
+(1, 'com_banners'),
+(2, 'com_cache'),
+(3, 'com_categories'),
+(4, 'com_config'),
+(5, 'com_contact'),
+(6, 'com_content'),
+(7, 'com_installer'),
+(8, 'com_media'),
+(9, 'com_menus'),
+(10, 'com_messages'),
+(11, 'com_modules'),
+(12, 'com_newsfeeds'),
+(13, 'com_plugins'),
+(14, 'com_redirect'),
+(15, 'com_tags'),
+(16, 'com_templates'),
+(17, 'com_users');
+
+--
+-- Table structure for table `#__action_log_config`
+--
+
+CREATE TABLE IF NOT EXISTS `#__action_log_config` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `type_title` varchar(255) NOT NULL DEFAULT '',
+  `type_alias` varchar(255) NOT NULL DEFAULT '',
+  `id_holder` varchar(255),
+  `title_holder` varchar(255),
+  `table_name` varchar(255),
+  `text_prefix` varchar(255),
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+INSERT INTO `#__action_log_config` (`id`, `type_title`, `type_alias`, `id_holder`, `title_holder`, `table_name`, `text_prefix`) VALUES
+(1, 'article', 'com_content.article', 'id' ,'title' , '#__content', 'PLG_ACTIONLOG_JOOMLA'),
+(2, 'article', 'com_content.form', 'id', 'title' , '#__content', 'PLG_ACTIONLOG_JOOMLA'),
+(3, 'banner', 'com_banners.banner', 'id' ,'name' , '#__banners', 'PLG_ACTIONLOG_JOOMLA'),
+(4, 'user_note', 'com_users.note', 'id', 'subject' ,'#__user_notes', 'PLG_ACTIONLOG_JOOMLA'),
+(5, 'media', 'com_media.file', '' , 'name' , '',  'PLG_ACTIONLOG_JOOMLA'),
+(6, 'category', 'com_categories.category', 'id' , 'title' , '#__categories', 'PLG_ACTIONLOG_JOOMLA'),
+(7, 'menu', 'com_menus.menu', 'id' ,'title' , '#__menu_types', 'PLG_ACTIONLOG_JOOMLA'),
+(8, 'menu_item', 'com_menus.item', 'id' , 'title' , '#__menu', 'PLG_ACTIONLOG_JOOMLA'),
+(9, 'newsfeed', 'com_newsfeeds.newsfeed', 'id' ,'name' , '#__newsfeeds', 'PLG_ACTIONLOG_JOOMLA'),
+(10, 'link', 'com_redirect.link', 'id', 'old_url' , '#__redirect_links', 'PLG_ACTIONLOG_JOOMLA'),
+(11, 'tag', 'com_tags.tag', 'id', 'title' , '#__tags', 'PLG_ACTIONLOG_JOOMLA'),
+(12, 'style', 'com_templates.style', 'id' , 'title' , '#__template_styles', 'PLG_ACTIONLOG_JOOMLA'),
+(13, 'plugin', 'com_plugins.plugin', 'extension_id' , 'name' , '#__extensions', 'PLG_ACTIONLOG_JOOMLA'),
+(14, 'component_config', 'com_config.component', 'extension_id' , 'name', '', 'PLG_ACTIONLOG_JOOMLA'),
+(15, 'contact', 'com_contact.contact', 'id', 'name', '#__contact_details', 'PLG_ACTIONLOG_JOOMLA'),
+(16, 'module', 'com_modules.module', 'id' ,'title', '#__modules', 'PLG_ACTIONLOG_JOOMLA'),
+(17, 'access_level', 'com_users.level', 'id' , 'title', '#__viewlevels', 'PLG_ACTIONLOG_JOOMLA'),
+(18, 'banner_client', 'com_banners.client', 'id', 'name', '#__banner_clients', 'PLG_ACTIONLOG_JOOMLA');
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-19.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-19.sql
new file mode 100644
index 0000000000000..512acbd7f707e
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-19.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(481, 0, 'plg_fields_repeatable', 'plugin', 'repeatable', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-20.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-20.sql
new file mode 100644
index 0000000000000..8b918f8c257be
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-20.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(319, 0, 'mod_latestactions', 'module', 'mod_latestactions', '', 1, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-24.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-24.sql
new file mode 100644
index 0000000000000..1dd1d9b474e73
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-24.sql
@@ -0,0 +1,14 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(485, 0, 'plg_system_privacyconsent', 'plugin', 'privacyconsent', 'system', 0, 0, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+CREATE TABLE IF NOT EXISTS `#__privacy_consents` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `subject` varchar(255) NOT NULL DEFAULT '',
+  `body` text NOT NULL,
+  `remind` tinyint(4) NOT NULL DEFAULT '0',
+  `token` varchar(100) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`),
+  KEY `idx_user_id` (`user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-27.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-27.sql
new file mode 100644
index 0000000000000..ab0958e02c946
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-27.sql
@@ -0,0 +1,3 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(486, 0, 'plg_system_logrotation', 'plugin', 'logrotation', 'system', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(487, 0, 'plg_privacy_user', 'plugin', 'user', 'privacy', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-02.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-02.sql
new file mode 100644
index 0000000000000..4dea034967e2e
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-02.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `#__content` ADD COLUMN `note` VARCHAR(255) NOT NULL DEFAULT '';
+
+UPDATE `#__content_types` SET `field_mappings` = 
+'{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"introtext", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"attribs", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"asset_id", "note":"note"}, "special":{"fulltext":"fulltext"}}' WHERE `type_title` = 'Article';
\ No newline at end of file
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-12.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-12.sql
new file mode 100644
index 0000000000000..c45e9d6c7d9fd
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-12.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(320, 0, 'mod_privacy_dashboard', 'module', 'mod_privacy_dashboard', '', 1, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-13.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-13.sql
new file mode 100644
index 0000000000000..edda43880912d
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-13.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(488, 0, 'plg_quickicon_privacycheck', 'plugin', 'privacycheck', 'quickicon', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-14.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-14.sql
new file mode 100644
index 0000000000000..cc18b1d191c96
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-14.sql
@@ -0,0 +1,3 @@
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`) VALUES
+(700, 'COM_ACTIONLOGS_POSTINSTALL_TITLE', 'COM_ACTIONLOGS_POSTINSTALL_BODY', '', 'com_actionlogs', 1, 'message', '', '', '', '', '3.9.0', 1),
+(700, 'COM_PRIVACY_POSTINSTALL_TITLE', 'COM_PRIVACY_POSTINSTALL_BODY', '', 'com_privacy', 1, 'message', '', '', '', '', '3.9.0', 1);
\ No newline at end of file
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-17.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-17.sql
new file mode 100644
index 0000000000000..d3d3ee5f930f3
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-17.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(489, 0, 'plg_user_terms', 'plugin', 'terms', 'user', 0, 0, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-07-09.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-07-09.sql
new file mode 100644
index 0000000000000..7c8215c3f93e6
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-07-09.sql
@@ -0,0 +1,4 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(490, 0, 'plg_privacy_contact', 'plugin', 'contact', 'privacy', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(491, 0, 'plg_privacy_content', 'plugin', 'content', 'privacy', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(492, 0, 'plg_privacy_message', 'plugin', 'message', 'privacy', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-07-10.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-07-10.sql
new file mode 100644
index 0000000000000..3c8c70a81ade9
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-07-10.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__action_log_config` (`id`, `type_title`, `type_alias`, `id_holder`, `title_holder`, `table_name`, `text_prefix`)
+	VALUES (19, 'application_config', 'com_config.application', '', 'name', '', 'PLG_ACTIONLOG_JOOMLA');
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-07-11.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-07-11.sql
new file mode 100644
index 0000000000000..a6b89c858e868
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-07-11.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(493, 0, 'plg_privacy_actionlogs', 'plugin', 'actionlogs', 'privacy', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-08-12.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-08-12.sql
new file mode 100644
index 0000000000000..250118c1f9375
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-08-12.sql
@@ -0,0 +1 @@
+ALTER TABLE `#__privacy_consents` ADD COLUMN `state` INT(10) NOT NULL DEFAULT '1' AFTER `user_id`;
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-08-28.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-08-28.sql
new file mode 100644
index 0000000000000..e181ed56f8de7
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-08-28.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `#__session` MODIFY `session_id` varbinary(192) NOT NULL;
+ALTER TABLE `#__session` MODIFY `guest` tinyint(3) unsigned DEFAULT 1;
+ALTER TABLE `#__session` MODIFY `time` int(11) NOT NULL DEFAULT 0;
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-08-29.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-08-29.sql
new file mode 100644
index 0000000000000..9fe0097bbc15a
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-08-29.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(494, 0, 'plg_captcha_recaptcha_invisible', 'plugin', 'recaptcha_invisible', 'captcha', 0, 0, 1, 0, '', '{"public_key":"","private_key":"","theme":"clean"}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-09-04.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-09-04.sql
new file mode 100644
index 0000000000000..14bfe2497ef69
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-09-04.sql
@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS `#__action_logs_users` (
+  `user_id` int(11) UNSIGNED NOT NULL,
+  `notify` tinyint(1) UNSIGNED NOT NULL,
+  `extensions` text NOT NULL,
+  PRIMARY KEY (`user_id`),
+  KEY `idx_notify` (`notify`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-10-15.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-10-15.sql
new file mode 100644
index 0000000000000..c9a13c1f64a00
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-10-15.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `#__action_logs` ADD INDEX `idx_user_id` (`user_id`);
+ALTER TABLE `#__action_logs` ADD INDEX `idx_user_id_logdate` (`user_id`, `log_date`);
+ALTER TABLE `#__action_logs` ADD INDEX `idx_user_id_extension` (`user_id`, `extension`);
+ALTER TABLE `#__action_logs` ADD INDEX `idx_extension_item_id` (`extension`, `item_id`);
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-10-20.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-10-20.sql
new file mode 100644
index 0000000000000..79f266d89036f
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-10-20.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `#__privacy_requests` DROP INDEX `idx_checkout`;
+ALTER TABLE `#__privacy_requests` DROP COLUMN `checked_out`;
+ALTER TABLE `#__privacy_requests` DROP COLUMN `checked_out_time`;
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-10-21.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-10-21.sql
new file mode 100644
index 0000000000000..1fafdfdc2c74d
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-10-21.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(495, 0, 'plg_privacy_consents', 'plugin', 'consents', 'privacy', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-07-03.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-07-03.sql
index 78ec385137e3f..05f0d5e850bbc 100644
--- a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-07-03.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-07-03.sql
@@ -1,3 +1,3 @@
 INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
-(458, 'plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(459, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+(494, 'plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(495, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-04-25.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-04-25.sql
index 4821e1462132a..86bd10da3d517 100644
--- a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-04-25.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-04-25.sql
@@ -1,5 +1,5 @@
 INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
-(481, 'plg_filesystem_local', 'plugin', 'local', 'filesystem', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
-(482, 'plg_media-action_crop', 'plugin', 'crop', 'media-action', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
-(483, 'plg_media-action_resize', 'plugin', 'resize', 'media-action', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
-(484, 'plg_media-action_rotate', 'plugin', 'rotate', 'media-action', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0);
+(496, 'plg_filesystem_local', 'plugin', 'local', 'filesystem', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(497, 'plg_media-action_crop', 'plugin', 'crop', 'media-action', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(498, 'plg_media-action_resize', 'plugin', 'resize', 'media-action', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(499, 'plg_media-action_rotate', 'plugin', 'rotate', 'media-action', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-06-03.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-06-03.sql
new file mode 100644
index 0000000000000..2166de7eb35be
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-06-03.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `#__extensions` ADD COLUMN `changelogurl` text AFTER `element`;
+ALTER TABLE `#__updates` ADD COLUMN `changelogurl` text AFTER `infourl`;
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-10-10.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-10-10.sql
index d50f4cf946753..1e52dfcfdda8a 100644
--- a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-10-10.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-10-10.sql
@@ -1,5 +1,5 @@
 INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
-(487, 'plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 0, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0);
+(501, 'plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 0, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0);
 
 INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
 VALUES
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-05-15.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-05-15.sql
index a0e5f65b784f6..903d0fcd5501e 100644
--- a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-05-15.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-05-15.sql
@@ -75,8 +75,8 @@ CREATE TABLE IF NOT EXISTS `#__workflow_stages` (
 --
 
 INSERT INTO `#__workflow_stages` (`id`, `asset_id`, `ordering`, `workflow_id`, `published`, `title`, `description`, `condition`, `default`) VALUES
-(1, 0, 1, 1, 1, 'JUNPUBLISHED', '', 0, 0),
-(2, 0, 2, 1, 1, 'JPUBLISHED', '', 1, 1),
+(1, 0, 1, 1, 1, 'JUNPUBLISHED', '', 0, 1),
+(2, 0, 2, 1, 1, 'JPUBLISHED', '', 1, 0),
 (3, 0, 3, 1, 1, 'JTRASHED', '', -2, 0),
 (4, 0, 4, 1, 1, 'JARCHIVED', '', 2, 0);
 
@@ -117,7 +117,7 @@ INSERT INTO `#__workflow_transitions` (`id`, `asset_id`, `published`, `ordering`
 --
 
 INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
-(35, 0, 'com_workflow', 'component', 'com_workflow', '', 1, 1, 0, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0);
+(37, 0, 'com_workflow', 'component', 'com_workflow', '', 1, 1, 0, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0);
 
 --
 -- Creating Associations for existing content
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-03.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-03.sql
index a2ea57c63c0b2..55c62fb9ebf6f 100644
--- a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-03.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-03.sql
@@ -15,4 +15,4 @@ CREATE TABLE IF NOT EXISTS `#__csp` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
 INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
-(35, 'com_csp', 'component', 'com_csp', '', 0, 0, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0);
+(38, 'com_csp', 'component', 'com_csp', '', 0, 0, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-06.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-06.sql
index 222b11d060977..767fa880257ca 100644
--- a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-06.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-06.sql
@@ -2,8 +2,8 @@ CREATE TABLE IF NOT EXISTS `#__finder_logging` (
   `searchterm` VARCHAR(255) NOT NULL DEFAULT '',
   `md5sum` VARCHAR(32) NOT NULL DEFAULT '',
   `query` BLOB NOT NULL,
-  `hits` INT(11) NOT NULL DEFAULT '1',
-  `results` INT(11) NOT NULL DEFAULT '0',
+  `hits` INT(11) NOT NULL DEFAULT 1,
+  `results` INT(11) NOT NULL DEFAULT 0,
   PRIMARY KEY `md5sum` (`md5sum`),
   INDEX `searchterm` (`searchterm`(191))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-11.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-11.sql
index f29eb4df240ce..ca9b375d05120 100644
--- a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-11.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-11.sql
@@ -1,4 +1,4 @@
 INSERT INTO `#__extensions`
 (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`)
 VALUES
-  (488, 0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 0, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0);
+  (490, 0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 0, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-16.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-16.sql
new file mode 100644
index 0000000000000..188dcfbb9665c
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-16.sql
@@ -0,0 +1,185 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES (506, 0, 'plg_extension_finder', 'plugin', 'finder', 'extension', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0);
+DROP TABLE IF EXISTS `#__finder_terms_common`;
+CREATE TABLE `#__finder_terms_common` (
+  `term` varchar(75) NOT NULL DEFAULT '',
+  `language` char(7) NOT NULL DEFAULT '',
+  `custom` int(11) NOT NULL DEFAULT '0',
+  UNIQUE KEY `idx_word_lang` (`term`,`language`),
+  KEY `idx_lang` (`language`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_bin;
+
+INSERT INTO `#__finder_terms_common` (`term`, `language`, `custom`) VALUES
+	('i', 'en', 0),
+	('me', 'en', 0),
+	('my', 'en', 0),
+	('myself', 'en', 0),
+	('we', 'en', 0),
+	('our', 'en', 0),
+	('ours', 'en', 0),
+	('ourselves', 'en', 0),
+	('you', 'en', 0),
+	('your', 'en', 0),
+	('yours', 'en', 0),
+	('yourself', 'en', 0),
+	('yourselves', 'en', 0),
+	('he', 'en', 0),
+	('him', 'en', 0),
+	('his', 'en', 0),
+	('himself', 'en', 0),
+	('she', 'en', 0),
+	('her', 'en', 0),
+	('hers', 'en', 0),
+	('herself', 'en', 0),
+	('it', 'en', 0),
+	('its', 'en', 0),
+	('itself', 'en', 0),
+	('they', 'en', 0),
+	('them', 'en', 0),
+	('their', 'en', 0),
+	('theirs', 'en', 0),
+	('themselves', 'en', 0),
+	('what', 'en', 0),
+	('which', 'en', 0),
+	('who', 'en', 0),
+	('whom', 'en', 0),
+	('this', 'en', 0),
+	('that', 'en', 0),
+	('these', 'en', 0),
+	('those', 'en', 0),
+	('am', 'en', 0),
+	('is', 'en', 0),
+	('are', 'en', 0),
+	('was', 'en', 0),
+	('were', 'en', 0),
+	('be', 'en', 0),
+	('been', 'en', 0),
+	('being', 'en', 0),
+	('have', 'en', 0),
+	('has', 'en', 0),
+	('had', 'en', 0),
+	('having', 'en', 0),
+	('do', 'en', 0),
+	('does', 'en', 0),
+	('did', 'en', 0),
+	('doing', 'en', 0),
+	('would', 'en', 0),
+	('should', 'en', 0),
+	('could', 'en', 0),
+	('ought', 'en', 0),
+	('i\'m', 'en', 0),
+	('you\'re', 'en', 0),
+	('he\'s', 'en', 0),
+	('she\'s', 'en', 0),
+	('it\'s', 'en', 0),
+	('we\'re', 'en', 0),
+	('they\'re', 'en', 0),
+	('i\'ve', 'en', 0),
+	('you\'ve', 'en', 0),
+	('we\'ve', 'en', 0),
+	('they\'ve', 'en', 0),
+	('i\'d', 'en', 0),
+	('you\'d', 'en', 0),
+	('he\'d', 'en', 0),
+	('she\'d', 'en', 0),
+	('we\'d', 'en', 0),
+	('they\'d', 'en', 0),
+	('i\'ll', 'en', 0),
+	('you\'ll', 'en', 0),
+	('he\'ll', 'en', 0),
+	('she\'ll', 'en', 0),
+	('we\'ll', 'en', 0),
+	('they\'ll', 'en', 0),
+	('isn\'t', 'en', 0),
+	('aren\'t', 'en', 0),
+	('wasn\'t', 'en', 0),
+	('weren\'t', 'en', 0),
+	('hasn\'t', 'en', 0),
+	('haven\'t', 'en', 0),
+	('hadn\'t', 'en', 0),
+	('doesn\'t', 'en', 0),
+	('don\'t', 'en', 0),
+	('didn\'t', 'en', 0),
+	('won\'t', 'en', 0),
+	('wouldn\'t', 'en', 0),
+	('shan\'t', 'en', 0),
+	('shouldn\'t', 'en', 0),
+	('can\'t', 'en', 0),
+	('cannot', 'en', 0),
+	('couldn\'t', 'en', 0),
+	('mustn\'t', 'en', 0),
+	('let\'s', 'en', 0),
+	('that\'s', 'en', 0),
+	('who\'s', 'en', 0),
+	('what\'s', 'en', 0),
+	('here\'s', 'en', 0),
+	('there\'s', 'en', 0),
+	('when\'s', 'en', 0),
+	('where\'s', 'en', 0),
+	('why\'s', 'en', 0),
+	('how\'s', 'en', 0),
+	('a', 'en', 0),
+	('an', 'en', 0),
+	('the', 'en', 0),
+	('and', 'en', 0),
+	('but', 'en', 0),
+	('if', 'en', 0),
+	('or', 'en', 0),
+	('because', 'en', 0),
+	('as', 'en', 0),
+	('until', 'en', 0),
+	('while', 'en', 0),
+	('of', 'en', 0),
+	('at', 'en', 0),
+	('by', 'en', 0),
+	('for', 'en', 0),
+	('with', 'en', 0),
+	('about', 'en', 0),
+	('against', 'en', 0),
+	('between', 'en', 0),
+	('into', 'en', 0),
+	('through', 'en', 0),
+	('during', 'en', 0),
+	('before', 'en', 0),
+	('after', 'en', 0),
+	('above', 'en', 0),
+	('below', 'en', 0),
+	('to', 'en', 0),
+	('from', 'en', 0),
+	('up', 'en', 0),
+	('down', 'en', 0),
+	('in', 'en', 0),
+	('out', 'en', 0),
+	('on', 'en', 0),
+	('off', 'en', 0),
+	('over', 'en', 0),
+	('under', 'en', 0),
+	('again', 'en', 0),
+	('further', 'en', 0),
+	('then', 'en', 0),
+	('once', 'en', 0),
+	('here', 'en', 0),
+	('there', 'en', 0),
+	('when', 'en', 0),
+	('where', 'en', 0),
+	('why', 'en', 0),
+	('how', 'en', 0),
+	('all', 'en', 0),
+	('any', 'en', 0),
+	('both', 'en', 0),
+	('each', 'en', 0),
+	('few', 'en', 0),
+	('more', 'en', 0),
+	('most', 'en', 0),
+	('other', 'en', 0),
+	('some', 'en', 0),
+	('such', 'en', 0),
+	('no', 'en', 0),
+	('nor', 'en', 0),
+	('not', 'en', 0),
+	('only', 'en', 0),
+	('own', 'en', 0),
+	('same', 'en', 0),
+	('so', 'en', 0),
+	('than', 'en', 0),
+	('too', 'en', 0),
+	('very', 'en', 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-19.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-19.sql
index 35b6e684afaca..3de94a1bc9368 100644
--- a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-19.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-19.sql
@@ -14,5 +14,5 @@ CREATE TABLE IF NOT EXISTS `#__template_overrides` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
 INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`, `namespace`) VALUES
-(491, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 4, 0, ''),
-(492, 0, 'plg_quickicon_overridecheck', 'plugin', 'overridecheck', 'quickicon', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0, '');
+(504, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 4, 0, ''),
+(505, 0, 'plg_quickicon_overridecheck', 'plugin', 'overridecheck', 'quickicon', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0, '');
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-29.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-29.sql
new file mode 100644
index 0000000000000..9437f4bf5e014
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-29.sql
@@ -0,0 +1,26 @@
+DROP TABLE #__finder_taxonomy;
+
+CREATE TABLE IF NOT EXISTS `#__finder_taxonomy` (
+	`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+	`parent_id` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`lft` INT(11) NOT NULL DEFAULT '0',
+	`rgt` INT(11) NOT NULL DEFAULT '0',
+	`level` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`path` VARCHAR(400) NOT NULL DEFAULT '',
+	`title` VARCHAR(255) NOT NULL DEFAULT '',
+	`alias` VARCHAR(400) NOT NULL DEFAULT '',
+	`state` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
+	`access` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
+	`language` CHAR(7) NOT NULL DEFAULT '',
+	PRIMARY KEY (`id`),
+	INDEX `idx_state` (`state`),
+	INDEX `idx_access` (`access`),
+	INDEX `idx_path` (`path`(100)),
+	INDEX `idx_left_right` (`lft`, `rgt`),
+	INDEX `idx_alias` (`alias`(100)),
+	INDEX `idx_language` (`language`),
+	INDEX `idx_parent_published` (`parent_id`, `state`, `access`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+INSERT INTO `#__finder_taxonomy` (`id`, `parent_id`, `lft`, `rgt`, `level`, `path`, `title`, `alias`, `state`, `access`, `language`) VALUES
+(1, 0, 0, 1, 0, '', 'ROOT', 'root', 1, 1, '*');
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-08-29.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-08-29.sql
new file mode 100644
index 0000000000000..3786f39217d21
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-08-29.sql
@@ -0,0 +1,9 @@
+ALTER TABLE `#__modules` MODIFY `publish_up` datetime NULL DEFAULT NULL;
+ALTER TABLE `#__modules` MODIFY `publish_down` datetime NULL DEFAULT NULL;
+ALTER TABLE `#__modules` MODIFY `checked_out_time` datetime NULL DEFAULT NULL;
+
+-- Use 0 instead of '0000-00-00 00:00:00' if you get 'Invalid default value for ...'
+UPDATE `#__modules` SET
+	`publish_up` = CASE WHEN `publish_up` IN ('0000-00-00 00:00:00', '1000-01-01 00:00:00') THEN NULL ELSE `publish_up` END,
+	`publish_down` = CASE WHEN `publish_down` IN ('0000-00-00 00:00:00', '1000-01-01 00:00:00') THEN NULL ELSE `publish_down` END,
+	`checked_out_time` = CASE WHEN `checked_out_time` IN ('0000-00-00 00:00:00', '1000-01-01 00:00:00') THEN NULL ELSE `checked_out_time` END;
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-01-05.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-01-05.sql
new file mode 100644
index 0000000000000..8832618121ad1
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-01-05.sql
@@ -0,0 +1,3 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(900, 0, 'plg_api-authentication_basic', 'plugin', 'basic', 'api-authentication', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(901, 0, 'plg_webservices_content', 'plugin', 'content', 'webservices', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-03-09.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-03-09.sql
new file mode 100644
index 0000000000000..fc280184efb50
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-03-09.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(507, 0, 'plg_system_skipto', 'plugin', 'skipto', 'system', 0, 1, 1, 0, '', '{}',  0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-03-31.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-03-31.sql
new file mode 100644
index 0000000000000..b36e061a25170
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-03-31.sql
@@ -0,0 +1,3 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(502, 0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 1, 1, 0, '', '{}',  0, '0000-00-00 00:00:00', 0, 0),
+(500, 0, 'plg_installer_webinstaller', 'plugin', 'webinstaller', 'installer', 0, 1, 1, 0, '', '{}',  0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-02.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-02.sql
new file mode 100644
index 0000000000000..9eec675a8f1cb
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-02.sql
@@ -0,0 +1,17 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(35, 0, 'com_privacy', 'component', 'com_privacy', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+
+CREATE TABLE "#__privacy_requests" (
+  "id" serial NOT NULL,
+  "email" varchar(100) DEFAULT '' NOT NULL,
+  "requested_at" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "status" smallint DEFAULT 0 NOT NULL,
+  "request_type" varchar(25) DEFAULT '' NOT NULL,
+  "confirm_token" varchar(100) DEFAULT '' NOT NULL,
+  "confirm_token_created_at" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "checked_out" integer DEFAULT 0 NOT NULL,
+  "checked_out_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "#__privacy_requests_idx_checked_out" ON "#__privacy_requests" ("checked_out");
+CREATE INDEX "#__privacy_requests_idx_user_id" ON "#__privacy_requests" ("user_id");
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-03.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-03.sql
new file mode 100644
index 0000000000000..6ef9999e731f4
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-03.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(482, 0, 'plg_content_confirmconsent', 'plugin', 'confirmconsent', 'content', 0, 0, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-05.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-05.sql
new file mode 100644
index 0000000000000..94366fa954c7e
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-05.sql
@@ -0,0 +1,92 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(36, 0, 'com_actionlogs', 'component', 'com_actionlogs', '', 1, 1, 1, 1, '', '{"ip_logging":0,"csv_delimiter":",","loggable_extensions":["com_banners","com_cache","com_categories","com_config","com_contact","com_content","com_installer","com_media","com_menus","com_messages","com_modules","com_newsfeeds","com_plugins","com_redirect","com_tags","com_templates","com_users"]}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(483, 0, 'plg_system_actionlogs', 'plugin', 'actionlogs', 'system', 0, 0, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(484, 0, 'plg_actionlog_joomla', 'plugin', 'joomla', 'actionlog', 0, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+
+--
+-- Table: #__action_logs
+--
+CREATE TABLE "#__action_logs" (
+  "id" serial NOT NULL,
+  "message_language_key" varchar(255) NOT NULL DEFAULT '',
+  "message" text NOT NULL DEFAULT '',
+  "log_date" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "extension" varchar(50) NOT NULL DEFAULT '',
+  "user_id" integer DEFAULT 0 NOT NULL,
+  "item_id" integer DEFAULT 0 NOT NULL,
+  "ip_address" varchar(40) NOT NULL DEFAULT '0.0.0.0',
+  PRIMARY KEY ("id")
+);
+
+-- Table: #__action_logs_extensions
+--
+CREATE TABLE "#__action_logs_extensions" (
+  "id" serial NOT NULL,
+  "extension" varchar(50) NOT NULL DEFAULT '',
+  PRIMARY KEY ("id")
+);
+
+--
+-- Dumping data for table '#__action_logs_extensions'
+--
+INSERT INTO "#__action_logs_extensions" ("id", "extension") VALUES
+(1, 'com_banners'),
+(2, 'com_cache'),
+(3, 'com_categories'),
+(4, 'com_config'),
+(5, 'com_contact'),
+(6, 'com_content'),
+(7, 'com_installer'),
+(8, 'com_media'),
+(9, 'com_menus'),
+(10, 'com_messages'),
+(11, 'com_modules'),
+(12, 'com_newsfeeds'),
+(13, 'com_plugins'),
+(14, 'com_redirect'),
+(15, 'com_tags'),
+(16, 'com_templates'),
+(17, 'com_users');
+
+SELECT setval('#__action_logs_extensions_id_seq', 18, false);
+-- --------------------------------------------------------
+
+--
+-- Table: #__action_log_config
+--
+CREATE TABLE "#__action_log_config" (
+  "id" serial NOT NULL,
+  "type_title" varchar(255) NOT NULL DEFAULT '',
+  "type_alias" varchar(255) NOT NULL DEFAULT '',
+  "id_holder" varchar(255) NULL,
+  "title_holder" varchar(255) NULL,
+  "table_name" varchar(255) NULL,
+  "text_prefix" varchar(255) NULL,
+  PRIMARY KEY ("id")
+);
+
+--
+-- Dumping data for table #__action_log_config
+--
+INSERT INTO "#__action_log_config" ("id", "type_title", "type_alias", "id_holder", "title_holder", "table_name", "text_prefix") VALUES
+(1, 'article', 'com_content.article', 'id' ,'title' , '#__content', 'PLG_ACTIONLOG_JOOMLA'),
+(2, 'article', 'com_content.form', 'id', 'title' , '#__content', 'PLG_ACTIONLOG_JOOMLA'),
+(3, 'banner', 'com_banners.banner', 'id' ,'name' , '#__banners', 'PLG_ACTIONLOG_JOOMLA'),
+(4, 'user_note', 'com_users.note', 'id', 'subject' ,'#__user_notes', 'PLG_ACTIONLOG_JOOMLA'),
+(5, 'media', 'com_media.file', '' , 'name' , '',  'PLG_ACTIONLOG_JOOMLA'),
+(6, 'category', 'com_categories.category', 'id' , 'title' , '#__categories', 'PLG_ACTIONLOG_JOOMLA'),
+(7, 'menu', 'com_menus.menu', 'id' ,'title' , '#__menu_types', 'PLG_ACTIONLOG_JOOMLA'),
+(8, 'menu_item', 'com_menus.item', 'id' , 'title' , '#__menu', 'PLG_ACTIONLOG_JOOMLA'),
+(9, 'newsfeed', 'com_newsfeeds.newsfeed', 'id' ,'name' , '#__newsfeeds', 'PLG_ACTIONLOG_JOOMLA'),
+(10, 'link', 'com_redirect.link', 'id', 'old_url' , '#__redirect_links', 'PLG_ACTIONLOG_JOOMLA'),
+(11, 'tag', 'com_tags.tag', 'id', 'title' , '#__tags', 'PLG_ACTIONLOG_JOOMLA'),
+(12, 'style', 'com_templates.style', 'id' , 'title' , '#__template_styles', 'PLG_ACTIONLOG_JOOMLA'),
+(13, 'plugin', 'com_plugins.plugin', 'extension_id' , 'name' , '#__extensions', 'PLG_ACTIONLOG_JOOMLA'),
+(14, 'component_config', 'com_config.component', 'extension_id' , 'name', '', 'PLG_ACTIONLOG_JOOMLA'),
+(15, 'contact', 'com_contact.contact', 'id', 'name', '#__contact_details', 'PLG_ACTIONLOG_JOOMLA'),
+(16, 'module', 'com_modules.module', 'id' ,'title', '#__modules', 'PLG_ACTIONLOG_JOOMLA'),
+(17, 'access_level', 'com_users.level', 'id' , 'title', '#__viewlevels', 'PLG_ACTIONLOG_JOOMLA'),
+(18, 'banner_client', 'com_banners.client', 'id', 'name', '#__banner_clients', 'PLG_ACTIONLOG_JOOMLA');
+
+
+SELECT setval('#__action_log_config_id_seq', 18, false);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-19.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-19.sql
new file mode 100644
index 0000000000000..b8ce724e76bf4
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-19.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(481, 0, 'plg_fields_repeatable', 'plugin', 'repeatable', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-20.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-20.sql
new file mode 100644
index 0000000000000..1245f67a7df6b
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-20.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(319, 0, 'mod_latestactions', 'module', 'mod_latestactions', '', 1, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-24.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-24.sql
new file mode 100644
index 0000000000000..649caf5771667
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-24.sql
@@ -0,0 +1,18 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(485, 0, 'plg_system_privacyconsent', 'plugin', 'privacyconsent', 'system', 0, 0, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+
+--
+-- Table structure for table `#__privacy_consents`
+--
+
+CREATE TABLE "#__privacy_consents" (
+  "id" serial NOT NULL,
+  "user_id" bigint DEFAULT 0 NOT NULL,
+  "created" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "subject" varchar(255) DEFAULT '' NOT NULL,
+  "body" text NOT NULL,
+  "remind" smallint DEFAULT 0 NOT NULL,
+  "token" varchar(100) DEFAULT '' NOT NULL,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "#__privacy_consents_idx_user_id" ON "#__privacy_consents" ("user_id");
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-27.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-27.sql
new file mode 100644
index 0000000000000..9d13ef54ad8e7
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-27.sql
@@ -0,0 +1,3 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(486, 0, 'plg_system_logrotation', 'plugin', 'logrotation', 'system', 0, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(487, 0, 'plg_privacy_user', 'plugin', 'user', 'privacy', 0, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-06-02.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-06-02.sql
new file mode 100644
index 0000000000000..2551f21d93cc3
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-06-02.sql
@@ -0,0 +1,4 @@
+ALTER TABLE "#__content" ADD COLUMN "note" VARCHAR(255) NOT NULL DEFAULT '';
+
+UPDATE "#__content_types" SET "field_mappings" = 
+'{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"introtext", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"attribs", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"asset_id", "note":"note"}, "special":{"fulltext":"fulltext"}}' WHERE "type_title" = 'Article';
\ No newline at end of file
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-06-12.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-06-12.sql
new file mode 100644
index 0000000000000..f1d2dffb8e93e
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-06-12.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(320, 0, 'mod_privacy_dashboard', 'module', 'mod_privacy_dashboard', '', 1, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-06-13.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-06-13.sql
new file mode 100644
index 0000000000000..86a8fa6ba7167
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-06-13.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(488, 0, 'plg_quickicon_privacycheck', 'plugin', 'privacycheck', 'quickicon', 0, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-06-14.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-06-14.sql
new file mode 100644
index 0000000000000..f2e932fee5a4f
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-06-14.sql
@@ -0,0 +1,3 @@
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") VALUES
+(700, 'COM_ACTIONLOGS_POSTINSTALL_TITLE', 'COM_ACTIONLOGS_POSTINSTALL_BODY', '', 'com_actionlogs', 1, 'message', '', '', '', '', '3.9.0', 1),
+(700, 'COM_PRIVACY_POSTINSTALL_TITLE', 'COM_PRIVACY_POSTINSTALL_BODY', '', 'com_privacy', 1, 'message', '', '', '', '', '3.9.0', 1);
\ No newline at end of file
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-06-17.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-06-17.sql
new file mode 100644
index 0000000000000..e10fe5087a320
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-06-17.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(489, 0, 'plg_user_terms', 'plugin', 'terms', 'user', 0, 0, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-07-09.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-07-09.sql
new file mode 100644
index 0000000000000..951914be74db4
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-07-09.sql
@@ -0,0 +1,4 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(490, 0, 'plg_privacy_contact', 'plugin', 'contact', 'privacy', 0, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(491, 0, 'plg_privacy_content', 'plugin', 'content', 'privacy', 0, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(492, 0, 'plg_privacy_message', 'plugin', 'message', 'privacy', 0, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-07-10.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-07-10.sql
new file mode 100644
index 0000000000000..74e65fd4b16be
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-07-10.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__action_log_config" ("id", "type_title", "type_alias", "id_holder", "title_holder", "table_name", "text_prefix")
+	VALUES (19, 'application_config', 'com_config.application', '', 'name', '', 'PLG_ACTIONLOG_JOOMLA');
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-07-11.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-07-11.sql
new file mode 100644
index 0000000000000..270a1af635148
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-07-11.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(493, 0, 'plg_privacy_actionlogs', 'plugin', 'actionlogs', 'privacy', 0, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-08-12.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-08-12.sql
new file mode 100644
index 0000000000000..4e56e40bb7911
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-08-12.sql
@@ -0,0 +1 @@
+ALTER TABLE "#__privacy_consents" ADD COLUMN "state" smallint DEFAULT 1 NOT NULL;
\ No newline at end of file
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-08-28.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-08-28.sql
new file mode 100644
index 0000000000000..2492ac1788f60
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-08-28.sql
@@ -0,0 +1,7 @@
+ALTER TABLE "#__session" ALTER COLUMN "session_id" DROP DEFAULT;
+ALTER TABLE "#__session" ALTER COLUMN "session_id" TYPE bytea USING "session_id"::bytea;
+ALTER TABLE "#__session" ALTER COLUMN "session_id" SET NOT NULL;
+ALTER TABLE "#__session" ALTER COLUMN "time" DROP DEFAULT,
+                         ALTER COLUMN "time" TYPE integer USING "time"::integer;
+ALTER TABLE "#__session" ALTER COLUMN "time" SET DEFAULT 0;
+ALTER TABLE "#__session" ALTER COLUMN "time" SET NOT NULL;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-08-29.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-08-29.sql
new file mode 100644
index 0000000000000..b4421597d895b
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-08-29.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(494, 0, 'plg_captcha_recaptcha_invisible', 'plugin', 'recaptcha_invisible', 'captcha', 0, 0, 1, 0, '', '{"public_key":"","private_key":"","theme":"clean"}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-09-04.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-09-04.sql
new file mode 100644
index 0000000000000..1823a0a8fed4b
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-09-04.sql
@@ -0,0 +1,8 @@
+CREATE TABLE "#__action_logs_users" (
+  "user_id" integer NOT NULL,
+  "notify" integer NOT NULL,
+  "extensions" text NOT NULL,
+  PRIMARY KEY ("user_id")
+);
+
+CREATE INDEX "#__action_logs_users_idx_notify" ON "#__action_logs_users" ("notify");
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-10-15.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-10-15.sql
new file mode 100644
index 0000000000000..358decd0a484a
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-10-15.sql
@@ -0,0 +1,4 @@
+CREATE INDEX "#__action_logs_idx_user_id" ON "#__action_logs" ("user_id"); 
+CREATE INDEX "#__action_logs_idx_user_id_logdate" ON "#__action_logs" ("user_id", "log_date"); 
+CREATE INDEX "#__action_logs_idx_user_id_extension" ON "#__action_logs" ("user_id", "extension");
+CREATE INDEX "#__action_logs_idx_extension_itemid" ON "#__action_logs" ("extension", "item_id");
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-10-20.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-10-20.sql
new file mode 100644
index 0000000000000..a33f707516f5a
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-10-20.sql
@@ -0,0 +1,3 @@
+DROP INDEX "#__privacy_requests_idx_checked_out";
+ALTER TABLE "#__privacy_requests" DROP COLUMN "checked_out";
+ALTER TABLE "#__privacy_requests" DROP COLUMN "checked_out_time";
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-10-21.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-10-21.sql
new file mode 100644
index 0000000000000..271663e64fbc2
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-10-21.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(495, 0, 'plg_privacy_consents', 'plugin', 'consents', 'privacy', 0, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-07-03.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-07-03.sql
index 9540431d11de3..d2e76a5654153 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-07-03.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-07-03.sql
@@ -1,3 +1,3 @@
 INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
-(458, 'plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(459, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
\ No newline at end of file
+(494, 'plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(495, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-04-25.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-04-25.sql
index c2b2bef81945b..0ef1a93a1a555 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-04-25.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-04-25.sql
@@ -1,5 +1,5 @@
 INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
-(481, 'plg_filesystem_local', 'plugin', 'local', 'filesystem', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
-(482, 'plg_media-action_crop', 'plugin', 'crop', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
-(483, 'plg_media-action_resize', 'plugin', 'resize', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
-(484, 'plg_media-action_rotate', 'plugin', 'rotate', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),;
+(496, 'plg_filesystem_local', 'plugin', 'local', 'filesystem', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(497, 'plg_media-action_crop', 'plugin', 'crop', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(498, 'plg_media-action_resize', 'plugin', 'resize', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(499, 'plg_media-action_rotate', 'plugin', 'rotate', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-06-03.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-06-03.sql
new file mode 100644
index 0000000000000..018cb0b5b749a
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-06-03.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "#__extensions" ADD COLUMN "changelogurl" text;
+ALTER TABLE "#__updates" ADD COLUMN "changelogurl" text;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-10-10.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-10-10.sql
index f9321eed78908..e4f7cb20ee330 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-10-10.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-10-10.sql
@@ -1,5 +1,5 @@
 INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
-(487, 'plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 0, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0);
+(501, 'plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 0, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0);
 
 INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
 VALUES
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-05-15.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-05-15.sql
index 28c2c3c34cdc1..c07179ff547f0 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-05-15.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-05-15.sql
@@ -75,8 +75,8 @@ CREATE INDEX "#__workflow_stages_idx_default" ON "#__workflow_stages" ("default"
 --
 
 INSERT INTO "#__workflow_stages" ("id", "asset_id", "ordering", "workflow_id", "published", "title", "description", "condition", "default") VALUES
-(1, 0, 1, 1, 1, 'JUNPUBLISHED', '', 0, 0),
-(2, 0, 2, 1, 1, 'JPUBLISHED', '', 1, 1),
+(1, 0, 1, 1, 1, 'JUNPUBLISHED', '', 0, 1),
+(2, 0, 2, 1, 1, 'JPUBLISHED', '', 1, 0),
 (3, 0, 3, 1, 1, 'JTRASHED', '', -2, 0),
 (4, 0, 4, 1, 1, 'JARCHIVED', '', 2, 0);
 
@@ -113,7 +113,7 @@ INSERT INTO "#__workflow_transitions" ("id", "asset_id", "published", "ordering"
 --
 
 INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
-(35, 0, 'com_workflow', 'component', 'com_workflow', '', 1, 1, 0, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0);
+(37, 0, 'com_workflow', 'component', 'com_workflow', '', 1, 1, 0, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0);
 
 --
 -- Creating Associations for existing content
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-03.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-03.sql
index 9b024b02fed9e..06e202c826dd2 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-03.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-03.sql
@@ -15,4 +15,4 @@ CREATE TABLE IF NOT EXISTS "#__csp" (
 );
 
 INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
-(35, 'com_csp', 'component', 'com_csp', ' ', 0, 0, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0);
+(38, 'com_csp', 'component', 'com_csp', ' ', 0, 0, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-11.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-11.sql
index 4d4ddb987927d..e0b521329686a 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-11.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-11.sql
@@ -1,4 +1,4 @@
 INSERT INTO "#__extensions"
 ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state")
 VALUES
-  (488, 0, 'plg_sampledata_blog', 'plugin', 'multilang', 'sampledata', 0, 0, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0);
+  (490, 0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 0, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-16.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-16.sql
new file mode 100644
index 0000000000000..3bfbbd98c407c
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-16.sql
@@ -0,0 +1,186 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES (506, 0, 'plg_extension_finder', 'plugin', 'finder', 'extension', 0, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0);
+DROP TABLE IF EXISTS "#__finder_terms_common";
+CREATE TABLE "#__finder_terms_common" (
+  "term" varchar(75) NOT NULL,
+  "language" varchar(7) DEFAULT '' NOT NULL,
+  "custom" integer DEFAULT 0 NOT NULL,
+  CONSTRAINT "#__finder_terms_idx_term" UNIQUE ("term", "language")
+);
+CREATE INDEX "#__finder_terms_common_idx_word_lang" on "#__finder_terms_common" ("term", "language");
+CREATE INDEX "#__finder_terms_common_idx_lang" on "#__finder_terms_common" ("language");
+
+INSERT INTO "#__finder_terms_common" ("term", "language", "custom") VALUES
+	('i', 'en', 0),
+	('me', 'en', 0),
+	('my', 'en', 0),
+	('myself', 'en', 0),
+	('we', 'en', 0),
+	('our', 'en', 0),
+	('ours', 'en', 0),
+	('ourselves', 'en', 0),
+	('you', 'en', 0),
+	('your', 'en', 0),
+	('yours', 'en', 0),
+	('yourself', 'en', 0),
+	('yourselves', 'en', 0),
+	('he', 'en', 0),
+	('him', 'en', 0),
+	('his', 'en', 0),
+	('himself', 'en', 0),
+	('she', 'en', 0),
+	('her', 'en', 0),
+	('hers', 'en', 0),
+	('herself', 'en', 0),
+	('it', 'en', 0),
+	('its', 'en', 0),
+	('itself', 'en', 0),
+	('they', 'en', 0),
+	('them', 'en', 0),
+	('their', 'en', 0),
+	('theirs', 'en', 0),
+	('themselves', 'en', 0),
+	('what', 'en', 0),
+	('which', 'en', 0),
+	('who', 'en', 0),
+	('whom', 'en', 0),
+	('this', 'en', 0),
+	('that', 'en', 0),
+	('these', 'en', 0),
+	('those', 'en', 0),
+	('am', 'en', 0),
+	('is', 'en', 0),
+	('are', 'en', 0),
+	('was', 'en', 0),
+	('were', 'en', 0),
+	('be', 'en', 0),
+	('been', 'en', 0),
+	('being', 'en', 0),
+	('have', 'en', 0),
+	('has', 'en', 0),
+	('had', 'en', 0),
+	('having', 'en', 0),
+	('do', 'en', 0),
+	('does', 'en', 0),
+	('did', 'en', 0),
+	('doing', 'en', 0),
+	('would', 'en', 0),
+	('should', 'en', 0),
+	('could', 'en', 0),
+	('ought', 'en', 0),
+	('i\'m', 'en', 0),
+	('you\'re', 'en', 0),
+	('he\'s', 'en', 0),
+	('she\'s', 'en', 0),
+	('it\'s', 'en', 0),
+	('we\'re', 'en', 0),
+	('they\'re', 'en', 0),
+	('i\'ve', 'en', 0),
+	('you\'ve', 'en', 0),
+	('we\'ve', 'en', 0),
+	('they\'ve', 'en', 0),
+	('i\'d', 'en', 0),
+	('you\'d', 'en', 0),
+	('he\'d', 'en', 0),
+	('she\'d', 'en', 0),
+	('we\'d', 'en', 0),
+	('they\'d', 'en', 0),
+	('i\'ll', 'en', 0),
+	('you\'ll', 'en', 0),
+	('he\'ll', 'en', 0),
+	('she\'ll', 'en', 0),
+	('we\'ll', 'en', 0),
+	('they\'ll', 'en', 0),
+	('isn\'t', 'en', 0),
+	('aren\'t', 'en', 0),
+	('wasn\'t', 'en', 0),
+	('weren\'t', 'en', 0),
+	('hasn\'t', 'en', 0),
+	('haven\'t', 'en', 0),
+	('hadn\'t', 'en', 0),
+	('doesn\'t', 'en', 0),
+	('don\'t', 'en', 0),
+	('didn\'t', 'en', 0),
+	('won\'t', 'en', 0),
+	('wouldn\'t', 'en', 0),
+	('shan\'t', 'en', 0),
+	('shouldn\'t', 'en', 0),
+	('can\'t', 'en', 0),
+	('cannot', 'en', 0),
+	('couldn\'t', 'en', 0),
+	('mustn\'t', 'en', 0),
+	('let\'s', 'en', 0),
+	('that\'s', 'en', 0),
+	('who\'s', 'en', 0),
+	('what\'s', 'en', 0),
+	('here\'s', 'en', 0),
+	('there\'s', 'en', 0),
+	('when\'s', 'en', 0),
+	('where\'s', 'en', 0),
+	('why\'s', 'en', 0),
+	('how\'s', 'en', 0),
+	('a', 'en', 0),
+	('an', 'en', 0),
+	('the', 'en', 0),
+	('and', 'en', 0),
+	('but', 'en', 0),
+	('if', 'en', 0),
+	('or', 'en', 0),
+	('because', 'en', 0),
+	('as', 'en', 0),
+	('until', 'en', 0),
+	('while', 'en', 0),
+	('of', 'en', 0),
+	('at', 'en', 0),
+	('by', 'en', 0),
+	('for', 'en', 0),
+	('with', 'en', 0),
+	('about', 'en', 0),
+	('against', 'en', 0),
+	('between', 'en', 0),
+	('into', 'en', 0),
+	('through', 'en', 0),
+	('during', 'en', 0),
+	('before', 'en', 0),
+	('after', 'en', 0),
+	('above', 'en', 0),
+	('below', 'en', 0),
+	('to', 'en', 0),
+	('from', 'en', 0),
+	('up', 'en', 0),
+	('down', 'en', 0),
+	('in', 'en', 0),
+	('out', 'en', 0),
+	('on', 'en', 0),
+	('off', 'en', 0),
+	('over', 'en', 0),
+	('under', 'en', 0),
+	('again', 'en', 0),
+	('further', 'en', 0),
+	('then', 'en', 0),
+	('once', 'en', 0),
+	('here', 'en', 0),
+	('there', 'en', 0),
+	('when', 'en', 0),
+	('where', 'en', 0),
+	('why', 'en', 0),
+	('how', 'en', 0),
+	('all', 'en', 0),
+	('any', 'en', 0),
+	('both', 'en', 0),
+	('each', 'en', 0),
+	('few', 'en', 0),
+	('more', 'en', 0),
+	('most', 'en', 0),
+	('other', 'en', 0),
+	('some', 'en', 0),
+	('such', 'en', 0),
+	('no', 'en', 0),
+	('nor', 'en', 0),
+	('not', 'en', 0),
+	('only', 'en', 0),
+	('own', 'en', 0),
+	('same', 'en', 0),
+	('so', 'en', 0),
+	('than', 'en', 0),
+	('too', 'en', 0),
+	('very', 'en', 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-19.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-19.sql
index 67174b4a65058..60f50a3233acc 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-19.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-19.sql
@@ -14,5 +14,5 @@ CREATE INDEX "#__template_overrides_idx_template" ON "#__template_overrides" ("t
 CREATE INDEX "#__template_overrides_idx_extension_id" ON "#__template_overrides" ("extension_id");
 
 INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state", "namespace") VALUES
-(491, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 4, 0, ''),
-(492, 0, 'plg_quickicon_overridecheck', 'plugin', 'overridecheck', 'quickicon', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0, '');
+(504, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 4, 0, ''),
+(505, 0, 'plg_quickicon_overridecheck', 'plugin', 'overridecheck', 'quickicon', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0, '');
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-29.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-29.sql
new file mode 100644
index 0000000000000..ea1b4ae743d71
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-29.sql
@@ -0,0 +1,28 @@
+DROP TABLE "#__finder_taxonomy";
+
+CREATE TABLE IF NOT EXISTS "#__finder_taxonomy" (
+  "id" serial NOT NULL,
+  "parent_id" integer DEFAULT 0 NOT NULL,
+  "lft" integer DEFAULT 0 NOT NULL,
+  "rgt" integer DEFAULT 0 NOT NULL,
+  "level" integer DEFAULT 0 NOT NULL,
+  "path" VARCHAR(400) NOT NULL DEFAULT '',
+  "title" VARCHAR(255) NOT NULL DEFAULT '',
+  "alias" VARCHAR(400) NOT NULL DEFAULT '',
+  "state" smallint DEFAULT 1 NOT NULL,
+  "access" smallint DEFAULT 1 NOT NULL,
+  "language" varchar(7) DEFAULT '' NOT NULL,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "#__finder_taxonomy_state" on "#__finder_taxonomy" ("state");
+CREATE INDEX "#__finder_taxonomy_access" on "#__finder_taxonomy" ("access");
+CREATE INDEX "#__finder_taxonomy_path" on "#__finder_taxonomy" ("path");
+CREATE INDEX "#__finder_taxonomy_lft_rgt" on "#__finder_taxonomy" ("lft", "rgt");
+CREATE INDEX "#__finder_taxonomy_alias" on "#__finder_taxonomy" ("alias");
+CREATE INDEX "#__finder_taxonomy_language" on "#__finder_taxonomy" ("language");
+CREATE INDEX "#__finder_taxonomy_idx_parent_published" on "#__finder_taxonomy" ("parent_id", "state", "access");
+
+INSERT INTO "#__finder_taxonomy" ("id", "parent_id", "lft", "rgt", "level", "path", "title", "alias", "state", "access", "language") VALUES
+(1, 0, 0, 1, 0, '', 'ROOT', 'root', 1, 1, '*');
+
+SELECT setval('#__finder_taxonomy_id_seq', 2, false);
\ No newline at end of file
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-08-29.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-08-29.sql
new file mode 100644
index 0000000000000..723794f171d25
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-08-29.sql
@@ -0,0 +1,13 @@
+ALTER TABLE "#__modules" ALTER COLUMN "publish_up" DROP NOT NULL;
+ALTER TABLE "#__modules" ALTER COLUMN "publish_up" DROP DEFAULT;
+
+ALTER TABLE "#__modules" ALTER COLUMN "publish_down" DROP NOT NULL;
+ALTER TABLE "#__modules" ALTER COLUMN "publish_down" DROP DEFAULT;
+
+ALTER TABLE "#__modules" ALTER COLUMN "checked_out_time" DROP NOT NULL;
+ALTER TABLE "#__modules" ALTER COLUMN "checked_out_time" DROP DEFAULT;
+
+UPDATE "#__modules" SET
+	"publish_up" = CASE WHEN "publish_up" = '1970-01-01 00:00:00' THEN NULL ELSE "publish_up" END,
+	"publish_down" = CASE WHEN "publish_down" = '1970-01-01 00:00:00' THEN NULL ELSE "publish_down" END,
+	"checked_out_time" = CASE WHEN "checked_out_time" = '1970-01-01 00:00:00' THEN NULL ELSE "checked_out_time" END;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-01-05.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-01-05.sql
new file mode 100644
index 0000000000000..8432ebe636b27
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-01-05.sql
@@ -0,0 +1,3 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(900, 0, 'plg_api-authentication_basic', 'plugin', 'basic', 'api-authentication', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(901, 0, 'plg_webservices_content', 'plugin', 'content', 'webservices', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-03-09.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-03-09.sql
new file mode 100644
index 0000000000000..9b6cc6bee874a
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-03-09.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(507, 0, 'plg_system_skipto', 'plugin', 'skipto', 'system', 0, 1, 1, 0, '', '{}',  0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-03-31.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-03-31.sql
new file mode 100644
index 0000000000000..49ff324103cf4
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-03-31.sql
@@ -0,0 +1,3 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(502, 0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 1, 1, 0, '', '{}',  0, '1970-01-01 00:00:00', 0, 0),
+(500, 0, 'plg_installer_webinstaller', 'plugin', 'webinstaller', 'installer', 0, 1, 1, 0, '', '{}',  0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/tmpl/help/default.php b/administrator/components/com_admin/tmpl/help/default.php
index b0f537a468abd..9892d872dfa54 100644
--- a/administrator/components/com_admin/tmpl/help/default.php
+++ b/administrator/components/com_admin/tmpl/help/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/tmpl/help/langforum.php b/administrator/components/com_admin/tmpl/help/langforum.php
index aee7420915a76..c57b24160afc9 100644
--- a/administrator/components/com_admin/tmpl/help/langforum.php
+++ b/administrator/components/com_admin/tmpl/help/langforum.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/tmpl/profile/edit.php b/administrator/components/com_admin/tmpl/profile/edit.php
deleted file mode 100644
index 2f34cfae0f8f7..0000000000000
--- a/administrator/components/com_admin/tmpl/profile/edit.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Router\Route;
-
-HTMLHelper::_('behavior.formvalidator');
-
-// Get the form fieldsets.
-$fieldsets = $this->form->getFieldsets();
-?>
-
-<form action="<?php echo Route::_('index.php?option=com_admin&view=profile&layout=edit&id=' . $this->item->id); ?>" method="post" name="adminForm" id="profile-form" enctype="multipart/form-data" class="form-validate">
-	<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', array('active' => 'account')); ?>
-
-	<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'account', Text::_('COM_ADMIN_USER_ACCOUNT_DETAILS')); ?>
-	<?php foreach ($this->form->getFieldset('user_details') as $field) : ?>
-		<div class="control-group">
-			<div class="control-label">
-				<?php echo $field->label; ?>
-			</div>
-			<div class="controls">
-				<?php if ($field->fieldname == 'password2') : ?>
-					<?php // Disables autocomplete ?> <input type="password" style="display:none">
-				<?php endif; ?>
-				<?php echo $field->input; ?>
-			</div>
-		</div>
-	<?php endforeach; ?>
-	<?php echo HTMLHelper::_('uitab.endTab'); ?>
-
-	<?php foreach ($fieldsets as $fieldset) : ?>
-		<?php
-		if ($fieldset->name == 'user_details')
-		{
-			continue;
-		}
-		?>
-		<?php echo HTMLHelper::_('uitab.addTab', 'myTab', $fieldset->name, Text::_($fieldset->label)); ?>
-		<?php foreach ($this->form->getFieldset($fieldset->name) as $field) : ?>
-			<?php if ($field->hidden) : ?>
-				<div class="control-group">
-					<div class="controls"><?php echo $field->input; ?></div>
-				</div>
-			<?php else : ?>
-				<div class="control-group">
-					<div class="control-label">
-						<?php echo $field->label; ?>
-					</div>
-					<div class="controls"><?php echo $field->input; ?></div>
-				</div>
-			<?php endif; ?>
-		<?php endforeach; ?>
-		<?php echo HTMLHelper::_('uitab.endTab'); ?>
-	<?php endforeach; ?>
-
-	<?php echo HTMLHelper::_('uitab.endTabSet'); ?>
-	<input type="hidden" name="task" value="">
-	<?php echo HTMLHelper::_('form.token'); ?>
-</form>
diff --git a/administrator/components/com_admin/tmpl/sysinfo/default.php b/administrator/components/com_admin/tmpl/sysinfo/default.php
index 03e97fad66289..70735d7dc2525 100644
--- a/administrator/components/com_admin/tmpl/sysinfo/default.php
+++ b/administrator/components/com_admin/tmpl/sysinfo/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_config.php b/administrator/components/com_admin/tmpl/sysinfo/default_config.php
index b0ce9da672f8d..fa5ff1a0a5d99 100644
--- a/administrator/components/com_admin/tmpl/sysinfo/default_config.php
+++ b/administrator/components/com_admin/tmpl/sysinfo/default_config.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_directory.php b/administrator/components/com_admin/tmpl/sysinfo/default_directory.php
index c0f68f80c4123..dcfd30d6aa81f 100644
--- a/administrator/components/com_admin/tmpl/sysinfo/default_directory.php
+++ b/administrator/components/com_admin/tmpl/sysinfo/default_directory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_phpinfo.php b/administrator/components/com_admin/tmpl/sysinfo/default_phpinfo.php
index a3063d9b229ce..0c21295be3df4 100644
--- a/administrator/components/com_admin/tmpl/sysinfo/default_phpinfo.php
+++ b/administrator/components/com_admin/tmpl/sysinfo/default_phpinfo.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php b/administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php
index 2a695f460a84b..db9e2dfb092f6 100644
--- a/administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php
+++ b/administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_system.php b/administrator/components/com_admin/tmpl/sysinfo/default_system.php
index 24c1eaffcc086..e8abbb5fbdc4b 100644
--- a/administrator/components/com_admin/tmpl/sysinfo/default_system.php
+++ b/administrator/components/com_admin/tmpl/sysinfo/default_system.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_ajax/ajax.php b/administrator/components/com_ajax/ajax.php
index 0bbcfdf5da4a1..f96da3c4d69a0 100644
--- a/administrator/components/com_ajax/ajax.php
+++ b/administrator/components/com_ajax/ajax.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_ajax
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_ajax/ajax.xml b/administrator/components/com_ajax/ajax.xml
index 3bcd196e1bdb5..75d31342532a0 100644
--- a/administrator/components/com_ajax/ajax.xml
+++ b/administrator/components/com_ajax/ajax.xml
@@ -3,7 +3,7 @@
 	<name>com_ajax</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2013</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_associations/Controller/AssociationController.php b/administrator/components/com_associations/Controller/AssociationController.php
index 021405fa00e45..65a4e48697bb6 100644
--- a/administrator/components/com_associations/Controller/AssociationController.php
+++ b/administrator/components/com_associations/Controller/AssociationController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_associations
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,7 +14,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
 
 /**
@@ -64,7 +63,7 @@ public function edit($key = null, $urlVar = null)
 	 */
 	public function cancel($key = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		list($extensionName, $typeName) = explode('.', $this->input->get('itemtype', '', 'string'), 2);
 
diff --git a/administrator/components/com_associations/Controller/AssociationsController.php b/administrator/components/com_associations/Controller/AssociationsController.php
index 1007d2f2469db..f5c362d5a3f01 100644
--- a/administrator/components/com_associations/Controller/AssociationsController.php
+++ b/administrator/components/com_associations/Controller/AssociationsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_associations
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_associations/Controller/DisplayController.php b/administrator/components/com_associations/Controller/DisplayController.php
index c4d3d01ce63af..dd9497d71e1b9 100644
--- a/administrator/components/com_associations/Controller/DisplayController.php
+++ b/administrator/components/com_associations/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_associations
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_associations/Dispatcher/Dispatcher.php b/administrator/components/com_associations/Dispatcher/Dispatcher.php
index 07da1ee4d2f43..f949efa05e7ec 100644
--- a/administrator/components/com_associations/Dispatcher/Dispatcher.php
+++ b/administrator/components/com_associations/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_associations
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_associations/Field/ItemlanguageField.php b/administrator/components/com_associations/Field/ItemlanguageField.php
index 88bec1219315d..3f23450b9c8b9 100644
--- a/administrator/components/com_associations/Field/ItemlanguageField.php
+++ b/administrator/components/com_associations/Field/ItemlanguageField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_associations
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,19 +12,17 @@
 defined('JPATH_BASE') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
 use Joomla\Utilities\ArrayHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Field listing item languages
  *
  * @since  3.7.0
  */
-class ItemlanguageField extends \JFormFieldList
+class ItemlanguageField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/administrator/components/com_associations/Field/ItemtypeField.php b/administrator/components/com_associations/Field/ItemtypeField.php
index 76cdec8dfb7b0..cdbe2f89887d1 100644
--- a/administrator/components/com_associations/Field/ItemtypeField.php
+++ b/administrator/components/com_associations/Field/ItemtypeField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_associations
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_associations/Field/Modal/AssociationField.php b/administrator/components/com_associations/Field/Modal/AssociationField.php
index f59f5daffaee1..7dbca9a9dce60 100644
--- a/administrator/components/com_associations/Field/Modal/AssociationField.php
+++ b/administrator/components/com_associations/Field/Modal/AssociationField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_associations
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_associations/Helper/AssociationsHelper.php b/administrator/components/com_associations/Helper/AssociationsHelper.php
index f5ab84ecb973b..564e42d1aa61b 100644
--- a/administrator/components/com_associations/Helper/AssociationsHelper.php
+++ b/administrator/components/com_associations/Helper/AssociationsHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_associations
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_associations/Model/AssociationModel.php b/administrator/components/com_associations/Model/AssociationModel.php
index 24d075be85b03..8ed1685a28658 100644
--- a/administrator/components/com_associations/Model/AssociationModel.php
+++ b/administrator/components/com_associations/Model/AssociationModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_associations
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_associations/Model/AssociationsModel.php b/administrator/components/com_associations/Model/AssociationsModel.php
index 3ac7b4dea7969..da696f3ebff5d 100644
--- a/administrator/components/com_associations/Model/AssociationsModel.php
+++ b/administrator/components/com_associations/Model/AssociationsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_associations
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_associations/View/Association/HtmlView.php b/administrator/components/com_associations/View/Association/HtmlView.php
index 0bdc8326f9a83..c59abab1a6fb0 100644
--- a/administrator/components/com_associations/View/Association/HtmlView.php
+++ b/administrator/components/com_associations/View/Association/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_associations
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -119,6 +119,7 @@ public function display($tpl = null)
 		$reference     = ArrayHelper::fromObject(AssociationsHelper::getItem($extensionName, $typeName, $referenceId));
 
 		$this->referenceLanguage = $reference[$languageField];
+		$this->referenceTitle    = AssociationsHelper::getTypeFieldName($extensionName, $typeName, 'title');
 
 		// Check for special case category
 		$typeNameExploded = explode('.', $typeName);
@@ -156,6 +157,7 @@ public function display($tpl = null)
 		$this->targetLanguage   = '';
 		$this->defaultTargetSrc = '';
 		$this->targetAction     = '';
+		$this->targetTitle      = '';
 
 		if ($target = $input->get('target', '', 'string'))
 		{
@@ -163,38 +165,19 @@ public function display($tpl = null)
 			$this->targetAction     = $matches[2];
 			$this->targetId         = $matches[1];
 			$this->targetLanguage   = $matches[0];
-			$task                   = $this->typeName . '.' . $this->targetAction;
-			$this->defaultTargetSrc = Route::_($this->editUri . '&task=' . $task . '&id=' . (int) $this->targetId);
+			$this->targetTitle      = AssociationsHelper::getTypeFieldName($extensionName, $typeName, 'title');
+			$task                   = $typeName . '.' . $this->targetAction;
+
+			/*
+			 * Let's put the target src into a variable to use in the javascript code
+			 *  to avoid race conditions when the reference iframe loads.
+			 */
+			$document = Factory::getDocument();
+			$document->addScriptOptions('targetSrc', Route::_($this->editUri . '&task=' . $task . '&id=' . (int) $this->targetId));
 			$this->form->setValue('itemlanguage', '', $this->targetLanguage . ':' . $this->targetId . ':' . $this->targetAction);
 		}
 
-		/**
-		 * @todo Review later
-		 */
-
-		// We don't need toolbar in the modal window.
-		if ($this->getLayout() !== 'modal')
-		{
-			$this->addToolbar();
-			$this->sidebar = \JHtmlSidebar::render();
-		}
-		else
-		{
-			// In article associations modal we need to remove language filter if forcing a language.
-			// We also need to change the category filter to show show categories with All or the forced language.
-			if ($forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'CMD'))
-			{
-				// If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
-				$languageXml = new \SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
-				$this->filterForm->setField($languageXml, 'filter', true);
-
-				// Also, unset the active language filter so the search tools is not open by default with this filter.
-				unset($this->activeFilters['language']);
-
-				// One last changes needed is to change the category filter to just show categories with All language or with the forced language.
-				$this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter');
-			}
-		}
+		$this->addToolbar();
 
 		parent::display($tpl);
 	}
diff --git a/administrator/components/com_associations/View/Associations/HtmlView.php b/administrator/components/com_associations/View/Associations/HtmlView.php
index 94875eb9ea8cb..b57b4b8312cd9 100644
--- a/administrator/components/com_associations/View/Associations/HtmlView.php
+++ b/administrator/components/com_associations/View/Associations/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_associations
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -168,6 +168,15 @@ public function display($tpl = null)
 				if (empty($support['catid']))
 				{
 					$this->filterForm->setFieldAttribute('category_id', 'extension', $extensionName, 'filter');
+
+					if ($this->getLayout() == 'modal')
+					{
+						// We need to change the category filter to only show categories tagged to All or to the forced language.
+						if ($forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'CMD'))
+						{
+							$this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter');
+						}
+					}
 				}
 
 				$this->items      = $this->get('Items');
diff --git a/administrator/components/com_associations/associations.xml b/administrator/components/com_associations/associations.xml
index 17ab7375e95ce..a5d27d97d85c2 100644
--- a/administrator/components/com_associations/associations.xml
+++ b/administrator/components/com_associations/associations.xml
@@ -3,7 +3,7 @@
 	<name>com_associations</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2017</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_associations/layouts/joomla/searchtools/default.php b/administrator/components/com_associations/layouts/joomla/searchtools/default.php
index 9a742748203eb..51d0592bd165b 100644
--- a/administrator/components/com_associations/layouts/joomla/searchtools/default.php
+++ b/administrator/components/com_associations/layouts/joomla/searchtools/default.php
@@ -3,12 +3,14 @@
  * @package     Joomla.Administrator
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\Factory;
+
 /** @var  array  $displayData */
 $data = $displayData;
 
@@ -28,7 +30,7 @@
 // Set some basic options
 $customOptions = array(
 	'filtersHidden'       => $data['options']['filtersHidden'] ?? empty($data['view']->activeFilters),
-	'defaultLimit'        => $data['options']['defaultLimit'] ?? JFactory::getApplication()->get('list_limit', 20),
+	'defaultLimit'        => $data['options']['defaultLimit'] ?? Factory::getApplication()->get('list_limit', 20),
 	'searchFieldSelector' => '#filter_search',
 	'orderFieldSelector'  => '#list_fullordering',
 	'formSelector'        => !empty($data['options']['formSelector']) ? $data['options']['formSelector'] : '#adminForm',
diff --git a/administrator/components/com_associations/services/provider.php b/administrator/components/com_associations/services/provider.php
index 522e8c355af1d..a67d61e6a36fa 100644
--- a/administrator/components/com_associations/services/provider.php
+++ b/administrator/components/com_associations/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_associations
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_associations/tmpl/association/edit.php b/administrator/components/com_associations/tmpl/association/edit.php
index 5711f525f919e..474dca3bba2a0 100644
--- a/administrator/components/com_associations/tmpl/association/edit.php
+++ b/administrator/components/com_associations/tmpl/association/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_associations
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -42,6 +42,7 @@
 					data-action="edit"
 					data-item="<?php echo $this->typeName; ?>"
 					data-id="<?php echo $this->referenceId; ?>"
+					data-title="<?php echo $this->referenceTitle; ?>"
 					data-language="<?php echo $this->referenceLanguage; ?>"
 					data-editurl="<?php echo Route::_($this->editUri); ?>">
 				</iframe>
@@ -60,6 +61,7 @@
 					data-action="<?php echo $this->targetAction; ?>"
 					data-item="<?php echo $this->typeName; ?>"
 					data-id="<?php echo $this->targetId; ?>"
+					data-title="<?php echo $this->targetTitle; ?>"
 					data-language="<?php echo $this->targetLanguage; ?>"
 					data-editurl="<?php echo Route::_($this->editUri); ?>">
 				</iframe>
diff --git a/administrator/components/com_associations/tmpl/associations/default.php b/administrator/components/com_associations/tmpl/associations/default.php
index 3281e01fdd57d..533c4c91a5469 100644
--- a/administrator/components/com_associations/tmpl/associations/default.php
+++ b/administrator/components/com_associations/tmpl/associations/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_associations
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -94,29 +94,31 @@
 									</td>
 								<?php endif; ?>
 								<th scope="row" class="has-context">
-									<?php if (isset($item->level)) : ?>
-										<?php echo LayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level)); ?>
-									<?php endif; ?>
-									<?php if ($canCheckin && $isCheckout) : ?>
-										<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'associations.', $canCheckin); ?>
-									<?php endif; ?>
-									<?php if ($canEdit) : ?>
-										<?php $editIcon = $isCheckout ? '' : '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
-										<a class="hasTooltip" href="<?php echo Route::_($this->editUri . '&id=' . (int) $item->id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->title)); ?>">
-											<?php echo $editIcon; ?><?php echo $this->escape($item->title); ?></a>
-									<?php else : ?>
-										<span title="<?php echo Text::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"><?php echo $this->escape($item->title); ?></span>
-									<?php endif; ?>
-									<?php if (!empty($this->typeFields['alias'])) : ?>
-										<span class="small">
-											<?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
-										</span>
-									<?php endif; ?>
-									<?php if (!empty($this->typeFields['catid'])) : ?>
-										<div class="small">
-											<?php echo Text::_('JCATEGORY') . ": " . $this->escape($item->category_title); ?>
-										</div>
-									<?php endif; ?>
+									<div class="float-left break-word">
+										<?php if (isset($item->level)) : ?>
+											<?php echo LayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level)); ?>
+										<?php endif; ?>
+										<?php if ($canCheckin && $isCheckout) : ?>
+											<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'associations.', $canCheckin); ?>
+										<?php endif; ?>
+										<?php if ($canEdit) : ?>
+											<?php $editIcon = $isCheckout ? '' : '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
+											<a class="hasTooltip" href="<?php echo Route::_($this->editUri . '&id=' . (int) $item->id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->title)); ?>">
+												<?php echo $editIcon; ?><?php echo $this->escape($item->title); ?></a>
+										<?php else : ?>
+											<span title="<?php echo Text::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"><?php echo $this->escape($item->title); ?></span>
+										<?php endif; ?>
+										<?php if (!empty($this->typeFields['alias'])) : ?>
+											<span class="small">
+												<?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+											</span>
+										<?php endif; ?>
+										<?php if (!empty($this->typeFields['catid'])) : ?>
+											<div class="small">
+												<?php echo Text::_('JCATEGORY') . ": " . $this->escape($item->category_title); ?>
+											</div>
+										<?php endif; ?>
+									</div>
 								</th>
 								<td class="small">
 									<?php echo LayoutHelper::render('joomla.content.language', $item); ?>
diff --git a/administrator/components/com_associations/tmpl/associations/modal.php b/administrator/components/com_associations/tmpl/associations/modal.php
index 2b00b639ef45a..de4bbee63f0fc 100644
--- a/administrator/components/com_associations/tmpl/associations/modal.php
+++ b/administrator/components/com_associations/tmpl/associations/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_associations
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/Controller/BannerController.php b/administrator/components/com_banners/Controller/BannerController.php
index f970f019d8c3f..b3d5ae3fb4b29 100644
--- a/administrator/components/com_banners/Controller/BannerController.php
+++ b/administrator/components/com_banners/Controller/BannerController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,10 +11,8 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -103,7 +101,7 @@ protected function allowEdit($data = array(), $key = 'id')
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Set the model
 		$model = $this->getModel('Banner', '', array());
diff --git a/administrator/components/com_banners/Controller/BannersController.php b/administrator/components/com_banners/Controller/BannersController.php
index 7971f7d70d86f..96842eb1b6d3a 100644
--- a/administrator/components/com_banners/Controller/BannersController.php
+++ b/administrator/components/com_banners/Controller/BannersController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
-use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -76,7 +75,7 @@ public function getModel($name = 'Banner', $prefix = 'Administrator', $config =
 	public function sticky_publish()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$ids    = $this->input->get('cid', array(), 'array');
 		$values = array('sticky_publish' => 1, 'sticky_unpublish' => 0);
diff --git a/administrator/components/com_banners/Controller/ClientController.php b/administrator/components/com_banners/Controller/ClientController.php
index 214e211c0a990..63203c2e9e3a7 100644
--- a/administrator/components/com_banners/Controller/ClientController.php
+++ b/administrator/components/com_banners/Controller/ClientController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/Controller/ClientsController.php b/administrator/components/com_banners/Controller/ClientsController.php
index 65321aa7d2e56..7b045ba4b4b42 100644
--- a/administrator/components/com_banners/Controller/ClientsController.php
+++ b/administrator/components/com_banners/Controller/ClientsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/Controller/DisplayController.php b/administrator/components/com_banners/Controller/DisplayController.php
index a9457dec008d4..e338dbc6d56ac 100644
--- a/administrator/components/com_banners/Controller/DisplayController.php
+++ b/administrator/components/com_banners/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/Controller/TracksController.php b/administrator/components/com_banners/Controller/TracksController.php
index 79ccb281d3e96..479073a1b8d6f 100644
--- a/administrator/components/com_banners/Controller/TracksController.php
+++ b/administrator/components/com_banners/Controller/TracksController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Session\Session;
 
 /**
  * Tracks list controller class.
@@ -58,7 +57,7 @@ public function getModel($name = 'Tracks', $prefix = 'Administrator', $config =
 	public function delete()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Get the model.
 		/** @var \Joomla\Component\Banners\Administrator\Model\TracksModel $model */
diff --git a/administrator/components/com_banners/Extension/BannersComponent.php b/administrator/components/com_banners/Extension/BannersComponent.php
index 08bf8534db74a..ae4ea87412816 100644
--- a/administrator/components/com_banners/Extension/BannersComponent.php
+++ b/administrator/components/com_banners/Extension/BannersComponent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/Field/BannerclientField.php b/administrator/components/com_banners/Field/BannerclientField.php
index 92a3a4af4d993..222d081c1ef61 100644
--- a/administrator/components/com_banners/Field/BannerclientField.php
+++ b/administrator/components/com_banners/Field/BannerclientField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,17 +11,16 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Form\FormHelper;
 use Joomla\Component\Banners\Administrator\Helper\BannersHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Bannerclient field.
  *
  * @since  1.6
  */
-class BannerclientField extends \JFormFieldList
+class BannerclientField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/administrator/components/com_banners/Field/ClicksField.php b/administrator/components/com_banners/Field/ClicksField.php
index ec4dacc0c09a4..671e6e57d2cd0 100644
--- a/administrator/components/com_banners/Field/ClicksField.php
+++ b/administrator/components/com_banners/Field/ClicksField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/Field/ImpmadeField.php b/administrator/components/com_banners/Field/ImpmadeField.php
index e8bcd3fcf4314..bf2c02f2441b5 100644
--- a/administrator/components/com_banners/Field/ImpmadeField.php
+++ b/administrator/components/com_banners/Field/ImpmadeField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/Field/ImptotalField.php b/administrator/components/com_banners/Field/ImptotalField.php
index 3f58f7101c215..9138ee670db8e 100644
--- a/administrator/components/com_banners/Field/ImptotalField.php
+++ b/administrator/components/com_banners/Field/ImptotalField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/Helper/BannersHelper.php b/administrator/components/com_banners/Helper/BannersHelper.php
index 6dd50ebef42a9..b6f2781958f30 100644
--- a/administrator/components/com_banners/Helper/BannersHelper.php
+++ b/administrator/components/com_banners/Helper/BannersHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/Model/BannerModel.php b/administrator/components/com_banners/Model/BannerModel.php
index 83c86cc92d45e..08b0d073d2a56 100644
--- a/administrator/components/com_banners/Model/BannerModel.php
+++ b/administrator/components/com_banners/Model/BannerModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -103,131 +103,6 @@ protected function batchClient($value, $pks, $contexts)
 		return true;
 	}
 
-	/**
-	 * Batch copy items to a new category or current.
-	 *
-	 * @param   integer  $value     The new category.
-	 * @param   array    $pks       An array of row IDs.
-	 * @param   array    $contexts  An array of item contexts.
-	 *
-	 * @return  mixed  An array of new IDs on success, boolean false on failure.
-	 *
-	 * @since   2.5
-	 */
-	protected function batchCopy($value, $pks, $contexts)
-	{
-		$categoryId = (int) $value;
-
-		/** @var \Joomla\Component\Banners\Administrator\Table\Banner $table */
-		$table  = $this->getTable();
-		$newIds = array();
-
-		// Check that the category exists
-		if ($categoryId)
-		{
-			$categoryTable = Table::getInstance('Category');
-
-			if (!$categoryTable->load($categoryId))
-			{
-				if ($error = $categoryTable->getError())
-				{
-					// Fatal error
-					$this->setError($error);
-
-					return false;
-				}
-
-				$this->setError(Text::_('JLIB_APPLICATION_ERROR_BATCH_MOVE_CATEGORY_NOT_FOUND'));
-
-				return false;
-			}
-		}
-
-		if (empty($categoryId))
-		{
-			$this->setError(Text::_('JLIB_APPLICATION_ERROR_BATCH_MOVE_CATEGORY_NOT_FOUND'));
-
-			return false;
-		}
-
-		// Check that the user has create permission for the component
-		if (!Factory::getUser()->authorise('core.create', 'com_banners.category.' . $categoryId))
-		{
-			$this->setError(Text::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE'));
-
-			return false;
-		}
-
-		// Parent exists so we let's proceed
-		while (!empty($pks))
-		{
-			// Pop the first ID off the stack
-			$pk = array_shift($pks);
-
-			$table->reset();
-
-			// Check that the row actually exists
-			if (!$table->load($pk))
-			{
-				if ($error = $table->getError())
-				{
-					// Fatal error
-					$this->setError($error);
-
-					return false;
-				}
-
-				// Not fatal error
-				$this->setError(Text::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
-				continue;
-			}
-
-			// Alter the title & alias
-			$data         = $this->generateNewTitle($categoryId, $table->alias, $table->name);
-			$table->name  = $data['0'];
-			$table->alias = $data['1'];
-
-			// Reset the ID because we are making a copy
-			$table->id = 0;
-
-			// New category ID
-			$table->catid = $categoryId;
-
-			// Unpublish because we are making a copy
-			$table->state = 0;
-
-			// TODO: Deal with ordering?
-			// $table->ordering = 1;
-
-			// Check the row.
-			if (!$table->check())
-			{
-				$this->setError($table->getError());
-
-				return false;
-			}
-
-			// Store the row.
-			if (!$table->store())
-			{
-				$this->setError($table->getError());
-
-				return false;
-			}
-
-			// Get the new item ID
-			$newId = $table->get('id');
-
-			// Add the new ID to the array
-			$newIds[$pk] = $newId;
-		}
-
-		// Clean the cache
-		$this->cleanCache();
-
-		return $newIds;
-	}
-
 	/**
 	 * Method to test whether a record can be deleted.
 	 *
@@ -255,6 +130,25 @@ protected function canDelete($record)
 		}
 	}
 
+	/**
+	 * A method to preprocess generating a new title in order to allow tables with alternative names
+	 * for alias and title to use the batch move and copy methods
+	 *
+	 * @param   integer  $categoryId  The target category id
+	 * @param   Table    $table       The JTable within which move or copy is taking place
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.12
+	 */
+	public function generateTitle($categoryId, $table)
+	{
+		// Alter the title & alias
+		$data = $this->generateNewTitle($categoryId, $table->alias, $table->name);
+		$table->name = $data['0'];
+		$table->alias = $data['1'];
+	}
+
 	/**
 	 * Method to test whether a record can have its state changed.
 	 *
diff --git a/administrator/components/com_banners/Model/BannersModel.php b/administrator/components/com_banners/Model/BannersModel.php
index e9f204dfc371b..779559ff5bff1 100644
--- a/administrator/components/com_banners/Model/BannersModel.php
+++ b/administrator/components/com_banners/Model/BannersModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/Model/ClientModel.php b/administrator/components/com_banners/Model/ClientModel.php
index 3a0b4c7f1d242..ee037e1c33169 100644
--- a/administrator/components/com_banners/Model/ClientModel.php
+++ b/administrator/components/com_banners/Model/ClientModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/Model/ClientsModel.php b/administrator/components/com_banners/Model/ClientsModel.php
index db8a35c3731ff..b7080aca29392 100644
--- a/administrator/components/com_banners/Model/ClientsModel.php
+++ b/administrator/components/com_banners/Model/ClientsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/Model/DownloadModel.php b/administrator/components/com_banners/Model/DownloadModel.php
index 4d209160d5a7c..59bb80c86c223 100644
--- a/administrator/components/com_banners/Model/DownloadModel.php
+++ b/administrator/components/com_banners/Model/DownloadModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/Model/TracksModel.php b/administrator/components/com_banners/Model/TracksModel.php
index 2005d3435a59e..e8ecb60134915 100644
--- a/administrator/components/com_banners/Model/TracksModel.php
+++ b/administrator/components/com_banners/Model/TracksModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Banners\Administrator\Model;
diff --git a/administrator/components/com_banners/Service/Html/Banner.php b/administrator/components/com_banners/Service/Html/Banner.php
index f1cc73883da07..218074dd6475d 100644
--- a/administrator/components/com_banners/Service/Html/Banner.php
+++ b/administrator/components/com_banners/Service/Html/Banner.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/Table/BannerTable.php b/administrator/components/com_banners/Table/BannerTable.php
index 5f791b51ba564..29447f02f7c43 100644
--- a/administrator/components/com_banners/Table/BannerTable.php
+++ b/administrator/components/com_banners/Table/BannerTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/Table/ClientTable.php b/administrator/components/com_banners/Table/ClientTable.php
index 152a60b9d88fc..e7c9a96feceac 100644
--- a/administrator/components/com_banners/Table/ClientTable.php
+++ b/administrator/components/com_banners/Table/ClientTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/View/Banner/HtmlView.php b/administrator/components/com_banners/View/Banner/HtmlView.php
index 1e106639c3f36..93b07000683b9 100644
--- a/administrator/components/com_banners/View/Banner/HtmlView.php
+++ b/administrator/components/com_banners/View/Banner/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -97,7 +97,7 @@ protected function addToolbar()
 		// If not checked out, can save the item.
 		if (!$checkedOut && ($canDo->get('core.edit') || count($user->getAuthorisedCategories('com_banners', 'core.create')) > 0))
 		{
-			$toolbarButtons[] = ['apply', 'banner.apply'];
+			ToolbarHelper::apply('banner.apply');
 			$toolbarButtons[] = ['save', 'banner.save'];
 
 			if ($canDo->get('core.create'))
diff --git a/administrator/components/com_banners/View/Banners/HtmlView.php b/administrator/components/com_banners/View/Banners/HtmlView.php
index 340d9145ac98c..0c8feef3e3024 100644
--- a/administrator/components/com_banners/View/Banners/HtmlView.php
+++ b/administrator/components/com_banners/View/Banners/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -120,7 +120,7 @@ protected function addToolbar()
 
 		if ($canDo->get('core.edit.state') || ($this->state->get('filter.published') == -2 && $canDo->get('core.delete')))
 		{
-			$dropdown = $toolbar->dropdownButton('status')
+			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
 				->icon('fa fa-globe')
diff --git a/administrator/components/com_banners/View/Client/HtmlView.php b/administrator/components/com_banners/View/Client/HtmlView.php
index b758104cdc92f..c650e5db3345d 100644
--- a/administrator/components/com_banners/View/Client/HtmlView.php
+++ b/administrator/components/com_banners/View/Client/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -104,7 +104,7 @@ protected function addToolbar()
 		// If not checked out, can save the item.
 		if (!$checkedOut && ($canDo->get('core.edit') || $canDo->get('core.create')))
 		{
-			$toolbarButtons[] = ['apply', 'client.apply'];
+			ToolbarHelper::apply('client.apply');
 			$toolbarButtons[] = ['save', 'client.save'];
 		}
 
diff --git a/administrator/components/com_banners/View/Clients/HtmlView.php b/administrator/components/com_banners/View/Clients/HtmlView.php
index 2bde49b0a4db6..b84a8b623c3fa 100644
--- a/administrator/components/com_banners/View/Clients/HtmlView.php
+++ b/administrator/components/com_banners/View/Clients/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -98,7 +98,7 @@ protected function addToolbar()
 
 		if ($canDo->get('core.edit.state') || $canDo->get('core.admin'))
 		{		
-			$dropdown = $toolbar->dropdownButton('status')
+			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
 				->icon('fa fa-globe')
diff --git a/administrator/components/com_banners/View/Download/HtmlView.php b/administrator/components/com_banners/View/Download/HtmlView.php
index b727005dc0d62..1e2c36fb3e423 100644
--- a/administrator/components/com_banners/View/Download/HtmlView.php
+++ b/administrator/components/com_banners/View/Download/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/View/Tracks/HtmlView.php b/administrator/components/com_banners/View/Tracks/HtmlView.php
index 40a0692bb740a..eb3ec223f24dd 100644
--- a/administrator/components/com_banners/View/Tracks/HtmlView.php
+++ b/administrator/components/com_banners/View/Tracks/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/View/Tracks/RawView.php b/administrator/components/com_banners/View/Tracks/RawView.php
index fb18316ba5d4a..f229154af24a2 100644
--- a/administrator/components/com_banners/View/Tracks/RawView.php
+++ b/administrator/components/com_banners/View/Tracks/RawView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/banners.xml b/administrator/components/com_banners/banners.xml
index 7e07bbe50b655..d89c6d605aa2b 100644
--- a/administrator/components/com_banners/banners.xml
+++ b/administrator/components/com_banners/banners.xml
@@ -3,7 +3,7 @@
 	<name>com_banners</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_banners/helpers/banners.php b/administrator/components/com_banners/helpers/banners.php
index 443a949152a9c..a3a4308aa60ea 100644
--- a/administrator/components/com_banners/helpers/banners.php
+++ b/administrator/components/com_banners/helpers/banners.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/services/provider.php b/administrator/components/com_banners/services/provider.php
index 8df60fdd6e65a..66d911578cbad 100644
--- a/administrator/components/com_banners/services/provider.php
+++ b/administrator/components/com_banners/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/tmpl/banner/edit.php b/administrator/components/com_banners/tmpl/banner/edit.php
index 59eeca131a9ed..a45813e861a5e 100644
--- a/administrator/components/com_banners/tmpl/banner/edit.php
+++ b/administrator/components/com_banners/tmpl/banner/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/tmpl/banners/default.php b/administrator/components/com_banners/tmpl/banners/default.php
index 06dbe2d2817b5..7e5f99dc6015e 100644
--- a/administrator/components/com_banners/tmpl/banners/default.php
+++ b/administrator/components/com_banners/tmpl/banners/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/tmpl/banners/default_batch_body.php b/administrator/components/com_banners/tmpl/banners/default_batch_body.php
index 933f3210e85bb..0399a65c84dd6 100644
--- a/administrator/components/com_banners/tmpl/banners/default_batch_body.php
+++ b/administrator/components/com_banners/tmpl/banners/default_batch_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/tmpl/banners/default_batch_footer.php b/administrator/components/com_banners/tmpl/banners/default_batch_footer.php
index e988e71dcbc01..3c491481c34f5 100644
--- a/administrator/components/com_banners/tmpl/banners/default_batch_footer.php
+++ b/administrator/components/com_banners/tmpl/banners/default_batch_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,9 +12,9 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<a class="btn btn-secondary" type="button" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-client-id').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
+<button type="button" class="btn btn-secondary" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-client-id').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
 	<?php echo Text::_('JCANCEL'); ?>
-</a>
-<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('banner.batch');">
+</button>
+<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('banner.batch');">
 	<?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?>
 </button>
diff --git a/administrator/components/com_banners/tmpl/client/edit.php b/administrator/components/com_banners/tmpl/client/edit.php
index 18c5d1234a855..a844c2b9074e2 100644
--- a/administrator/components/com_banners/tmpl/client/edit.php
+++ b/administrator/components/com_banners/tmpl/client/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/tmpl/clients/default.php b/administrator/components/com_banners/tmpl/clients/default.php
index 2efe51251c5b6..5c7028bcb2912 100644
--- a/administrator/components/com_banners/tmpl/clients/default.php
+++ b/administrator/components/com_banners/tmpl/clients/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/tmpl/download/default.php b/administrator/components/com_banners/tmpl/download/default.php
index a72f377977424..a0e1c4cff1d17 100644
--- a/administrator/components/com_banners/tmpl/download/default.php
+++ b/administrator/components/com_banners/tmpl/download/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_banners/tmpl/tracks/default.php b/administrator/components/com_banners/tmpl/tracks/default.php
index 9f3073dcac15a..743a4363e8e86 100644
--- a/administrator/components/com_banners/tmpl/tracks/default.php
+++ b/administrator/components/com_banners/tmpl/tracks/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_cache/Controller/DisplayController.php b/administrator/components/com_cache/Controller/DisplayController.php
index 7f9a7805533ee..07dd644e7d977 100644
--- a/administrator/components/com_cache/Controller/DisplayController.php
+++ b/administrator/components/com_cache/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cache
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,6 @@
 
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Session\Session;
 use Joomla\Component\Cache\Administrator\Helper\CacheHelper;
 
 /**
@@ -63,9 +62,6 @@ public function display($cachable = false, $urlparams = false)
 			// Push document object into the view.
 			$view->document = $document;
 
-			// Load the submenu.
-			CacheHelper::addSubmenu($this->input->get('view', 'cache'));
-
 			$view->display();
 		}
 	}
@@ -78,7 +74,7 @@ public function display($cachable = false, $urlparams = false)
 	public function delete()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$cid = $this->input->post->get('cid', array(), 'array');
 
@@ -113,7 +109,7 @@ public function delete()
 	public function deleteAll()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$app        = $this->app;
 		$model      = $this->getModel('cache');
@@ -154,7 +150,7 @@ public function deleteAll()
 	public function purge()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		if (!$this->getModel('cache')->purge())
 		{
diff --git a/administrator/components/com_cache/Helper/CacheHelper.php b/administrator/components/com_cache/Helper/CacheHelper.php
index 8a0f2a5795dcb..7966d034b3388 100644
--- a/administrator/components/com_cache/Helper/CacheHelper.php
+++ b/administrator/components/com_cache/Helper/CacheHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cache
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -20,32 +20,5 @@
  */
 class CacheHelper
 {
-	/**
-	 * Configure the Linkbar.
-	 *
-	 * @param   string  $vName  The name of the active view.
-	 *
-	 * @return  void
-	 *
-	 * @since   1.6
-	 */
-	public static function addSubmenu($vName)
-	{
-		\JHtmlSidebar::addEntry(
-			Text::_('JGLOBAL_SUBMENU_CHECKIN'),
-			'index.php?option=com_checkin',
-			$vName == 'com_checkin'
-		);
 
-		\JHtmlSidebar::addEntry(
-			Text::_('JGLOBAL_SUBMENU_CLEAR_CACHE'),
-			'index.php?option=com_cache',
-			$vName == 'cache'
-		);
-		\JHtmlSidebar::addEntry(
-			Text::_('JGLOBAL_SUBMENU_PURGE_EXPIRED_CACHE'),
-			'index.php?option=com_cache&view=purge',
-			$vName == 'purge'
-		);
-	}
 }
diff --git a/administrator/components/com_cache/Model/CacheModel.php b/administrator/components/com_cache/Model/CacheModel.php
index 5ff19411dc931..33629413ea2ad 100644
--- a/administrator/components/com_cache/Model/CacheModel.php
+++ b/administrator/components/com_cache/Model/CacheModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cache
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_cache/View/Cache/HtmlView.php b/administrator/components/com_cache/View/Cache/HtmlView.php
index 2f85028bbce9a..38329dab5696c 100644
--- a/administrator/components/com_cache/View/Cache/HtmlView.php
+++ b/administrator/components/com_cache/View/Cache/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cache
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -52,7 +52,6 @@ public function display($tpl = null)
 		}
 
 		$this->addToolbar();
-		$this->sidebar = \JHtmlSidebar::render();
 
 		parent::display($tpl);
 	}
diff --git a/administrator/components/com_cache/View/Purge/HtmlView.php b/administrator/components/com_cache/View/Purge/HtmlView.php
index db854e08336e6..f6b640ce3e695 100644
--- a/administrator/components/com_cache/View/Purge/HtmlView.php
+++ b/administrator/components/com_cache/View/Purge/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cache
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -33,7 +33,6 @@ class HtmlView extends BaseHtmlView
 	public function display($tpl = null)
 	{
 		$this->addToolbar();
-		$this->sidebar = \JHtmlSidebar::render();
 
 		parent::display($tpl);
 	}
diff --git a/administrator/components/com_cache/cache.xml b/administrator/components/com_cache/cache.xml
index 1aa8d2c19ec2a..dddf8700843ba 100644
--- a/administrator/components/com_cache/cache.xml
+++ b/administrator/components/com_cache/cache.xml
@@ -3,7 +3,7 @@
 	<name>com_cache</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_cache/services/provider.php b/administrator/components/com_cache/services/provider.php
index 95e5944e92f6e..cd2e7baa1cf0c 100644
--- a/administrator/components/com_cache/services/provider.php
+++ b/administrator/components/com_cache/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cache
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_cache/tmpl/cache/default.php b/administrator/components/com_cache/tmpl/cache/default.php
index 33bd9198ed50b..169576262d66f 100644
--- a/administrator/components/com_cache/tmpl/cache/default.php
+++ b/administrator/components/com_cache/tmpl/cache/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cache
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -21,10 +21,7 @@
 ?>
 <form action="<?php echo Route::_('index.php?option=com_cache'); ?>" method="post" name="adminForm" id="adminForm">
 	<div class="row">
-		<div id="j-sidebar-container" class="col-md-2">
-			<?php echo $this->sidebar; ?>
-		</div>
-		<div class="col-md-10">
+		<div class="col-md-12">
 			<div id="j-main-container" class="j-main-container">
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 				<?php if (count($this->data) > 0) : ?>
diff --git a/administrator/components/com_cache/tmpl/purge/default.php b/administrator/components/com_cache/tmpl/purge/default.php
index 18c5d46a8281f..7b0e26d3e459d 100644
--- a/administrator/components/com_cache/tmpl/purge/default.php
+++ b/administrator/components/com_cache/tmpl/purge/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cache
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,10 +17,7 @@
 
 <form action="<?php echo Route::_('index.php?option=com_cache&view=purge'); ?>" method="post" name="adminForm" id="adminForm">
 	<div class="row">
-		<div id="j-sidebar-container" class="col-md-2">
-			<?php echo $this->sidebar; ?>
-		</div>
-		<div class="col-md-10">
+		<div class="col-md-12">
 			<div id="j-main-container" class="j-main-container">
 				<div class="p-3">
 					<p class="m-0"><?php echo Text::_('COM_CACHE_PURGE_INSTRUCTIONS'); ?></p>
diff --git a/administrator/components/com_categories/Controller/AjaxController.php b/administrator/components/com_categories/Controller/AjaxController.php
new file mode 100644
index 0000000000000..234c1abc91a33
--- /dev/null
+++ b/administrator/components/com_categories/Controller/AjaxController.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Categories\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Language\LanguageHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Response\JsonResponse;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Table\Table;
+
+/**
+ * The categories controller for ajax requests
+ *
+ * @since  3.9.0
+ */
+class AjaxController extends BaseController
+{
+	/**
+	 * Method to fetch associations of a category
+	 *
+	 * The method assumes that the following http parameters are passed in an Ajax Get request:
+	 * token: the form token
+	 * assocId: the id of the category whose associations are to be returned
+	 * excludeLang: the association for this language is to be excluded
+	 *
+	 * @return  void
+	 *
+	 * @since  3.9.0
+	 */
+	public function fetchAssociations()
+	{
+		if (!Session::checkToken('get'))
+		{
+			echo new JsonResponse(null, Text::_('JINVALID_TOKEN'), true);
+		}
+		else
+		{
+			$extension = $this->input->get('extension');
+
+			$assocId   = $this->input->getInt('assocId', 0);
+
+			if ($assocId == 0)
+			{
+				echo new JsonResponse(null, Text::sprintf('JLIB_FORM_VALIDATE_FIELD_INVALID', 'assocId'), true);
+
+				return;
+			}
+
+			$excludeLang = $this->input->get('excludeLang', '', 'STRING');
+
+			$associations = Associations::getAssociations($extension, '#__categories', 'com_categories.item', (int) $assocId, 'id', 'alias', '');
+
+			unset($associations[$excludeLang]);
+
+			// Add the title to each of the associated records
+			Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/tables');
+			$categoryTable = Table::getInstance('Category', 'JTable');
+
+			foreach ($associations as $lang => $association)
+			{
+				$categoryTable->load($association->id);
+				$associations[$lang]->title = $categoryTable->title;
+			}
+
+			$countContentLanguages = count(LanguageHelper::getContentLanguages(array(0, 1)));
+
+			if (count($associations) == 0)
+			{
+				$message = Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_NONE');
+			}
+			elseif ($countContentLanguages > count($associations) + 2)
+			{
+				$tags    = implode(', ', array_keys($associations));
+				$message = Text::sprintf('JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_SOME', $tags);
+			}
+			else
+			{
+				$message = Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_ALL');
+			}
+
+			echo new JsonResponse($associations, $message);
+		}
+	}
+}
diff --git a/administrator/components/com_categories/Controller/CategoriesController.php b/administrator/components/com_categories/Controller/CategoriesController.php
index 979e954ac1e46..9703c8db66b45 100644
--- a/administrator/components/com_categories/Controller/CategoriesController.php
+++ b/administrator/components/com_categories/Controller/CategoriesController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,7 +14,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -49,7 +48,7 @@ public function getModel($name = 'Category', $prefix = 'Administrator', $config
 	 */
 	public function rebuild()
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$extension = $this->input->get('extension');
 		$this->setRedirect(Route::_('index.php?option=com_categories&view=categories&extension=' . $extension, false));
@@ -80,7 +79,7 @@ public function rebuild()
 	 */
 	public function delete()
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Get items to remove from the request.
 		$cid = $this->input->get('cid', array(), 'array');
diff --git a/administrator/components/com_categories/Controller/CategoryController.php b/administrator/components/com_categories/Controller/CategoryController.php
index 6444f4988139e..397eeeb0c971c 100644
--- a/administrator/components/com_categories/Controller/CategoryController.php
+++ b/administrator/components/com_categories/Controller/CategoryController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -126,7 +126,7 @@ protected function allowEdit($data = array(), $key = 'parent_id')
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Set the model
 		/** @var \Joomla\Component\Categories\Administrator\Model\CategoryModel $model */
diff --git a/administrator/components/com_categories/Controller/DisplayController.php b/administrator/components/com_categories/Controller/DisplayController.php
index a0bee769057af..b7b6ffaa19c1d 100644
--- a/administrator/components/com_categories/Controller/DisplayController.php
+++ b/administrator/components/com_categories/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/Dispatcher/Dispatcher.php b/administrator/components/com_categories/Dispatcher/Dispatcher.php
index 723ddd44bde36..92f034c89d60d 100644
--- a/administrator/components/com_categories/Dispatcher/Dispatcher.php
+++ b/administrator/components/com_categories/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,6 +11,7 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Access\Exception\NotAllowed;
 use Joomla\CMS\Dispatcher\ComponentDispatcher;
 
 /**
diff --git a/administrator/components/com_categories/Extension/CategoriesComponent.php b/administrator/components/com_categories/Extension/CategoriesComponent.php
index 9ae0cbe749041..f35f225125e43 100644
--- a/administrator/components/com_categories/Extension/CategoriesComponent.php
+++ b/administrator/components/com_categories/Extension/CategoriesComponent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/Field/CategoryeditField.php b/administrator/components/com_categories/Field/CategoryeditField.php
index 64262dbab6b63..94581ea586310 100644
--- a/administrator/components/com_categories/Field/CategoryeditField.php
+++ b/administrator/components/com_categories/Field/CategoryeditField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -349,11 +349,11 @@ protected function getInput()
 	{
 		$data = $this->getLayoutData();
 
-		$data['options']             = $this->getOptions();
-		$data['allowCustom']         = $this->allowAdd;
-		$data['customFields']        = (boolean) $this->element['custom-fields-enabled'];
-		$data['customFieldsCatId']   = (string) $this->element['custom-fields-cat-id'];
-		$data['customFieldsSection'] = (string) $this->element['custom-fields-section'];
+		$data['options']        = $this->getOptions();
+		$data['allowCustom']    = $this->allowAdd;
+		$data['refreshPage']    = (boolean) $this->element['refresh-enabled'];
+		$data['refreshCatId']   = (string) $this->element['refresh-cat-id'];
+		$data['refreshSection'] = (string) $this->element['refresh-section'];
 
 		$renderer = $this->getRenderer($this->layout);
 		$renderer->setComponent('com_categories');
diff --git a/administrator/components/com_categories/Field/Modal/CategoryField.php b/administrator/components/com_categories/Field/Modal/CategoryField.php
index 728a9fdb7ab1e..ced4aeb7aacb5 100644
--- a/administrator/components/com_categories/Field/Modal/CategoryField.php
+++ b/administrator/components/com_categories/Field/Modal/CategoryField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,6 +14,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Session\Session;
 
@@ -50,10 +51,13 @@ protected function getInput()
 			$extension = (string) Factory::getApplication()->input->get('extension', 'com_content');
 		}
 
-		$allowNew    = ((string) $this->element['new'] == 'true');
-		$allowEdit   = ((string) $this->element['edit'] == 'true');
-		$allowClear  = ((string) $this->element['clear'] != 'false');
-		$allowSelect = ((string) $this->element['select'] != 'false');
+		$allowNew       = ((string) $this->element['new'] == 'true');
+		$allowEdit      = ((string) $this->element['edit'] == 'true');
+		$allowClear     = ((string) $this->element['clear'] != 'false');
+		$allowSelect    = ((string) $this->element['select'] != 'false');
+		$allowPropagate = ((string) $this->element['propagate'] == 'true');
+
+		$languages = LanguageHelper::getContentLanguages(array(0, 1));
 
 		// Load language.
 		Factory::getLanguage()->load('com_categories', JPATH_ADMINISTRATOR);
@@ -85,6 +89,8 @@ function jSelectCategory_" . $this->id . "(id, title, object) {
 				}
 				");
 
+				Text::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED');
+
 				$scriptSelect[$this->id] = true;
 			}
 		}
@@ -145,55 +151,72 @@ function jSelectCategory_" . $this->id . "(id, title, object) {
 		// Select category button.
 		if ($allowSelect)
 		{
-			$html .= '<a'
-				. ' class="btn btn-primary hasTooltip' . ($value ? ' sr-only' : '') . '"'
+			$html .= '<button'
+				. ' class="btn btn-primary hasTooltip' . ($value ? ' hidden' : '') . '"'
 				. ' id="' . $this->id . '_select"'
 				. ' data-toggle="modal"'
-				. ' role="button"'
-				. ' href="#ModalSelect' . $modalId . '"'
+				. ' type="button"'
+				. ' data-target="#ModalSelect' . $modalId . '"'
 				. ' title="' . HTMLHelper::tooltipText('COM_CATEGORIES_CHANGE_CATEGORY') . '">'
 				. '<span class="icon-file" aria-hidden="true"></span> ' . Text::_('JSELECT')
-				. '</a>';
+				. '</button>';
 		}
 
 		// New category button.
 		if ($allowNew)
 		{
-			$html .= '<a'
-				. ' class="btn btn-secondary hasTooltip' . ($value ? ' sr-only' : '') . '"'
+			$html .= '<button'
+				. ' class="btn btn-secondary hasTooltip' . ($value ? ' hidden' : '') . '"'
 				. ' id="' . $this->id . '_new"'
 				. ' data-toggle="modal"'
-				. ' role="button"'
-				. ' href="#ModalNew' . $modalId . '"'
+				. ' type="button"'
+				. ' data-target="#ModalNew' . $modalId . '"'
 				. ' title="' . HTMLHelper::tooltipText('COM_CATEGORIES_NEW_CATEGORY') . '">'
 				. '<span class="icon-new" aria-hidden="true"></span> ' . Text::_('JACTION_CREATE')
-				. '</a>';
+				. '</button>';
 		}
 
 		// Edit category button.
 		if ($allowEdit)
 		{
-			$html .= '<a'
-				. ' class="btn btn-secondary hasTooltip' . ($value ? '' : ' sr-only') . '"'
+			$html .= '<button'
+				. ' class="btn btn-secondary hasTooltip' . ($value ? '' : ' hidden') . '"'
 				. ' id="' . $this->id . '_edit"'
 				. ' data-toggle="modal"'
-				. ' role="button"'
-				. ' href="#ModalEdit' . $modalId . '"'
+				. ' type="button"'
+				. ' data-target="#ModalEdit' . $modalId . '"'
 				. ' title="' . HTMLHelper::tooltipText('COM_CATEGORIES_EDIT_CATEGORY') . '">'
 				. '<span class="icon-edit" aria-hidden="true"></span> ' . Text::_('JACTION_EDIT')
-				. '</a>';
+				. '</button>';
 		}
 
 		// Clear category button.
 		if ($allowClear)
 		{
-			$html .= '<a'
-				. ' class="btn btn-secondary' . ($value ? '' : ' sr-only') . '"'
+			$html .= '<button'
+				. ' class="btn btn-secondary' . ($value ? '' : ' hidden') . '"'
 				. ' id="' . $this->id . '_clear"'
-				. ' href="#"'
+				. ' type="button"'
 				. ' onclick="window.processModalParent(\'' . $this->id . '\'); return false;">'
 				. '<span class="icon-remove" aria-hidden="true"></span>' . Text::_('JCLEAR')
-				. '</a>';
+				. '</button>';
+		}
+
+		// Propagate category button
+		if ($allowPropagate && count($languages) > 2)
+		{
+			// Strip off language tag at the end
+			$tagLength = (int) strlen($this->element['language']);
+			$callbackFunctionStem = substr("jSelectCategory_" . $this->id, 0, -$tagLength);
+
+			$html .= '<a'
+			. ' class="btn hasTooltip' . ($value ? '' : ' hidden') . '"'
+			. ' id="' . $this->id . '_propagate"'
+			. ' href="#"'
+			. ' title="' . HtmlHelper::tooltipText('JGLOBAL_ASSOCIATIONS_PROPAGATE_TIP') . '"'
+			. ' onclick="Joomla.propagateAssociation(\'' . $this->id . '\', \'' . $callbackFunctionStem . '\');">'
+			. '<span class="icon-refresh" aria-hidden="true"></span>' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON')
+			. '</a>';
 		}
 
 		if ($allowSelect || $allowNew || $allowEdit || $allowClear)
diff --git a/administrator/components/com_categories/Helper/CategoriesHelper.php b/administrator/components/com_categories/Helper/CategoriesHelper.php
index 3dc57492569d7..9f950944c6231 100644
--- a/administrator/components/com_categories/Helper/CategoriesHelper.php
+++ b/administrator/components/com_categories/Helper/CategoriesHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/Helper/CategoryAssociationHelper.php b/administrator/components/com_categories/Helper/CategoryAssociationHelper.php
index 615e6d7ac9b16..fca90862e657e 100644
--- a/administrator/components/com_categories/Helper/CategoryAssociationHelper.php
+++ b/administrator/components/com_categories/Helper/CategoryAssociationHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/Model/CategoriesModel.php b/administrator/components/com_categories/Model/CategoriesModel.php
index f0c264cc8b7c9..1e551d5482d8f 100644
--- a/administrator/components/com_categories/Model/CategoriesModel.php
+++ b/administrator/components/com_categories/Model/CategoriesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/Model/CategoryModel.php b/administrator/components/com_categories/Model/CategoryModel.php
index c727a1447292e..68770ca10e529 100644
--- a/administrator/components/com_categories/Model/CategoryModel.php
+++ b/administrator/components/com_categories/Model/CategoryModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -490,6 +490,7 @@ protected function preprocessForm(\JForm $form, $data, $group = 'content')
 					$field->addAttribute('new', 'true');
 					$field->addAttribute('edit', 'true');
 					$field->addAttribute('clear', 'true');
+					$field->addAttribute('propagate', 'true');
 				}
 
 				$form->load($addform, false);
diff --git a/administrator/components/com_categories/Service/HTML/AdministratorService.php b/administrator/components/com_categories/Service/HTML/AdministratorService.php
index 68a0018871299..2f7758819dcba 100644
--- a/administrator/components/com_categories/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_categories/Service/HTML/AdministratorService.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/Table/CategoryTable.php b/administrator/components/com_categories/Table/CategoryTable.php
index ed284901ae432..d310a2e0d66f8 100644
--- a/administrator/components/com_categories/Table/CategoryTable.php
+++ b/administrator/components/com_categories/Table/CategoryTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/View/Categories/HtmlView.php b/administrator/components/com_categories/View/Categories/HtmlView.php
index 1138bdcd69373..5335877884fd7 100644
--- a/administrator/components/com_categories/View/Categories/HtmlView.php
+++ b/administrator/components/com_categories/View/Categories/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/View/Category/HtmlView.php b/administrator/components/com_categories/View/Category/HtmlView.php
index 7e21387065751..8b9df5e6db107 100644
--- a/administrator/components/com_categories/View/Category/HtmlView.php
+++ b/administrator/components/com_categories/View/Category/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -16,6 +16,7 @@
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Helper\TagsHelper;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -186,9 +187,9 @@ protected function addToolbar()
 		// For new records, check the create permission.
 		if ($isNew && (count($user->getAuthorisedCategories($component, 'core.create')) > 0))
 		{
+			ToolbarHelper::apply('category.apply');
 			ToolbarHelper::saveGroup(
 				[
-					['apply', 'category.apply'],
 					['save', 'category.save'],
 					['save2new', 'category.save2new']
 				],
@@ -209,7 +210,8 @@ protected function addToolbar()
 			// Can't save the record if it's checked out and editable
 			if (!$checkedOut && $itemEditable)
 			{
-				$toolbarButtons[] = ['apply', 'category.apply'];
+				ToolbarHelper::apply('category.apply');
+
 				$toolbarButtons[] = ['save', 'category.save'];
 
 				if ($canDo->get('core.create'))
@@ -235,6 +237,11 @@ protected function addToolbar()
 				ToolbarHelper::versions($typeAlias, $this->item->id);
 			}
 
+			if (Associations::isEnabled() && ComponentHelper::isEnabled('com_associations'))
+			{
+				ToolbarHelper::custom('category.editAssociations', 'contract', 'contract', 'JTOOLBAR_ASSOCIATIONS', false, false);
+			}
+
 			ToolbarHelper::cancel('category.cancel', 'JTOOLBAR_CLOSE');
 		}
 
diff --git a/administrator/components/com_categories/categories.xml b/administrator/components/com_categories/categories.xml
index d6d0e6b240875..08aac30d155ea 100644
--- a/administrator/components/com_categories/categories.xml
+++ b/administrator/components/com_categories/categories.xml
@@ -3,7 +3,7 @@
 	<name>com_categories</name>
 	<author>Joomla! Project</author>
 	<creationDate>December 2007</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_categories/forms/category.xml b/administrator/components/com_categories/forms/category.xml
index 61a5053e5c3b6..1f1dc926ec352 100644
--- a/administrator/components/com_categories/forms/category.xml
+++ b/administrator/components/com_categories/forms/category.xml
@@ -204,7 +204,6 @@
 		name="tags"
 		type="tag"
 		label="JTAG"
-		class="col-sm-12"
 		multiple="true"
 	/>
 
diff --git a/administrator/components/com_categories/helpers/categories.php b/administrator/components/com_categories/helpers/categories.php
index 1c919ea1c5e9f..fed2fdcebdf2d 100644
--- a/administrator/components/com_categories/helpers/categories.php
+++ b/administrator/components/com_categories/helpers/categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php b/administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php
index 7843737d2074a..e21c1eb635d53 100644
--- a/administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php
+++ b/administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -119,10 +119,15 @@
 	$html[] = HTMLHelper::_('select.genericlist', $options, $name, trim($attr), 'value', 'text', $value, $id);
 }
 
-if ($customFields === true)
+if ($refreshPage === true)
 {
-	$attr2 .= ' data-custom-fields-catid="' . $customFieldsCatId . '" data-custom-fields-section="' . $customFieldsSection . '"';
+	$attr2 .= ' data-refresh-catid="' . $refreshCatId . '" data-refresh-section="' . $refreshSection . '"';
 	$attr2 .= ' onchange="Joomla.categoryHasChanged(this)"';
+
+	HTMLHelper::_('script', 'layouts/joomla/form/field/category-change.min.js', ['version' => 'auto', 'relative' => true], ['defer' => true]);
+
+	// Pass the element id to the javascript
+	Factory::getDocument()->addScriptOptions('category-change', $id);
 }
 else
 {
@@ -134,11 +139,7 @@
 
 Factory::getDocument()->getWebAssetManager()->enableAsset('choicesjs');
 
-// Pass the element id to the javascript
-\Joomla\CMS\Factory::getDocument()->addScriptOptions('category-change', $id);
-
-HTMLHelper::_('script', 'layouts/joomla/form/field/category-change.min.js', ['version' => 'auto', 'relative' => true], ['defer' => true]);
-HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);
+HTMLHelper::_('webcomponent', 'system/fields/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);
 ?>
 
 <joomla-field-fancy-select <?php echo $attr2; ?>><?php echo implode($html); ?></joomla-field-fancy-select>
diff --git a/administrator/components/com_categories/services/provider.php b/administrator/components/com_categories/services/provider.php
index 793bda862b295..c616c63583c09 100644
--- a/administrator/components/com_categories/services/provider.php
+++ b/administrator/components/com_categories/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/tmpl/categories/default.php b/administrator/components/com_categories/tmpl/categories/default.php
index 42473f06645e8..6a4454d9d9ddc 100644
--- a/administrator/components/com_categories/tmpl/categories/default.php
+++ b/administrator/components/com_categories/tmpl/categories/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/tmpl/categories/default_batch_body.php b/administrator/components/com_categories/tmpl/categories/default_batch_body.php
index bcaf2f842c9c8..20bfdaf1e4ea3 100644
--- a/administrator/components/com_categories/tmpl/categories/default_batch_body.php
+++ b/administrator/components/com_categories/tmpl/categories/default_batch_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_categories/tmpl/categories/default_batch_footer.php b/administrator/components/com_categories/tmpl/categories/default_batch_footer.php
index a35314fd419c7..a0ebaf58d232e 100644
--- a/administrator/components/com_categories/tmpl/categories/default_batch_footer.php
+++ b/administrator/components/com_categories/tmpl/categories/default_batch_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -11,9 +11,9 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<a class="btn btn-secondary" type="button" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
+<button type="button" class="btn btn-secondary" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
 	<?php echo Text::_('JCANCEL'); ?>
-</a>
-<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('category.batch');">
+</button>
+<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('category.batch');">
 	<?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?>
-</button>
\ No newline at end of file
+</button>
diff --git a/administrator/components/com_categories/tmpl/categories/modal.php b/administrator/components/com_categories/tmpl/categories/modal.php
index a7518b692728c..812cb0ecd3df7 100644
--- a/administrator/components/com_categories/tmpl/categories/modal.php
+++ b/administrator/components/com_categories/tmpl/categories/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/tmpl/category/edit.php b/administrator/components/com_categories/tmpl/category/edit.php
index 7bfcc035e7748..f59dc02b9665d 100644
--- a/administrator/components/com_categories/tmpl/category/edit.php
+++ b/administrator/components/com_categories/tmpl/category/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/tmpl/category/edit_associations.php b/administrator/components/com_categories/tmpl/category/edit_associations.php
index b6e6c5f359070..06b51884993d8 100644
--- a/administrator/components/com_categories/tmpl/category/edit_associations.php
+++ b/administrator/components/com_categories/tmpl/category/edit_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/tmpl/category/edit_metadata.php b/administrator/components/com_categories/tmpl/category/edit_metadata.php
index f3a07be357272..5c6cdc06099f3 100644
--- a/administrator/components/com_categories/tmpl/category/edit_metadata.php
+++ b/administrator/components/com_categories/tmpl/category/edit_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/tmpl/category/modal.php b/administrator/components/com_categories/tmpl/category/modal.php
index a03977ef93e63..0f8ebe9e519a0 100644
--- a/administrator/components/com_categories/tmpl/category/modal.php
+++ b/administrator/components/com_categories/tmpl/category/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/tmpl/category/modal_associations.php b/administrator/components/com_categories/tmpl/category/modal_associations.php
index b6e6c5f359070..06b51884993d8 100644
--- a/administrator/components/com_categories/tmpl/category/modal_associations.php
+++ b/administrator/components/com_categories/tmpl/category/modal_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/tmpl/category/modal_extrafields.php b/administrator/components/com_categories/tmpl/category/modal_extrafields.php
index c3a7e055cc328..8293395e3cd9c 100644
--- a/administrator/components/com_categories/tmpl/category/modal_extrafields.php
+++ b/administrator/components/com_categories/tmpl/category/modal_extrafields.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/tmpl/category/modal_metadata.php b/administrator/components/com_categories/tmpl/category/modal_metadata.php
index f3a07be357272..5c6cdc06099f3 100644
--- a/administrator/components/com_categories/tmpl/category/modal_metadata.php
+++ b/administrator/components/com_categories/tmpl/category/modal_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/tmpl/category/modal_options.php b/administrator/components/com_categories/tmpl/category/modal_options.php
index 165284978c582..77e7172fd3560 100644
--- a/administrator/components/com_categories/tmpl/category/modal_options.php
+++ b/administrator/components/com_categories/tmpl/category/modal_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_checkin/Controller/DisplayController.php b/administrator/components/com_checkin/Controller/DisplayController.php
index 8e9a77248adb5..2e89ffc7d3365 100644
--- a/administrator/components/com_checkin/Controller/DisplayController.php
+++ b/administrator/components/com_checkin/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_checkin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,6 @@
 
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Session\Session;
 
 /**
  * Checkin Controller
@@ -40,9 +39,6 @@ class DisplayController extends BaseController
 	 */
 	public function display($cachable = false, $urlparams = array())
 	{
-		// Load the submenu.
-		$this->addSubmenu($this->input->getWord('option', 'com_checkin'));
-
 		return parent::display();
 	}
 
@@ -54,7 +50,7 @@ public function display($cachable = false, $urlparams = array())
 	public function checkin()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$ids = $this->input->get('cid', array(), 'array');
 
@@ -74,33 +70,4 @@ public function checkin()
 
 		$this->setRedirect('index.php?option=com_checkin');
 	}
-
-	/**
-	 * Configure the Linkbar.
-	 *
-	 * @param   string  $vName  The name of the active view.
-	 *
-	 * @return  void
-	 *
-	 * @since   1.6
-	 */
-	protected function addSubmenu($vName)
-	{
-		\JHtmlSidebar::addEntry(
-			Text::_('JGLOBAL_SUBMENU_CHECKIN'),
-			'index.php?option=com_checkin',
-			$vName == 'com_checkin'
-		);
-
-		\JHtmlSidebar::addEntry(
-			Text::_('JGLOBAL_SUBMENU_CLEAR_CACHE'),
-			'index.php?option=com_cache',
-			$vName == 'cache'
-		);
-		\JHtmlSidebar::addEntry(
-			Text::_('JGLOBAL_SUBMENU_PURGE_EXPIRED_CACHE'),
-			'index.php?option=com_cache&view=purge',
-			$vName == 'purge'
-		);
-	}
 }
diff --git a/administrator/components/com_checkin/Model/CheckinModel.php b/administrator/components/com_checkin/Model/CheckinModel.php
index cc8a3713b9fbd..ff44e341149f8 100644
--- a/administrator/components/com_checkin/Model/CheckinModel.php
+++ b/administrator/components/com_checkin/Model/CheckinModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_checkin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_checkin/View/Checkin/HtmlView.php b/administrator/components/com_checkin/View/Checkin/HtmlView.php
index b829032a77ae9..ef5613fa8eaf6 100644
--- a/administrator/components/com_checkin/View/Checkin/HtmlView.php
+++ b/administrator/components/com_checkin/View/Checkin/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_checkin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -44,13 +44,6 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected $state;
 
-	/**
-	 * The sidebar markup
-	 *
-	 * @var  string
-	 */
-	protected $sidebar;
-
 	/**
 	 * Form object for search filters
 	 *
@@ -90,7 +83,6 @@ public function display($tpl = null)
 		}
 
 		$this->addToolbar();
-		$this->sidebar = \JHtmlSidebar::render();
 
 		return parent::display($tpl);
 	}
diff --git a/administrator/components/com_checkin/checkin.xml b/administrator/components/com_checkin/checkin.xml
index bfb95d85f6097..66ade393319aa 100644
--- a/administrator/components/com_checkin/checkin.xml
+++ b/administrator/components/com_checkin/checkin.xml
@@ -3,7 +3,7 @@
 	<name>com_checkin</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_checkin/services/provider.php b/administrator/components/com_checkin/services/provider.php
index 076ba7a61f52e..08f9f553a10c7 100644
--- a/administrator/components/com_checkin/services/provider.php
+++ b/administrator/components/com_checkin/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_checkin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_checkin/tmpl/checkin/default.php b/administrator/components/com_checkin/tmpl/checkin/default.php
index 7146da5e2eb70..00bf5b222cda5 100644
--- a/administrator/components/com_checkin/tmpl/checkin/default.php
+++ b/administrator/components/com_checkin/tmpl/checkin/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_checkin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -21,10 +21,7 @@
 ?>
 <form action="<?php echo Route::_('index.php?option=com_checkin'); ?>" method="post" name="adminForm" id="adminForm">
 	<div class="row">
-		<div id="j-sidebar-container" class="col-md-2">
-			<?php echo $this->sidebar; ?>
-		</div>
-		<div class="col-md-10">
+		<div class="col-md-12">
 			<div id="j-main-container" class="j-main-container">
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 				<?php if ($this->total > 0) : ?>
@@ -34,7 +31,7 @@
 						</caption>
 							<thead>
 							<tr>
-								<td style="width:1%">
+								<td style="width:1%" class="text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
 								<th scope="col">
diff --git a/administrator/components/com_config/Controller/ApplicationController.php b/administrator/components/com_config/Controller/ApplicationController.php
index 681f97635ff3a..129e97677e2e1 100644
--- a/administrator/components/com_config/Controller/ApplicationController.php
+++ b/administrator/components/com_config/Controller/ApplicationController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/Controller/ComponentController.php b/administrator/components/com_config/Controller/ComponentController.php
index a1e7654e1c7f6..08be73b113051 100644
--- a/administrator/components/com_config/Controller/ComponentController.php
+++ b/administrator/components/com_config/Controller/ComponentController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/Controller/DisplayController.php b/administrator/components/com_config/Controller/DisplayController.php
index 91eb76f7f204a..7399d0846313f 100644
--- a/administrator/components/com_config/Controller/DisplayController.php
+++ b/administrator/components/com_config/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/Controller/RequestController.php b/administrator/components/com_config/Controller/RequestController.php
index d04b53332e4c4..2e3d1f609251f 100644
--- a/administrator/components/com_config/Controller/RequestController.php
+++ b/administrator/components/com_config/Controller/RequestController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/Field/ConfigComponentsField.php b/administrator/components/com_config/Field/ConfigComponentsField.php
index dab340eb77f6a..db477d0dd7887 100644
--- a/administrator/components/com_config/Field/ConfigComponentsField.php
+++ b/administrator/components/com_config/Field/ConfigComponentsField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,17 +13,16 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\File;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\Utilities\ArrayHelper;
 
-\JFormHelper::loadFieldClass('List');
-
 /**
  * Text Filters form field.
  *
  * @since  3.7.0
  */
-class ConfigComponentsField extends \JFormFieldList
+class ConfigComponentsField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/administrator/components/com_config/Field/FiltersField.php b/administrator/components/com_config/Field/FiltersField.php
index dcaed71277e3a..968e05aa935fb 100644
--- a/administrator/components/com_config/Field/FiltersField.php
+++ b/administrator/components/com_config/Field/FiltersField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/Helper/ConfigHelper.php b/administrator/components/com_config/Helper/ConfigHelper.php
index d84b6581bde81..db0d377789958 100644
--- a/administrator/components/com_config/Helper/ConfigHelper.php
+++ b/administrator/components/com_config/Helper/ConfigHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/Model/ApplicationModel.php b/administrator/components/com_config/Model/ApplicationModel.php
index b457615e15c5f..8540884c38ea5 100644
--- a/administrator/components/com_config/Model/ApplicationModel.php
+++ b/administrator/components/com_config/Model/ApplicationModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -305,7 +305,7 @@ public function save($data)
 					$revisedDbo->truncateTable('#__session');
 				}
 			}
-			catch (RuntimeException $e)
+			catch (\RuntimeException $e)
 			{
 				/*
 				 * The database API logs errors on failures so we don't need to add any error handling mechanisms here.
@@ -513,8 +513,21 @@ public function save($data)
 		$this->cleanCache('_system', 0);
 		$this->cleanCache('_system', 1);
 
+		$result = $app->triggerEvent('onApplicationBeforeSave', array($config));
+
+		// Store the data.
+		if (in_array(false, $result, true))
+		{
+			throw new \RuntimeException(Text::_('COM_CONFIG_ERROR_UNKNOWN_BEFORE_SAVING'));
+		}
+
 		// Write the configuration file.
-		return $this->writeConfigFile($config);
+		$result = $this->writeConfigFile($config);
+
+		// Trigger the after save event.
+		$app->triggerEvent('onApplicationAfterSave', array($config));
+
+		return $result;
 	}
 
 	/**
@@ -529,6 +542,8 @@ public function save($data)
 	 */
 	public function removeroot()
 	{
+		$app = Factory::getApplication();
+
 		// Get the previous configuration.
 		$prev = new \JConfig;
 		$prev = ArrayHelper::fromObject($prev);
@@ -537,8 +552,21 @@ public function removeroot()
 		unset($prev['root_user']);
 		$config = new Registry($prev);
 
+		$result = $app->triggerEvent('onApplicationBeforeSave', array($config));
+
+		// Store the data.
+		if (in_array(false, $result, true))
+		{
+			throw new \RuntimeException(Text::_('COM_CONFIG_ERROR_UNKNOWN_BEFORE_SAVING'));
+		}
+
 		// Write the configuration file.
-		return $this->writeConfigFile($config);
+		$result = $this->writeConfigFile($config);
+
+		// Trigger the after save event.
+		$app->triggerEvent('onApplicationAfterSave', array($config));
+
+		return $result;
 	}
 
 	/**
diff --git a/administrator/components/com_config/Model/ComponentModel.php b/administrator/components/com_config/Model/ComponentModel.php
index f9695b8de7ab7..5850aa905755a 100644
--- a/administrator/components/com_config/Model/ComponentModel.php
+++ b/administrator/components/com_config/Model/ComponentModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/View/Application/HtmlView.php b/administrator/components/com_config/View/Application/HtmlView.php
index 9a5623c6ecdb8..145caf6124568 100644
--- a/administrator/components/com_config/View/Application/HtmlView.php
+++ b/administrator/components/com_config/View/Application/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -101,13 +101,9 @@ public function display($tpl = null)
 	protected function addToolbar()
 	{
 		ToolbarHelper::title(Text::_('COM_CONFIG_GLOBAL_CONFIGURATION'), 'equalizer config');
-		ToolbarHelper::saveGroup(
-			[
-				['apply', 'application.apply'],
-				['save', 'application.save']
-			],
-			'btn-success'
-		);
+		ToolbarHelper::apply('application.apply');
+		ToolbarHelper::divider();
+		ToolbarHelper::save('application.save');
 		ToolbarHelper::divider();
 		ToolbarHelper::cancel('application.cancel', 'JTOOLBAR_CLOSE');
 		ToolbarHelper::divider();
diff --git a/administrator/components/com_config/View/Component/HtmlView.php b/administrator/components/com_config/View/Component/HtmlView.php
index e4a915de463c0..bd3970e7f053e 100644
--- a/administrator/components/com_config/View/Component/HtmlView.php
+++ b/administrator/components/com_config/View/Component/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -103,13 +103,9 @@ public function display($tpl = null)
 	protected function addToolbar()
 	{
 		ToolbarHelper::title(Text::_($this->component->option . '_configuration'), 'equalizer config');
-		ToolbarHelper::saveGroup(
-			[
-				['apply', 'component.apply'],
-				['save', 'component.save']
-			],
-			'btn-success'
-		);
+		ToolbarHelper::apply('component.apply');
+		ToolbarHelper::divider();
+		ToolbarHelper::save('component.save');
 		ToolbarHelper::divider();
 		ToolbarHelper::cancel('component.cancel', 'JTOOLBAR_CLOSE');
 		ToolbarHelper::divider();
diff --git a/administrator/components/com_config/config.xml b/administrator/components/com_config/config.xml
index 20099898ddcde..7b87728db1be5 100644
--- a/administrator/components/com_config/config.xml
+++ b/administrator/components/com_config/config.xml
@@ -3,7 +3,7 @@
 	<name>com_config</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml
index bb9534a497d0f..2ddf22a4d510c 100644
--- a/administrator/components/com_config/forms/application.xml
+++ b/administrator/components/com_config/forms/application.xml
@@ -261,6 +261,20 @@
 			<option value="1">JYES</option>
 		</field>
 
+		<field
+			name="debug_lang_const"
+			type="radio"
+			label="COM_CONFIG_FIELD_DEBUG_CONST_LANG_LABEL"
+			description="COM_CONFIG_FIELD_DEBUG_CONST_LANG_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			filter="integer"
+			showon="debug_lang:1"
+			>
+			<option value="0">COM_CONFIG_FIELD_DEBUG_CONST</option>
+			<option value="1">COM_CONFIG_FIELD_DEBUG_VALUE</option>
+		</field>
+
 	</fieldset>
 
 	<fieldset name="ftp" label="CONFIG_FTP_SETTINGS_LABEL">
@@ -1105,6 +1119,10 @@
 				name="core.login.admin"
 				title="JACTION_LOGIN_ADMIN"
 			/>
+			<action
+				name="core.login.api"
+				title="JACTION_LOGIN_API"
+			/>
 			<action
 				name="core.login.offline"
 				title="JACTION_LOGIN_OFFLINE"
diff --git a/administrator/components/com_config/services/provider.php b/administrator/components/com_config/services/provider.php
index d7186faf4c668..a7d9ae8a4056c 100644
--- a/administrator/components/com_config/services/provider.php
+++ b/administrator/components/com_config/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/application/default.php b/administrator/components/com_config/tmpl/application/default.php
index ec1ad11dc47a5..d3f5caf219f21 100644
--- a/administrator/components/com_config/tmpl/application/default.php
+++ b/administrator/components/com_config/tmpl/application/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/application/default.xml b/administrator/components/com_config/tmpl/application/default.xml
old mode 100755
new mode 100644
diff --git a/administrator/components/com_config/tmpl/application/default_cache.php b/administrator/components/com_config/tmpl/application/default_cache.php
index 0b8bce92303c5..33208b0a70215 100644
--- a/administrator/components/com_config/tmpl/application/default_cache.php
+++ b/administrator/components/com_config/tmpl/application/default_cache.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/application/default_cookie.php b/administrator/components/com_config/tmpl/application/default_cookie.php
index c4b51ac1716da..5fcc463b75eec 100644
--- a/administrator/components/com_config/tmpl/application/default_cookie.php
+++ b/administrator/components/com_config/tmpl/application/default_cookie.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/application/default_database.php b/administrator/components/com_config/tmpl/application/default_database.php
index 03754970d3353..cb475d6395ac3 100644
--- a/administrator/components/com_config/tmpl/application/default_database.php
+++ b/administrator/components/com_config/tmpl/application/default_database.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/application/default_debug.php b/administrator/components/com_config/tmpl/application/default_debug.php
index f9cc5260c48d7..16e95c9786584 100644
--- a/administrator/components/com_config/tmpl/application/default_debug.php
+++ b/administrator/components/com_config/tmpl/application/default_debug.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/application/default_filters.php b/administrator/components/com_config/tmpl/application/default_filters.php
index 944b06d5e59bd..8ee17aecc3dda 100644
--- a/administrator/components/com_config/tmpl/application/default_filters.php
+++ b/administrator/components/com_config/tmpl/application/default_filters.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/application/default_ftp.php b/administrator/components/com_config/tmpl/application/default_ftp.php
index d534911eb9670..e787d777f6926 100644
--- a/administrator/components/com_config/tmpl/application/default_ftp.php
+++ b/administrator/components/com_config/tmpl/application/default_ftp.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/application/default_ftplogin.php b/administrator/components/com_config/tmpl/application/default_ftplogin.php
index 551698f68d926..d5c610f45268a 100644
--- a/administrator/components/com_config/tmpl/application/default_ftplogin.php
+++ b/administrator/components/com_config/tmpl/application/default_ftplogin.php
@@ -3,15 +3,16 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+defined('_JEXEC') or die;
+
 use Joomla\CMS\Language\Text;
 
-defined('_JEXEC') or die;
 ?>
-<fieldset title="<?php echo Text::_('COM_CONFIG_FTP_DETAILS'); ?>">
+<fieldset>
 	<legend><?php echo Text::_('COM_CONFIG_FTP_DETAILS'); ?></legend>
 	<?php echo Text::_('COM_CONFIG_FTP_DETAILS_TIP'); ?>
 	<?php if ($this->ftp instanceof Exception) : ?>
diff --git a/administrator/components/com_config/tmpl/application/default_locale.php b/administrator/components/com_config/tmpl/application/default_locale.php
index 43d6ce3bc1825..b8b001db539c2 100644
--- a/administrator/components/com_config/tmpl/application/default_locale.php
+++ b/administrator/components/com_config/tmpl/application/default_locale.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/application/default_mail.php b/administrator/components/com_config/tmpl/application/default_mail.php
index f676748817de4..fd08b759e5fa7 100644
--- a/administrator/components/com_config/tmpl/application/default_mail.php
+++ b/administrator/components/com_config/tmpl/application/default_mail.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -16,7 +16,7 @@
 defined('_JEXEC') or die;
 
 HTMLHelper::_('form.csrf');
-HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-field-send-test-mail.min.js', ['version' => 'auto', 'relative' => true]);
+HTMLHelper::_('webcomponent', 'system/fields/joomla-field-send-test-mail.min.js', ['version' => 'auto', 'relative' => true]);
 
 // Load JavaScript message titles
 Text::script('ERROR');
diff --git a/administrator/components/com_config/tmpl/application/default_metadata.php b/administrator/components/com_config/tmpl/application/default_metadata.php
index 130690ddbe770..8fb9667b4ac79 100644
--- a/administrator/components/com_config/tmpl/application/default_metadata.php
+++ b/administrator/components/com_config/tmpl/application/default_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/application/default_navigation.php b/administrator/components/com_config/tmpl/application/default_navigation.php
index 3365a1960fa83..4ab3804a0b236 100644
--- a/administrator/components/com_config/tmpl/application/default_navigation.php
+++ b/administrator/components/com_config/tmpl/application/default_navigation.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/application/default_permissions.php b/administrator/components/com_config/tmpl/application/default_permissions.php
index fb76b06675cd0..06c39e773aabd 100644
--- a/administrator/components/com_config/tmpl/application/default_permissions.php
+++ b/administrator/components/com_config/tmpl/application/default_permissions.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/application/default_proxy.php b/administrator/components/com_config/tmpl/application/default_proxy.php
index 94ed4c100a666..3913bf534f314 100644
--- a/administrator/components/com_config/tmpl/application/default_proxy.php
+++ b/administrator/components/com_config/tmpl/application/default_proxy.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/application/default_seo.php b/administrator/components/com_config/tmpl/application/default_seo.php
index 797c0b00173fb..4bf7b108a4091 100644
--- a/administrator/components/com_config/tmpl/application/default_seo.php
+++ b/administrator/components/com_config/tmpl/application/default_seo.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/application/default_server.php b/administrator/components/com_config/tmpl/application/default_server.php
index 4038ac5c9b5c2..a42374b43c911 100644
--- a/administrator/components/com_config/tmpl/application/default_server.php
+++ b/administrator/components/com_config/tmpl/application/default_server.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/application/default_session.php b/administrator/components/com_config/tmpl/application/default_session.php
index 546d7e2559b02..1dd01c1028151 100644
--- a/administrator/components/com_config/tmpl/application/default_session.php
+++ b/administrator/components/com_config/tmpl/application/default_session.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/application/default_site.php b/administrator/components/com_config/tmpl/application/default_site.php
index 10193d7a77144..ffff07fc26b12 100644
--- a/administrator/components/com_config/tmpl/application/default_site.php
+++ b/administrator/components/com_config/tmpl/application/default_site.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/application/default_system.php b/administrator/components/com_config/tmpl/application/default_system.php
index b024b43588884..8b34d2e2c0f25 100644
--- a/administrator/components/com_config/tmpl/application/default_system.php
+++ b/administrator/components/com_config/tmpl/application/default_system.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/component/default.php b/administrator/components/com_config/tmpl/component/default.php
index 8cf04a3bdf69d..e73c172595bca 100644
--- a/administrator/components/com_config/tmpl/component/default.php
+++ b/administrator/components/com_config/tmpl/component/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/tmpl/component/default.xml b/administrator/components/com_config/tmpl/component/default.xml
old mode 100755
new mode 100644
diff --git a/administrator/components/com_config/tmpl/component/default_navigation.php b/administrator/components/com_config/tmpl/component/default_navigation.php
index b4b884ddc8755..c08618a1071db 100644
--- a/administrator/components/com_config/tmpl/component/default_navigation.php
+++ b/administrator/components/com_config/tmpl/component/default_navigation.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/Controller/AjaxController.php b/administrator/components/com_contact/Controller/AjaxController.php
new file mode 100644
index 0000000000000..ece8e98c1717b
--- /dev/null
+++ b/administrator/components/com_contact/Controller/AjaxController.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Contact\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Language\LanguageHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Response\JsonResponse;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Table\Table;
+
+/**
+ * The contact controller for ajax requests
+ *
+ * @since  3.9.0
+ */
+class AjaxController extends BaseController
+{
+	/**
+	 * Method to fetch associations of a contact
+	 *
+	 * The method assumes that the following http parameters are passed in an Ajax Get request:
+	 * token: the form token
+	 * assocId: the id of the contact whose associations are to be returned
+	 * excludeLang: the association for this language is to be excluded
+	 *
+	 * @return  void
+	 *
+	 * @since  3.9.0
+	 */
+	public function fetchAssociations()
+	{
+		if (!Session::checkToken('get'))
+		{
+			echo new JsonResponse(null, Text::_('JINVALID_TOKEN'), true);
+		}
+		else
+		{
+			$assocId = $this->input->getInt('assocId', 0);
+
+			if ($assocId == 0)
+			{
+				echo new JsonResponse(null, Text::sprintf('JLIB_FORM_VALIDATE_FIELD_INVALID', 'assocId'), true);
+
+				return;
+			}
+
+			$excludeLang = $this->input->get('excludeLang', '', 'STRING');
+
+			$associations = Associations::getAssociations('com_contact', '#__contact_details', 'com_contact.item', (int) $assocId);
+
+			unset($associations[$excludeLang]);
+
+			// Add the title to each of the associated records
+			Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_contact/tables');
+			$contactTable = Table::getInstance('Contact', 'ContactTable');
+
+			foreach ($associations as $lang => $association)
+			{
+				$contactTable->load($association->id);
+				$associations[$lang]->title = $contactTable->name;
+			}
+
+			$countContentLanguages = count(LanguageHelper::getContentLanguages(array(0, 1)));
+
+			if (count($associations) == 0)
+			{
+				$message = Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_NONE');
+			}
+			elseif ($countContentLanguages > count($associations) + 2)
+			{
+				$tags    = implode(', ', array_keys($associations));
+				$message = Text::sprintf('JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_SOME', $tags);
+			}
+			else
+			{
+				$message = Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_ALL');
+			}
+
+			echo new JsonResponse($associations, $message);
+		}
+	}
+}
diff --git a/administrator/components/com_contact/Controller/ContactController.php b/administrator/components/com_contact/Controller/ContactController.php
index 7eae7895e0ef9..54acd8e05d28c 100644
--- a/administrator/components/com_contact/Controller/ContactController.php
+++ b/administrator/components/com_contact/Controller/ContactController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,10 +12,8 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -103,7 +101,7 @@ protected function allowEdit($data = array(), $key = 'id')
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Set the model
 		/** @var \Joomla\Component\Contact\Administrator\Model\ContactModel $model */
diff --git a/administrator/components/com_contact/Controller/ContactsController.php b/administrator/components/com_contact/Controller/ContactsController.php
index 9a975c28cd912..15ac81bd7d251 100644
--- a/administrator/components/com_contact/Controller/ContactsController.php
+++ b/administrator/components/com_contact/Controller/ContactsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
-use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -54,7 +53,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 	public function featured()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$ids    = $this->input->get('cid', array(), 'array');
 		$values = array('featured' => 1, 'unfeatured' => 0);
diff --git a/administrator/components/com_contact/Controller/DisplayController.php b/administrator/components/com_contact/Controller/DisplayController.php
index 84a02858d4b88..c57cb791568b0 100644
--- a/administrator/components/com_contact/Controller/DisplayController.php
+++ b/administrator/components/com_contact/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/Extension/ContactComponent.php b/administrator/components/com_contact/Extension/ContactComponent.php
index d045c2a4c9865..a7028687f295e 100644
--- a/administrator/components/com_contact/Extension/ContactComponent.php
+++ b/administrator/components/com_contact/Extension/ContactComponent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/Field/Modal/ContactField.php b/administrator/components/com_contact/Field/Modal/ContactField.php
index 970a0ca1c4de0..62955ed1ccb36 100644
--- a/administrator/components/com_contact/Field/Modal/ContactField.php
+++ b/administrator/components/com_contact/Field/Modal/ContactField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,6 +14,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Session\Session;
 
@@ -41,10 +42,13 @@ class ContactField extends FormField
 	 */
 	protected function getInput()
 	{
-		$allowNew    = ((string) $this->element['new'] == 'true');
-		$allowEdit   = ((string) $this->element['edit'] == 'true');
-		$allowClear  = ((string) $this->element['clear'] != 'false');
-		$allowSelect = ((string) $this->element['select'] != 'false');
+		$allowNew       = ((string) $this->element['new'] == 'true');
+		$allowEdit      = ((string) $this->element['edit'] == 'true');
+		$allowClear     = ((string) $this->element['clear'] != 'false');
+		$allowSelect    = ((string) $this->element['select'] != 'false');
+		$allowPropagate = ((string) $this->element['propagate'] == 'true');
+
+		$languages = LanguageHelper::getContentLanguages(array(0, 1));
 
 		// Load language
 		Factory::getLanguage()->load('com_contact', JPATH_ADMINISTRATOR);
@@ -76,6 +80,8 @@ function jSelectContact_" . $this->id . "(id, title, object) {
 				}
 				");
 
+				Text::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED');
+
 				$scriptSelect[$this->id] = true;
 			}
 		}
@@ -134,55 +140,72 @@ function jSelectContact_" . $this->id . "(id, title, object) {
 		// Select contact button
 		if ($allowSelect)
 		{
-			$html .= '<a'
-				. ' class="btn btn-primary hasTooltip' . ($value ? ' sr-only' : '') . '"'
+			$html .= '<button'
+				. ' class="btn btn-primary hasTooltip' . ($value ? ' hidden' : '') . '"'
 				. ' id="' . $this->id . '_select"'
 				. ' data-toggle="modal"'
-				. ' role="button"'
-				. ' href="#ModalSelect' . $modalId . '"'
+				. ' type="button"'
+				. ' data-target="#ModalSelect' . $modalId . '"'
 				. ' title="' . HTMLHelper::tooltipText('COM_CONTACT_CHANGE_CONTACT') . '">'
 				. '<span class="icon-file" aria-hidden="true"></span> ' . Text::_('JSELECT')
-				. '</a>';
+				. '</button>';
 		}
 
 		// New contact button
 		if ($allowNew)
 		{
-			$html .= '<a'
-				. ' class="btn btn-secondary hasTooltip' . ($value ? ' sr-only' : '') . '"'
+			$html .= '<button'
+				. ' class="btn btn-secondary hasTooltip' . ($value ? ' hidden' : '') . '"'
 				. ' id="' . $this->id . '_new"'
 				. ' data-toggle="modal"'
-				. ' role="button"'
-				. ' href="#ModalNew' . $modalId . '"'
+				. ' type="button"'
+				. ' data-target="#ModalNew' . $modalId . '"'
 				. ' title="' . HTMLHelper::tooltipText('COM_CONTACT_NEW_CONTACT') . '">'
 				. '<span class="icon-new" aria-hidden="true"></span> ' . Text::_('JACTION_CREATE')
-				. '</a>';
+				. '</button>';
 		}
 
 		// Edit contact button
 		if ($allowEdit)
 		{
-			$html .= '<a'
-				. ' class="btn btn-secondary hasTooltip' . ($value ? '' : ' sr-only') . '"'
+			$html .= '<button'
+				. ' class="btn btn-secondary hasTooltip' . ($value ? '' : ' hidden') . '"'
 				. ' id="' . $this->id . '_edit"'
 				. ' data-toggle="modal"'
-				. ' role="button"'
-				. ' href="#ModalEdit' . $modalId . '"'
+				. ' type="button"'
+				. ' data-target="#ModalEdit' . $modalId . '"'
 				. ' title="' . HTMLHelper::tooltipText('COM_CONTACT_EDIT_CONTACT') . '">'
 				. '<span class="icon-edit" aria-hidden="true"></span> ' . Text::_('JACTION_EDIT')
-				. '</a>';
+				. '</button>';
 		}
 
 		// Clear contact button
 		if ($allowClear)
 		{
-			$html .= '<a'
-				. ' class="btn btn-secondary' . ($value ? '' : ' sr-only') . '"'
+			$html .= '<button'
+				. ' class="btn btn-secondary' . ($value ? '' : ' hidden') . '"'
 				. ' id="' . $this->id . '_clear"'
-				. ' href="#"'
+				. ' type="button"'
 				. ' onclick="window.processModalParent(\'' . $this->id . '\'); return false;">'
 				. '<span class="icon-remove" aria-hidden="true"></span>' . Text::_('JCLEAR')
-				. '</a>';
+				. '</button>';
+		}
+
+		// Propagate contact button
+		if ($allowPropagate && count($languages) > 2)
+		{
+			// Strip off language tag at the end
+			$tagLength = (int) strlen($this->element['language']);
+			$callbackFunctionStem = substr("jSelectContact_" . $this->id, 0, -$tagLength);
+
+			$html .= '<a'
+			. ' class="btn hasTooltip' . ($value ? '' : ' hidden') . '"'
+			. ' id="' . $this->id . '_propagate"'
+			. ' href="#"'
+			. ' title="' . HtmlHelper::tooltipText('JGLOBAL_ASSOCIATIONS_PROPAGATE_TIP') . '"'
+			. ' onclick="Joomla.propagateAssociation(\'' . $this->id . '\', \'' . $callbackFunctionStem . '\');">'
+			. '<span class="icon-refresh" aria-hidden="true"></span>' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON')
+			. '</a>';
 		}
 
 		if ($allowSelect || $allowNew || $allowEdit || $allowClear)
diff --git a/administrator/components/com_contact/Helper/AssociationsHelper.php b/administrator/components/com_contact/Helper/AssociationsHelper.php
index 091a8e13c6611..74e1f395f0904 100644
--- a/administrator/components/com_contact/Helper/AssociationsHelper.php
+++ b/administrator/components/com_contact/Helper/AssociationsHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/Helper/ContactHelper.php b/administrator/components/com_contact/Helper/ContactHelper.php
index 88ef2d4879019..7f869e1e4e8ce 100644
--- a/administrator/components/com_contact/Helper/ContactHelper.php
+++ b/administrator/components/com_contact/Helper/ContactHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/Model/ContactModel.php b/administrator/components/com_contact/Model/ContactModel.php
index c51a1dc3f35c4..1d4dce086156e 100644
--- a/administrator/components/com_contact/Model/ContactModel.php
+++ b/administrator/components/com_contact/Model/ContactModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -65,99 +65,6 @@ class ContactModel extends AdminModel
 		'user_id'       => 'batchUser',
 	);
 
-	/**
-	 * Batch copy items to a new category or current.
-	 *
-	 * @param   integer  $value     The new category.
-	 * @param   array    $pks       An array of row IDs.
-	 * @param   array    $contexts  An array of item contexts.
-	 *
-	 * @return  mixed  An array of new IDs on success, boolean false on failure.
-	 *
-	 * @since   1.7.0
-	 */
-	protected function batchCopy($value, $pks, $contexts)
-	{
-		$categoryId = (int) $value;
-
-		$newIds = array();
-
-		if (!parent::checkCategoryId($categoryId))
-		{
-			return false;
-		}
-
-		// Parent exists so we proceed
-		while (!empty($pks))
-		{
-			// Pop the first ID off the stack
-			$pk = array_shift($pks);
-
-			$this->table->reset();
-
-			// Check that the row actually exists
-			if (!$this->table->load($pk))
-			{
-				if ($error = $this->table->getError())
-				{
-					// Fatal error
-					$this->setError($error);
-
-					return false;
-				}
-				else
-				{
-					// Not fatal error
-					$this->setError(Text::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
-					continue;
-				}
-			}
-
-			// Alter the title & alias
-			$data = $this->generateNewTitle($categoryId, $this->table->alias, $this->table->name);
-			$this->table->name = $data['0'];
-			$this->table->alias = $data['1'];
-
-			// Reset the ID because we are making a copy
-			$this->table->id = 0;
-
-			// New category ID
-			$this->table->catid = $categoryId;
-
-			// Unpublish because we are making a copy
-			$this->table->published = 0;
-
-			// TODO: Deal with ordering?
-
-			// Check the row.
-			if (!$this->table->check())
-			{
-				$this->setError($this->table->getError());
-
-				return false;
-			}
-
-			// Store the row.
-			if (!$this->table->store())
-			{
-				$this->setError($this->table->getError());
-
-				return false;
-			}
-
-			// Get the new item ID
-			$newId = $this->table->get('id');
-
-			// Add the new ID to the array
-			$newIds[$pk] = $newId;
-		}
-
-		// Clean the cache
-		$this->cleanCache();
-
-		return $newIds;
-	}
-
 	/**
 	 * Batch change a linked user.
 	 *
@@ -255,7 +162,7 @@ protected function canEditState($record)
 	 */
 	public function getForm($data = array(), $loadData = true)
 	{
-		\JForm::addFieldPath('JPATH_ADMINISTRATOR/components/com_users/models/fields');
+		\JForm::addFieldPath(JPATH_ADMINISTRATOR . '/components/com_users/models/fields');
 
 		// Get the form.
 		$form = $this->loadForm('com_contact.contact', 'contact', array('control' => 'jform', 'load_data' => $loadData));
@@ -548,6 +455,7 @@ protected function preprocessForm(\JForm $form, $data, $group = 'content')
 					$field->addAttribute('new', 'true');
 					$field->addAttribute('edit', 'true');
 					$field->addAttribute('clear', 'true');
+					$field->addAttribute('propagate', 'true');
 				}
 
 				$form->load($addform, false);
diff --git a/administrator/components/com_contact/Model/ContactsModel.php b/administrator/components/com_contact/Model/ContactsModel.php
index abdfa49f9c42b..f08ea88f9fdee 100644
--- a/administrator/components/com_contact/Model/ContactsModel.php
+++ b/administrator/components/com_contact/Model/ContactsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/Service/HTML/AdministratorService.php b/administrator/components/com_contact/Service/HTML/AdministratorService.php
index 464ad9d580cb0..9afd50b7fab76 100644
--- a/administrator/components/com_contact/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_contact/Service/HTML/AdministratorService.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/Table/ContactTable.php b/administrator/components/com_contact/Table/ContactTable.php
index 4bdead5d325df..64d7dee246efa 100644
--- a/administrator/components/com_contact/Table/ContactTable.php
+++ b/administrator/components/com_contact/Table/ContactTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/View/Contact/HtmlView.php b/administrator/components/com_contact/View/Contact/HtmlView.php
index 4ef8cdbd51214..144570a2c27b6 100644
--- a/administrator/components/com_contact/View/Contact/HtmlView.php
+++ b/administrator/components/com_contact/View/Contact/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,6 +14,7 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
+use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -112,9 +113,10 @@ protected function addToolbar()
 			// For new records, check the create permission.
 			if ($isNew && (count($user->getAuthorisedCategories('com_contact', 'core.create')) > 0))
 			{
+				ToolbarHelper::apply('contact.apply');
+
 				ToolbarHelper::saveGroup(
 					[
-						['apply', 'contact.apply'],
 						['save', 'contact.save'],
 						['save2new', 'contact.save2new']
 					],
@@ -134,7 +136,8 @@ protected function addToolbar()
 			// Can't save the record if it's checked out and editable
 			if (!$checkedOut && $itemEditable)
 			{
-				$toolbarButtons[] = ['apply', 'contact.apply'];
+				ToolbarHelper::apply('contact.apply');
+
 				$toolbarButtons[] = ['save', 'contact.save'];
 
 				// We can save this record, but check the create permission to see if we can return to make a new one.
@@ -160,6 +163,11 @@ protected function addToolbar()
 				ToolbarHelper::versions('com_contact.contact', $this->item->id);
 			}
 
+			if (Associations::isEnabled() && ComponentHelper::isEnabled('com_associations'))
+			{
+				ToolbarHelper::custom('contact.editAssociations', 'contract', 'contract', 'JTOOLBAR_ASSOCIATIONS', false, false);
+			}
+
 			ToolbarHelper::cancel('contact.cancel', 'JTOOLBAR_CLOSE');
 		}
 
diff --git a/administrator/components/com_contact/View/Contacts/HtmlView.php b/administrator/components/com_contact/View/Contacts/HtmlView.php
index d281b2cc22524..75c35dd810754 100644
--- a/administrator/components/com_contact/View/Contacts/HtmlView.php
+++ b/administrator/components/com_contact/View/Contacts/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -163,7 +163,7 @@ protected function addToolbar()
 
 		if ($canDo->get('core.edit.state'))
 		{
-			$dropdown = $toolbar->dropdownButton('status')
+			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
 				->icon('fa fa-globe')
@@ -219,7 +219,7 @@ protected function addToolbar()
 
 		if ($user->authorise('core.admin', 'com_contact') || $user->authorise('core.options', 'com_contact'))
 		{
-			$toolbar->preferences('com_menus');
+			$toolbar->preferences('com_contact');
 		}
 
 		$toolbar->help('JHELP_COMPONENTS_CONTACTS_CONTACTS');
diff --git a/administrator/components/com_contact/config.xml b/administrator/components/com_contact/config.xml
index 7eb0592885cb0..3d9e87cbd20cc 100644
--- a/administrator/components/com_contact/config.xml
+++ b/administrator/components/com_contact/config.xml
@@ -827,6 +827,23 @@
 			<option value="1">JSHOW</option>
 		</field>
 
+		<field
+ 			name="contacts_display_num"
+ 			type="list"
+ 			label="COM_CONTACT_NUMBER_CONTACTS_LIST_LABEL"
+ 			default="10"
+ 			>
+ 			<option value="5">J5</option>
+ 			<option value="10">J10</option>
+ 			<option value="15">J15</option>
+ 			<option value="20">J20</option>
+ 			<option value="25">J25</option>
+ 			<option value="30">J30</option>
+ 			<option value="50">J50</option>
+ 			<option value="100">J100</option>
+ 			<option value="0">JALL</option>
+ 		</field>
+
 		<field
 			name="initial_sort"
 			type="list"
@@ -837,6 +854,7 @@
 			<option value="name">COM_CONTACT_FIELD_VALUE_NAME</option>
 			<option value="sortname">COM_CONTACT_FIELD_VALUE_SORT_NAME</option>
 			<option value="ordering">COM_CONTACT_FIELD_VALUE_ORDERING</option>
+			<option value="featuredordering">COM_CONTACT_FIELD_VALUE_ORDERING_FEATURED</option>
 		</field>
 
 	</fieldset>
diff --git a/administrator/components/com_contact/contact.xml b/administrator/components/com_contact/contact.xml
index 8ac4609e49d84..094f8fa4e134a 100644
--- a/administrator/components/com_contact/contact.xml
+++ b/administrator/components/com_contact/contact.xml
@@ -3,7 +3,7 @@
 	<name>com_contact</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_contact/helpers/contact.php b/administrator/components/com_contact/helpers/contact.php
index 6e636fc544a24..b2064f40e6b67 100644
--- a/administrator/components/com_contact/helpers/contact.php
+++ b/administrator/components/com_contact/helpers/contact.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/services/provider.php b/administrator/components/com_contact/services/provider.php
index 7b48ba445b22c..4ea9f14a7242c 100644
--- a/administrator/components/com_contact/services/provider.php
+++ b/administrator/components/com_contact/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/tmpl/contact/edit.php b/administrator/components/com_contact/tmpl/contact/edit.php
index 03b1eb91cd5e4..b89820c625289 100644
--- a/administrator/components/com_contact/tmpl/contact/edit.php
+++ b/administrator/components/com_contact/tmpl/contact/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -80,7 +80,8 @@
 		<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'misc', Text::_('JGLOBAL_FIELDSET_MISCELLANEOUS')); ?>
 		<div class="row">
 			<div class="col-md-12">
-				<?php echo $this->form->renderField('misc'); ?>
+				<?php echo $this->form->getLabel('misc'); ?>
+				<?php echo $this->form->getInput('misc'); ?>
 			</div>
 		</div>
 		<?php echo HTMLHelper::_('uitab.endTab'); ?>
diff --git a/administrator/components/com_contact/tmpl/contact/edit_associations.php b/administrator/components/com_contact/tmpl/contact/edit_associations.php
index 6bbc7421ec05b..bd9c6605e2a55 100644
--- a/administrator/components/com_contact/tmpl/contact/edit_associations.php
+++ b/administrator/components/com_contact/tmpl/contact/edit_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/tmpl/contact/edit_metadata.php b/administrator/components/com_contact/tmpl/contact/edit_metadata.php
index e4a89dfb34581..595dccab85a8e 100644
--- a/administrator/components/com_contact/tmpl/contact/edit_metadata.php
+++ b/administrator/components/com_contact/tmpl/contact/edit_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/tmpl/contact/edit_params.php b/administrator/components/com_contact/tmpl/contact/edit_params.php
index a8c0e5b6f5e54..3c11ec5e034e0 100644
--- a/administrator/components/com_contact/tmpl/contact/edit_params.php
+++ b/administrator/components/com_contact/tmpl/contact/edit_params.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/tmpl/contact/modal.php b/administrator/components/com_contact/tmpl/contact/modal.php
index a310090bd13af..e3686337ccaea 100644
--- a/administrator/components/com_contact/tmpl/contact/modal.php
+++ b/administrator/components/com_contact/tmpl/contact/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/tmpl/contact/modal_associations.php b/administrator/components/com_contact/tmpl/contact/modal_associations.php
index 6bbc7421ec05b..bd9c6605e2a55 100644
--- a/administrator/components/com_contact/tmpl/contact/modal_associations.php
+++ b/administrator/components/com_contact/tmpl/contact/modal_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/tmpl/contact/modal_metadata.php b/administrator/components/com_contact/tmpl/contact/modal_metadata.php
index e4a89dfb34581..595dccab85a8e 100644
--- a/administrator/components/com_contact/tmpl/contact/modal_metadata.php
+++ b/administrator/components/com_contact/tmpl/contact/modal_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/tmpl/contact/modal_params.php b/administrator/components/com_contact/tmpl/contact/modal_params.php
index a8c0e5b6f5e54..3c11ec5e034e0 100644
--- a/administrator/components/com_contact/tmpl/contact/modal_params.php
+++ b/administrator/components/com_contact/tmpl/contact/modal_params.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/tmpl/contacts/default.php b/administrator/components/com_contact/tmpl/contacts/default.php
index eb966a8f36708..a97d837976693 100644
--- a/administrator/components/com_contact/tmpl/contacts/default.php
+++ b/administrator/components/com_contact/tmpl/contacts/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -61,6 +61,9 @@
 								<td style="width:1%" class="text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
+								<th scope="col" style="width:1%" class="text-center">
+									<?php echo HTMLHelper::_('searchtools.sort', 'JFEATURED', 'a.featured', $listDirn, $listOrder); ?>
+								</th>
 								<th scope="col" style="width:1%; min-width:85px" class="text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
 								</th>
@@ -124,12 +127,17 @@
 								<td class="text-center">
 									<?php echo HTMLHelper::_('grid.id', $i, $item->id); ?>
 								</td>
+								<td class="text-center">
+									<div class="btn-group">
+									        <?php echo HTMLHelper::_('contactadministrator.featured', $item->featured, $i, $canChange); ?>
+								   	</div>
+								</td>	
 								<td class="text-center">
 									<div class="btn-group">
 										<?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'contacts.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
-										<?php echo HTMLHelper::_('contactadministrator.featured', $item->featured, $i, $canChange); ?>
-									</div>
+									</div>	
 								</td>
+								
 								<th scope="row" class="has-context">
 									<div>
 										<?php if ($item->checked_out) : ?>
diff --git a/administrator/components/com_contact/tmpl/contacts/default_batch.php b/administrator/components/com_contact/tmpl/contacts/default_batch.php
index 1b256eb9ed44b..45677ddd65f87 100644
--- a/administrator/components/com_contact/tmpl/contacts/default_batch.php
+++ b/administrator/components/com_contact/tmpl/contacts/default_batch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,6 +13,7 @@
 use Joomla\CMS\Layout\LayoutHelper;
 
 $published = $this->state->get('filter.published');
+$noUser    = true;
 ?>
 <div class="modal hide fade" id="collapseModal">
 	<div class="modal-header">
@@ -49,7 +50,7 @@
 		<div class="row">
 			<div class="control-group">
 				<div class="controls">
-					<?php echo LayoutHelper::render('joomla.html.batch.user', []); ?>
+					<?php echo LayoutHelper::render('joomla.html.batch.user', ['noUser' => $noUser]); ?>
 				</div>
 			</div>
 		</div>
diff --git a/administrator/components/com_contact/tmpl/contacts/default_batch_body.php b/administrator/components/com_contact/tmpl/contacts/default_batch_body.php
index 05638bdb74b29..41b2a6209b41c 100644
--- a/administrator/components/com_contact/tmpl/contacts/default_batch_body.php
+++ b/administrator/components/com_contact/tmpl/contacts/default_batch_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -11,6 +11,7 @@
 use Joomla\CMS\Layout\LayoutHelper;
 
 $published = $this->state->get('filter.published');
+$noUser    = true;
 ?>
 
 <div class="container">
@@ -41,7 +42,7 @@
 		</div>
 		<div class="form-group col-md-6">
 			<div class="controls">
-				<?php echo LayoutHelper::render('joomla.html.batch.user', []); ?>
+				<?php echo LayoutHelper::render('joomla.html.batch.user', ['noUser' => $noUser]); ?>
 			</div>
 		</div>
 	</div>
diff --git a/administrator/components/com_contact/tmpl/contacts/default_batch_footer.php b/administrator/components/com_contact/tmpl/contacts/default_batch_footer.php
index 18f957c7b8f39..91b16f3725762 100644
--- a/administrator/components/com_contact/tmpl/contacts/default_batch_footer.php
+++ b/administrator/components/com_contact/tmpl/contacts/default_batch_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -11,9 +11,9 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<a class="btn btn-secondary" type="button" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value='';document.getElementById('batch-user-id').value='';document.getElementById('batch-tag-id').value=''" data-dismiss="modal">
+<button type="button" class="btn btn-secondary" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value='';document.getElementById('batch-user-id').value='';document.getElementById('batch-tag-id').value=''" data-dismiss="modal">
 	<?php echo Text::_('JCANCEL'); ?>
-</a>
-<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('contact.batch');">
+</button>
+<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('contact.batch');">
 	<?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?>
-</button>
\ No newline at end of file
+</button>
diff --git a/administrator/components/com_contact/tmpl/contacts/modal.php b/administrator/components/com_contact/tmpl/contacts/modal.php
index 2d3958fa5dc0f..7f2be172286a0 100644
--- a/administrator/components/com_contact/tmpl/contacts/modal.php
+++ b/administrator/components/com_contact/tmpl/contacts/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/Controller/AjaxController.php b/administrator/components/com_content/Controller/AjaxController.php
new file mode 100644
index 0000000000000..fd93313aaccd4
--- /dev/null
+++ b/administrator/components/com_content/Controller/AjaxController.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Content\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Language\LanguageHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Response\JsonResponse;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Table\Table;
+
+/**
+ * The article controller for ajax requests
+ *
+ * @since  3.9.0
+ */
+class AjaxController extends BaseController
+{
+	/**
+	 * Method to fetch associations of an article
+	 *
+	 * The method assumes that the following http parameters are passed in an Ajax Get request:
+	 * token: the form token
+	 * assocId: the id of the article whose associations are to be returned
+	 * excludeLang: the association for this language is to be excluded
+	 *
+	 * @return  null
+	 *
+	 * @since  3.9.0
+	 */
+	public function fetchAssociations()
+	{
+		if (!Session::checkToken('get'))
+		{
+			echo new JsonResponse(null, Text::_('JINVALID_TOKEN'), true);
+		}
+		else
+		{
+			$assocId = $this->input->getInt('assocId', 0);
+
+			if ($assocId == 0)
+			{
+				echo new JsonResponse(null, Text::sprintf('JLIB_FORM_VALIDATE_FIELD_INVALID', 'assocId'), true);
+
+				return;
+			}
+
+			$excludeLang = $this->input->get('excludeLang', '', 'STRING');
+
+			$associations = Associations::getAssociations('com_content', '#__content', 'com_content.item', (int) $assocId);
+
+			unset($associations[$excludeLang]);
+
+			// Add the title to each of the associated records
+			$contentTable = Table::getInstance('Content', 'JTable');
+
+			foreach ($associations as $lang => $association)
+			{
+				$contentTable->load($association->id);
+				$associations[$lang]->title = $contentTable->title;
+			}
+
+			$countContentLanguages = count(LanguageHelper::getContentLanguages(array(0, 1)));
+
+			if (count($associations) == 0)
+			{
+				$message = Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_NONE');
+			}
+			elseif ($countContentLanguages > count($associations) + 2)
+			{
+				$tags    = implode(', ', array_keys($associations));
+				$message = Text::sprintf('JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_SOME', $tags);
+			}
+			else
+			{
+				$message = Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_ALL');
+			}
+
+			echo new JsonResponse($associations, $message);
+		}
+	}
+}
diff --git a/administrator/components/com_content/Controller/ArticleController.php b/administrator/components/com_content/Controller/ArticleController.php
index 16eb746e2f441..6b4ace7cc104f 100644
--- a/administrator/components/com_content/Controller/ArticleController.php
+++ b/administrator/components/com_content/Controller/ArticleController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,11 +12,9 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -136,7 +134,7 @@ protected function allowEdit($data = array(), $key = 'id')
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Set the model
 		/** @var \Joomla\Component\Content\Administrator\Model\ArticleModel $model */
diff --git a/administrator/components/com_content/Controller/ArticlesController.php b/administrator/components/com_content/Controller/ArticlesController.php
index 147f18b67f53d..7edb8341c0cc8 100644
--- a/administrator/components/com_content/Controller/ArticlesController.php
+++ b/administrator/components/com_content/Controller/ArticlesController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -16,7 +16,6 @@
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -62,7 +61,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 	public function featured()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$user   = Factory::getUser();
 		$ids    = $this->input->get('cid', array(), 'array');
diff --git a/administrator/components/com_content/Controller/DisplayController.php b/administrator/components/com_content/Controller/DisplayController.php
index d71c453fa6fd9..30b83b41e7180 100644
--- a/administrator/components/com_content/Controller/DisplayController.php
+++ b/administrator/components/com_content/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/Controller/FeaturedController.php b/administrator/components/com_content/Controller/FeaturedController.php
index 19bd563ea5fb7..530508f61af6f 100644
--- a/administrator/components/com_content/Controller/FeaturedController.php
+++ b/administrator/components/com_content/Controller/FeaturedController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,6 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Session\Session;
 
 /**
  * Featured content controller class.
@@ -32,7 +31,7 @@ class FeaturedController extends ArticlesController
 	public function delete()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$user = Factory::getUser();
 		$ids  = $this->input->get('cid', array(), 'array');
diff --git a/administrator/components/com_content/Extension/ContentComponent.php b/administrator/components/com_content/Extension/ContentComponent.php
index c227c293cd0e8..53ac420f5033b 100644
--- a/administrator/components/com_content/Extension/ContentComponent.php
+++ b/administrator/components/com_content/Extension/ContentComponent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/Field/AssocField.php b/administrator/components/com_content/Field/AssocField.php
index 9c3c0191f535b..65e0cce311e58 100644
--- a/administrator/components/com_content/Field/AssocField.php
+++ b/administrator/components/com_content/Field/AssocField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/Field/Modal/ArticleField.php b/administrator/components/com_content/Field/Modal/ArticleField.php
index c695cacfab06b..4acdbb60f7250 100644
--- a/administrator/components/com_content/Field/Modal/ArticleField.php
+++ b/administrator/components/com_content/Field/Modal/ArticleField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,6 +14,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Session\Session;
 
@@ -41,10 +42,13 @@ class ArticleField extends FormField
 	 */
 	protected function getInput()
 	{
-		$allowNew    = ((string) $this->element['new'] == 'true');
-		$allowEdit   = ((string) $this->element['edit'] == 'true');
-		$allowClear  = ((string) $this->element['clear'] != 'false');
-		$allowSelect = ((string) $this->element['select'] != 'false');
+		$allowNew       = ((string) $this->element['new'] == 'true');
+		$allowEdit      = ((string) $this->element['edit'] == 'true');
+		$allowClear     = ((string) $this->element['clear'] != 'false');
+		$allowSelect    = ((string) $this->element['select'] != 'false');
+		$allowPropagate = ((string) $this->element['propagate'] == 'true');
+
+		$languages = LanguageHelper::getContentLanguages(array(0, 1));
 
 		// Load language
 		Factory::getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
@@ -76,6 +80,8 @@ function jSelectArticle_" . $this->id . "(id, title, catid, object, url, languag
 				}
 				");
 
+				Text::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED');
+
 				$scriptSelect[$this->id] = true;
 			}
 		}
@@ -137,55 +143,72 @@ function jSelectArticle_" . $this->id . "(id, title, catid, object, url, languag
 		// Select article button
 		if ($allowSelect)
 		{
-			$html .= '<a'
-				. ' class="btn btn-primary hasTooltip' . ($value ? ' sr-only' : '') . '"'
+			$html .= '<button'
+				. ' class="btn btn-primary hasTooltip' . ($value ? ' hidden' : '') . '"'
 				. ' id="' . $this->id . '_select"'
 				. ' data-toggle="modal"'
-				. ' role="button"'
-				. ' href="#ModalSelect' . $modalId . '"'
+				. ' type="button"'
+				. ' data-target="#ModalSelect' . $modalId . '"'
 				. ' title="' . HTMLHelper::tooltipText('COM_CONTENT_CHANGE_ARTICLE') . '">'
 				. '<span class="icon-file" aria-hidden="true"></span> ' . Text::_('JSELECT')
-				. '</a>';
+				. '</button>';
 		}
 
 		// New article button
 		if ($allowNew)
 		{
-			$html .= '<a'
-				. ' class="btn btn-secondary hasTooltip' . ($value ? ' sr-only' : '') . '"'
+			$html .= '<button'
+				. ' class="btn btn-secondary hasTooltip' . ($value ? ' hidden' : '') . '"'
 				. ' id="' . $this->id . '_new"'
 				. ' data-toggle="modal"'
-				. ' role="button"'
-				. ' href="#ModalNew' . $modalId . '"'
+				. ' type="button"'
+				. ' data-target="#ModalNew' . $modalId . '"'
 				. ' title="' . HTMLHelper::tooltipText('COM_CONTENT_NEW_ARTICLE') . '">'
 				. '<span class="icon-new" aria-hidden="true"></span> ' . Text::_('JACTION_CREATE')
-				. '</a>';
+				. '</button>';
 		}
 
 		// Edit article button
 		if ($allowEdit)
 		{
-			$html .= '<a'
-				. ' class="btn btn-secondary hasTooltip' . ($value ? '' : ' sr-only') . '"'
+			$html .= '<button'
+				. ' class="btn btn-secondary hasTooltip' . ($value ? '' : ' hidden') . '"'
 				. ' id="' . $this->id . '_edit"'
 				. ' data-toggle="modal"'
-				. ' role="button"'
-				. ' href="#ModalEdit' . $modalId . '"'
+				. ' type="button"'
+				. ' data-target="#ModalEdit' . $modalId . '"'
 				. ' title="' . HTMLHelper::tooltipText('COM_CONTENT_EDIT_ARTICLE') . '">'
 				. '<span class="icon-edit" aria-hidden="true"></span> ' . Text::_('JACTION_EDIT')
-				. '</a>';
+				. '</button>';
 		}
 
 		// Clear article button
 		if ($allowClear)
 		{
-			$html .= '<a'
-				. ' class="btn btn-secondary' . ($value ? '' : ' sr-only') . '"'
+			$html .= '<button'
+				. ' class="btn btn-secondary' . ($value ? '' : ' hidden') . '"'
 				. ' id="' . $this->id . '_clear"'
-				. ' href="#"'
+				. ' type="button"'
 				. ' onclick="window.processModalParent(\'' . $this->id . '\'); return false;">'
 				. '<span class="icon-remove" aria-hidden="true"></span>' . Text::_('JCLEAR')
-				. '</a>';
+				. '</button>';
+		}
+
+		// Propagate article button
+		if ($allowPropagate && count($languages) > 2)
+		{
+			// Strip off language tag at the end
+			$tagLength = (int) strlen($this->element['language']);
+			$callbackFunctionStem = substr("jSelectArticle_" . $this->id, 0, -$tagLength);
+
+			$html .= '<a'
+			. ' class="btn hasTooltip' . ($value ? '' : ' hidden') . '"'
+			. ' id="' . $this->id . '_propagate"'
+			. ' href="#"'
+			. ' title="' . HtmlHelper::tooltipText('JGLOBAL_ASSOCIATIONS_PROPAGATE_TIP') . '"'
+			. ' onclick="Joomla.propagateAssociation(\'' . $this->id . '\', \'' . $callbackFunctionStem . '\');">'
+			. '<span class="icon-refresh" aria-hidden="true"></span>' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON')
+			. '</a>';
 		}
 
 		if ($allowSelect || $allowNew || $allowEdit || $allowClear)
diff --git a/administrator/components/com_content/Field/VoteradioField.php b/administrator/components/com_content/Field/VoteradioField.php
index 62e1a6262c8a7..afd844d3254ee 100644
--- a/administrator/components/com_content/Field/VoteradioField.php
+++ b/administrator/components/com_content/Field/VoteradioField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/Helper/AssociationsHelper.php b/administrator/components/com_content/Helper/AssociationsHelper.php
index 98e68ea5fdbfa..bba599232cd70 100644
--- a/administrator/components/com_content/Helper/AssociationsHelper.php
+++ b/administrator/components/com_content/Helper/AssociationsHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/Helper/ContentHelper.php b/administrator/components/com_content/Helper/ContentHelper.php
index 475be0447e05f..013cfd0fda6c4 100644
--- a/administrator/components/com_content/Helper/ContentHelper.php
+++ b/administrator/components/com_content/Helper/ContentHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/Helper/PreviewHelper.php b/administrator/components/com_content/Helper/PreviewHelper.php
deleted file mode 100644
index 7c106a0d37ceb..0000000000000
--- a/administrator/components/com_content/Helper/PreviewHelper.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_content
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Content\Administrator\Helper;
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Multilanguage;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Preview Link Helper
- *
- * @since  4.0.0
- */
-class PreviewHelper
-{
-	/**
-	 * Get the article URL
-	 *
-	 * @param   object  $article  The article item object
-	 *
-	 * @return  string  The article URL
-	 *
-	 * @since   4.0
-	 */
-	public static function url($article)
-	{
-		$lang = '';
-		$sef  = '';
-
-		// Get the home Itemid for the language
-		$db    = Factory::getDbo();
-		$query = $db->getQuery(true);
-
-		$query->select('id')
-			->from($db->quoteName('#__menu'))
-			->where($db->quoteName('home') . '= 1')
-			->where($db->quoteName('published') . '= 1')
-			->where($db->quoteName('client_id') . '= 0');
-
-		if (Multilanguage::isEnabled())
-		{
-			$query->where($db->quoteName('language') . ' = ' . $db->quote($article->language));
-		}
-		else
-		{
-			$query->where($db->quoteName('language') . ' = ' . $db->quote('*'));
-		}
-
-		$db->setQuery($query);
-
-		$Itemid = '&amp;Itemid=' . (int) $db->loadResult();
-
-		if ($article->language && Multilanguage::isEnabled())
-		{
-			// Get the sef prefix for the language
-			$query->clear()
-				->select('sef')
-				->from($db->quoteName('#__languages'))
-				->where($db->quoteName('published') . '= 1')
-				->where($db->quoteName('lang_code') . ' = ' . $db->quote($article->language));
-			$db->setQuery($query);
-
-			$sef = $db->loadResult();
-
-			if ($article->language != '*')
-			{
-				$lang = '&amp;lang=' . $sef;
-			}
-		}
-
-		return Uri::root() . 'index.php?option=com_content&amp;view=article&amp;id=' . (int) $article->id
-		. '&amp;catid=' . (int) $article->catid . $lang . $Itemid;
-	}
-}
diff --git a/administrator/components/com_content/Model/ArticleModel.php b/administrator/components/com_content/Model/ArticleModel.php
index 22a94c6589b5a..e21d38c89870f 100644
--- a/administrator/components/com_content/Model/ArticleModel.php
+++ b/administrator/components/com_content/Model/ArticleModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -21,6 +21,7 @@
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\String\PunycodeHelper;
 use Joomla\CMS\Table\Category;
+use Joomla\CMS\Table\TableInterface;
 use Joomla\CMS\UCM\UCMType;
 use Joomla\CMS\Workflow\Workflow;
 use Joomla\Component\Categories\Administrator\Helper\CategoriesHelper;
@@ -64,148 +65,49 @@ class ArticleModel extends AdminModel
 	protected $associationsContext = 'com_content.item';
 
 	/**
-	 * Batch copy items to a new category or current.
+	 * Function that can be overriden to do any data cleanup after batch copying data
 	 *
-	 * @param   integer  $value     The new category.
-	 * @param   array    $pks       An array of row IDs.
-	 * @param   array    $contexts  An array of item contexts.
+	 * @param   TableInterface  $table  The table object containing the newly created item
+	 * @param   integer         $newId  The id of the new item
+	 * @param   integer         $oldId  The original item id
 	 *
-	 * @return  mixed  An array of new IDs on success, boolean false on failure.
+	 * @return  void
 	 *
-	 * @since   1.7.0
+	 * @since  3.8.12
 	 */
-	protected function batchCopy($value, $pks, $contexts)
+	protected function cleanupPostBatchCopy(TableInterface $table, $newId, $oldId)
 	{
-		$categoryId = (int) $value;
-
-		$newIds = array();
-
-		if (!$this->checkCategoryId($categoryId))
+		// Check if the article was featured and update the #__content_frontpage table
+		if ($table->featured == 1)
 		{
-			return false;
+			$db = $this->getDbo();
+			$query = $db->getQuery(true)
+				->insert($db->quoteName('#__content_frontpage'))
+				->values($newId . ', 0');
+			$db->setQuery($query);
+			$db->execute();
 		}
 
-		PluginHelper::importPlugin('system');
-
-		// Parent exists so we let's proceed
-		while (!empty($pks))
-		{
-			// Pop the first ID off the stack
-			$pk = array_shift($pks);
-
-			$this->table->reset();
-
-			// Check that the row actually exists
-			if (!$this->table->load($pk))
-			{
-				if ($error = $this->table->getError())
-				{
-					// Fatal error
-					$this->setError($error);
-
-					return false;
-				}
-				else
-				{
-					// Not fatal error
-					$this->setError(Text::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
-					continue;
-				}
-			}
-
-			$fields = FieldsHelper::getFields('com_content.article', $this->table, true);
-			$fieldsData = array();
-
-			if (!empty($fields))
-			{
-				$fieldsData['com_fields'] = array();
-
-				foreach ($fields as $field)
-				{
-					$fieldsData['com_fields'][$field->name] = $field->rawvalue;
-				}
-			}
-
-			// Alter the title & alias
-			$data = $this->generateNewTitle($categoryId, $this->table->alias, $this->table->title);
-			$this->table->title = $data['0'];
-			$this->table->alias = $data['1'];
-
-			// Reset the ID because we are making a copy
-			$this->table->id = 0;
-
-			// Reset hits because we are making a copy
-			$this->table->hits = 0;
-
-			// New category ID
-			$this->table->catid = $categoryId;
-
-			// TODO: Deal with ordering?
-			// $table->ordering	= 1;
-
-			// Get the featured state
-			$featured = $this->table->featured;
-
-			$workflow = $this->getWorkflowByCategory($categoryId);
+		// Register FieldsHelper
+		\JLoader::register('FieldsHelper', JPATH_ADMINISTRATOR . '/components/com_fields/helpers/fields.php');
 
-			if (empty($workflow->id))
-			{
-				$this->setError(Text::_('COM_CONTENT_WORKFLOW_NOT_FOUND'));
-
-				return false;
-			}
+		$oldItem = $this->getTable();
+		$oldItem->load($oldId);
+		$fields = FieldsHelper::getFields('com_content.article', $oldItem, true);
 
-			$stageId = (int) $workflow->stage_id;
+		$fieldsData = array();
 
-			// B/C state
-			$this->table->state = (int) $workflow->condition;
-
-			// Check the row.
-			if (!$this->table->check())
-			{
-				$this->setError($this->table->getError());
-
-				return false;
-			}
-
-			// Store the row.
-			if (!$this->table->store())
-			{
-				$this->setError($this->table->getError());
-
-				return false;
-			}
-
-			// Get the new item ID
-			$newId = (int) $this->table->get('id');
-
-			// Add workflow stage
-			$workflow = new Workflow(['extension' => 'com_content']);
-
-			$workflow->createAssociation($newId, $stageId);
-
-			// Add the new ID to the array
-			$newIds[$pk] = $newId;
+		if (!empty($fields))
+		{
+			$fieldsData['com_fields'] = array();
 
-			// Check if the article was featured and update the #__content_frontpage table
-			if ($featured == 1)
+			foreach ($fields as $field)
 			{
-				$db = $this->getDbo();
-				$query = $db->getQuery(true)
-					->insert($db->quoteName('#__content_frontpage'))
-					->values($newId . ', 0');
-				$db->setQuery($query);
-				$db->execute();
+				$fieldsData['com_fields'][$field->name] = $field->rawvalue;
 			}
-
-			// Run event for copied article
-			Factory::getApplication()->triggerEvent('onContentAfterSave', array('com_content.article', &$this->table, false, $fieldsData));
 		}
 
-		// Clean the cache
-		$this->cleanCache();
-
-		return $newIds;
+		Factory::getApplication()->triggerEvent('onContentAfterSave', array('com_content.article', &$this->table, false, $fieldsData));
 	}
 
 	/**
@@ -374,7 +276,7 @@ protected function canDelete($record)
 
 			$assoc = $workflow->getAssociation($record->id);
 
-			if (!$stage->load($assoc->stage_id) || $stage->condition != ContentComponent::CONDITION_TRASHED)
+			if (!$stage->load($assoc->stage_id) || ($stage->condition != ContentComponent::CONDITION_TRASHED && !Factory::getApplication()->isClient('api')))
 			{
 				return false;
 			}
@@ -662,6 +564,44 @@ public function getForm($data = array(), $loadData = true)
 		}
 		else
 		{
+			// For new articles we load the potential state + associations
+			if ($formField = $form->getField('catid'))
+			{
+				$assignedCatids = (int) ($data['catid'] ?? $form->getValue('catid'));
+
+				$assignedCatids = is_array($assignedCatids)
+					? (int) reset($assignedCatids)
+					: (int) $assignedCatids;
+
+				// Try to get the category from the html code of the field
+				if (empty($assignedCatids))
+				{
+					$assignedCatids = $formField->getAttribute('default', null);
+
+					// Choose the first category available
+					$xml = new \DOMDocument;
+					libxml_use_internal_errors(true);
+					$xml->loadHTML($formField->__get('input'));
+					libxml_clear_errors();
+					libxml_use_internal_errors(false);
+					$options = $xml->getElementsByTagName('option');
+
+					if (!$assignedCatids && $firstChoice = $options->item(0))
+					{
+						$assignedCatids = $firstChoice->getAttribute('value');
+					}
+				}
+
+				// Activate the reload of the form when category is changed
+				$form->setFieldAttribute('catid', 'refresh-enabled', true);
+				$form->setFieldAttribute('catid', 'refresh-cat-id', $assignedCatids);
+				$form->setFieldAttribute('catid', 'refresh-section', 'article');
+
+				$workflow = $this->getWorkflowByCategory($assignedCatids);
+
+				$form->setFieldAttribute('transition', 'workflow_stage', (int) $workflow->stage_id);
+			}
+
 			// New record. Can only create in selected categories.
 			$form->setFieldAttribute('catid', 'action', 'core.create');
 		}
@@ -708,12 +648,6 @@ public function getForm($data = array(), $loadData = true)
 			}
 		}
 
-		// Remove show_associations field if associations is not enabled
-		if (!$assoc)
-		{
-			$form->removeField('show_associations', 'attribs');
-		}
-
 		return $form;
 	}
 
@@ -918,15 +852,10 @@ public function save($data)
 
 			// B/C state
 			$data['state'] = (int) $workflow->condition;
-
-			// No transition for new articles
-			if (isset($data['transition']))
-			{
-				unset($data['transition']);
-			}
 		}
 		// Calculate new status depending on transition
-		elseif (!empty($data['transition']))
+
+		if (!empty($data['transition']))
 		{
 			// Check if the user is allowed to execute this transition
 			if (!$user->authorise('core.execute.transition', 'com_content.transition.' . (int) $data['transition']))
@@ -999,12 +928,6 @@ public function save($data)
 				$this->featured($this->getState($this->getName() . '.id'), $data['featured']);
 			}
 
-			// Run the transition and update the workflow association
-			if (!empty($data['transition']))
-			{
-				$this->runTransition((int) $this->getState($this->getName() . '.id'), (int) $data['transition']);
-			}
-
 			// Let's check if we have workflow association (perhaps something went wrong before)
 			if (empty($stageId))
 			{
@@ -1041,6 +964,12 @@ public function save($data)
 				$workflow->createAssociation($this->getState($this->getName() . '.id'), (int) $stageId);
 			}
 
+			// Run the transition and update the workflow association
+			if (!empty($data['transition']))
+			{
+				$this->runTransition((int) $this->getState($this->getName() . '.id'), (int) $data['transition']);
+			}
+
 			return true;
 		}
 
@@ -1197,6 +1126,7 @@ protected function preprocessForm(\JForm $form, $data, $group = 'content')
 					$field->addAttribute('new', 'true');
 					$field->addAttribute('edit', 'true');
 					$field->addAttribute('clear', 'true');
+					$field->addAttribute('propagate', 'true');
 				}
 
 				$form->load($addform, false);
diff --git a/administrator/components/com_content/Model/ArticlesModel.php b/administrator/components/com_content/Model/ArticlesModel.php
index a1ad422ecf9be..b6d2943b1d81b 100644
--- a/administrator/components/com_content/Model/ArticlesModel.php
+++ b/administrator/components/com_content/Model/ArticlesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -107,6 +107,9 @@ protected function populateState($ordering = 'a.id', $direction = 'desc')
 		$search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
 		$this->setState('filter.search', $search);
 
+		$featured = $this->getUserStateFromRequest($this->context . '.filter.featured', 'filter_featured', '');
+		$this->setState('filter.featured', $featured);
+
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);
 
@@ -182,7 +185,7 @@ protected function getStoreId($id = '')
 	/**
 	 * Build an SQL query to load the list data.
 	 *
-	 * @return  \JDatabaseQuery
+	 * @return  \Joomla\Database\DatabaseQuery
 	 *
 	 * @since   1.6
 	 */
@@ -199,7 +202,7 @@ protected function getListQuery()
 				'list.select',
 				'DISTINCT a.id, a.title, a.alias, a.checked_out, a.checked_out_time, a.catid' .
 				', a.state, a.access, a.created, a.created_by, a.created_by_alias, a.modified, a.ordering, a.featured, a.language, a.hits' .
-				', a.publish_up, a.publish_down'
+				', a.publish_up, a.publish_down, a.introtext, a.note'
 			)
 		);
 		$query->from('#__content AS a');
@@ -217,9 +220,14 @@ protected function getListQuery()
 			->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
 
 		// Join over the categories.
-		$query->select('c.title AS category_title')
+		$query->select('c.title AS category_title, c.created_user_id AS category_uid, c.level AS category_level')
 			->join('LEFT', '#__categories AS c ON c.id = a.catid');
 
+		// Join over the parent categories.
+		$query->select('parent.title AS parent_category_title, parent.id AS parent_category_id, 
+								parent.created_user_id AS parent_category_uid, parent.level AS parent_category_level')
+			->join('LEFT', '#__categories AS parent ON parent.id = c.parent_id');
+
 		// Join over the users for the author.
 		$query->select('ua.name AS author_name')
 			->join('LEFT', '#__users AS ua ON ua.id = a.created_by');
@@ -276,11 +284,14 @@ protected function getListQuery()
 			'uc.name',
 			'ag.title',
 			'c.title',
+			'c.created_user_id',
+			'c.level',
 			'ua.name',
 			'ws.title',
 			'ws.workflow_id',
 			'ws.condition',
-			'wa.stage_id'
+			'wa.stage_id',
+			'parent.id',
 		);
 
 		if (PluginHelper::isEnabled('content', 'vote'))
@@ -315,6 +326,14 @@ protected function getListQuery()
 			$query->where('a.access IN (' . $access . ')');
 		}
 
+		// Filter by featured.
+		$featured = (string) $this->getState('filter.featured');
+
+		if (in_array($featured, ['0','1']))
+		{
+			$query->where('a.featured =' . (int) $featured);
+		}
+
 		// Filter by access level on categories.
 		if (!$user->authorise('core.admin'))
 		{
@@ -416,10 +435,15 @@ protected function getListQuery()
 				$search = $db->quote('%' . $db->escape(substr($search, 7), true) . '%');
 				$query->where('(ua.name LIKE ' . $search . ' OR ua.username LIKE ' . $search . ')');
 			}
+			elseif (stripos($search, 'content:') === 0)
+			{
+				$search = $db->quote('%' . $db->escape(substr($search, 8), true) . '%');
+				$query->where('(a.introtext LIKE ' . $search . ' OR a.fulltext LIKE ' . $search . ')');
+			}
 			else
 			{
 				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
-				$query->where('(a.title LIKE ' . $search . ' OR a.alias LIKE ' . $search . ')');
+				$query->where('(a.title LIKE ' . $search . ' OR a.alias LIKE ' . $search . ' OR a.note LIKE ' . $search . ')');
 			}
 		}
 
@@ -472,7 +496,7 @@ protected function getListQuery()
 	/**
 	 * Method to get all transitions at once for all articles
 	 *
-	 * @return  array
+	 * @return  array|boolean
 	 *
 	 * @since   4.0.0
 	 */
@@ -580,24 +604,22 @@ public function getTransitions()
 	 *
 	 * @return  mixed  An array of data items on success, false on failure.
 	 *
-	 * @since   1.6.1
+	 * @since   4.0.0
 	 */
 	public function getItems()
 	{
 		$items = parent::getItems();
 
-		if (Factory::getApplication()->isClient('site'))
+		$asset = new \Joomla\CMS\Table\Asset($this->getDbo());
+
+		foreach (array_keys($items) as $x)
 		{
-			$groups = Factory::getUser()->getAuthorisedViewLevels();
+			$items[$x]->typeAlias = 'com_content.article';
 
-			foreach (array_keys($items) as $x)
-			{
-				// Check the access level. Remove articles the user shouldn't see
-				if (!in_array($items[$x]->access, $groups))
-				{
-					unset($items[$x]);
-				}
-			}
+			$asset->loadByName('com_content.article.' . $items[$x]->id);
+
+			// Re-inject the asset id.
+			$items[$x]->asset_id = $asset->id;
 		}
 
 		return $items;
diff --git a/administrator/components/com_content/Model/FeatureModel.php b/administrator/components/com_content/Model/FeatureModel.php
index d22a48c2d4244..01df67d845124 100644
--- a/administrator/components/com_content/Model/FeatureModel.php
+++ b/administrator/components/com_content/Model/FeatureModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/Model/FeaturedModel.php b/administrator/components/com_content/Model/FeaturedModel.php
index c99d4375292fd..ffa5e8dbac0ad 100644
--- a/administrator/components/com_content/Model/FeaturedModel.php
+++ b/administrator/components/com_content/Model/FeaturedModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -85,7 +85,7 @@ protected function getListQuery()
 			$this->getState(
 				'list.select',
 				'a.id, a.title, a.alias, a.checked_out, a.checked_out_time, a.catid, a.state, a.access, a.created, a.hits,' .
-					'a.created_by, a.featured, a.language, a.created_by_alias, a.publish_up, a.publish_down'
+					'a.created_by, a.featured, a.language, a.created_by_alias, a.publish_up, a.publish_down, a.note'
 			)
 		);
 		$query->from('#__content AS a');
@@ -107,9 +107,14 @@ protected function getListQuery()
 			->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
 
 		// Join over the categories.
-		$query->select('c.title AS category_title')
+		$query->select('c.title AS category_title, c.created_user_id AS category_uid, c.level AS category_level')
 			->join('LEFT', '#__categories AS c ON c.id = a.catid');
 
+		// Join over the parent categories.
+		$query->select('parent.title AS parent_category_title, parent.id AS parent_category_id, 
+								parent.created_user_id AS parent_category_uid, parent.level AS parent_category_level')
+			->join('LEFT', '#__categories AS parent ON parent.id = c.parent_id');
+
 		// Join over the users for the author.
 		$query->select('ua.name AS author_name')
 			->join('LEFT', '#__users AS ua ON ua.id = a.created_by');
@@ -145,15 +150,24 @@ protected function getListQuery()
 		}
 
 		// Filter by access level.
-		if ($access = $this->getState('filter.access'))
+		$access = $this->getState('filter.access');
+
+		if (is_numeric($access))
 		{
 			$query->where('a.access = ' . (int) $access);
 		}
+		elseif (is_array($access))
+		{
+			$access = ArrayHelper::toInteger($access);
+			$access = implode(',', $access);
+			$query->where('a.access IN (' . $access . ')');
+		}
 
 		// Filter by access level on categories.
 		if (!$user->authorise('core.admin'))
 		{
 			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where('a.access IN (' . $groups . ')');
 			$query->where('c.access IN (' . $groups . ')');
 		}
 
@@ -242,10 +256,15 @@ protected function getListQuery()
 				$search = $db->quote('%' . $db->escape(substr($search, 7), true) . '%');
 				$query->where('(ua.name LIKE ' . $search . ' OR ua.username LIKE ' . $search . ')');
 			}
+			elseif (stripos($search, 'content:') === 0)
+			{
+				$search = $db->quote('%' . $db->escape(substr($search, 8), true) . '%');
+				$query->where('(a.introtext LIKE ' . $search . ' OR a.fulltext LIKE ' . $search . ')');
+			}
 			else
 			{
 				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
-				$query->where('a.title LIKE ' . $search . ' OR a.alias LIKE ' . $search);
+				$query->where('(a.title LIKE ' . $search . ' OR a.alias LIKE ' . $search . ' OR a.note LIKE ' . $search . ')');
 			}
 		}
 
@@ -255,18 +274,38 @@ protected function getListQuery()
 			$query->where('a.language = ' . $db->quote($language));
 		}
 
-		// Filter by a single tag.
+		// Filter by a single or group of tags.
 		$tagId = $this->getState('filter.tag');
 
-		if (is_numeric($tagId))
+		if (is_array($tagId) && count($tagId) === 1)
 		{
-			$query->where($db->quoteName('tagmap.tag_id') . ' = ' . (int) $tagId)
-				->join(
-					'LEFT',
-					$db->quoteName('#__contentitem_tag_map', 'tagmap')
-					. ' ON ' . $db->quoteName('tagmap.content_item_id') . ' = ' . $db->quoteName('a.id')
-					. ' AND ' . $db->quoteName('tagmap.type_alias') . ' = ' . $db->quote('com_content.article')
-				);
+			$tagId = current($tagId);
+		}
+
+		if (is_array($tagId))
+		{
+			$tagId = implode(',', ArrayHelper::toInteger($tagId));
+
+			if ($tagId)
+			{
+				$subQuery = $db->getQuery(true)
+					->select('DISTINCT content_item_id')
+					->from($db->quoteName('#__contentitem_tag_map'))
+					->where('tag_id IN (' . $tagId . ')')
+					->where('type_alias = ' . $db->quote('com_content.article'));
+
+				$query->join('INNER', '(' . (string) $subQuery . ') AS tagmap ON tagmap.content_item_id = a.id');
+			}
+		}
+		elseif ($tagId)
+		{
+			$query->join(
+				'INNER',
+				$db->quoteName('#__contentitem_tag_map', 'tagmap')
+				. ' ON tagmap.tag_id = ' . (int) $tagId
+				. ' AND tagmap.content_item_id = a.id'
+				. ' AND tagmap.type_alias = ' . $db->quote('com_content.article')
+			);
 		}
 
 		// Add the list ordering clause.
diff --git a/administrator/components/com_content/Service/HTML/AdministratorService.php b/administrator/components/com_content/Service/HTML/AdministratorService.php
index 89b6785cd1f0c..80a3178476155 100644
--- a/administrator/components/com_content/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_content/Service/HTML/AdministratorService.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/Service/HTML/Icon.php b/administrator/components/com_content/Service/HTML/Icon.php
index b1649ab078930..08864df1317e9 100644
--- a/administrator/components/com_content/Service/HTML/Icon.php
+++ b/administrator/components/com_content/Service/HTML/Icon.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -244,6 +244,6 @@ public function print_screen($params, $legacy = false)
 	{
 		$text = LayoutHelper::render('joomla.content.icons.print_screen', array('params' => $params, 'legacy' => $legacy));
 
-		return '<a href="#" onclick="window.print();return false;">' . $text . '</a>';
+		return '<button type="button" onclick="window.print();return false;">' . $text . '</button>';
 	}
 }
diff --git a/administrator/components/com_content/Table/ArticleTable.php b/administrator/components/com_content/Table/ArticleTable.php
index 6ef32cd2a0a52..dc8dd67af37a8 100644
--- a/administrator/components/com_content/Table/ArticleTable.php
+++ b/administrator/components/com_content/Table/ArticleTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/Table/FeaturedTable.php b/administrator/components/com_content/Table/FeaturedTable.php
index 3478800c89dcd..f827d48399ad4 100644
--- a/administrator/components/com_content/Table/FeaturedTable.php
+++ b/administrator/components/com_content/Table/FeaturedTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/View/Article/HtmlView.php b/administrator/components/com_content/View/Article/HtmlView.php
index b68f33ef0873c..20f871e64ed41 100644
--- a/administrator/components/com_content/View/Article/HtmlView.php
+++ b/administrator/components/com_content/View/Article/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,13 +15,16 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
-use Joomla\Component\Content\Administrator\Helper\PreviewHelper;
+
+\JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
 
 /**
  * View to edit an article.
@@ -138,15 +141,16 @@ protected function addToolbar()
 			'pencil-2 article-add'
 		);
 
-		$saveGroup = $toolbar->dropdownButton('save-group');
-
 		// For new records, check the create permission.
 		if ($isNew && (count($user->getAuthorisedCategories('com_content', 'core.create')) > 0))
 		{
+			$apply = $toolbar->apply('article.apply');
+			
+			$saveGroup = $toolbar->dropdownButton('save-group');
+
 			$saveGroup->configure(
 				function (Toolbar $childBar)
 				{
-					$childBar->apply('article.apply');
 					$childBar->save('article.save');
 					$childBar->save2new('article.save2new');
 				}
@@ -157,13 +161,18 @@ function (Toolbar $childBar)
 			// Since it's an existing record, check the edit permission, or fall back to edit own if the owner.
 			$itemEditable = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $userId);
 
+			if (!$checkedOut && $itemEditable)
+			{
+				$toolbar->apply('article.apply');
+			}
+			$saveGroup = $toolbar->dropdownButton('save-group');
+
 			$saveGroup->configure(
 				function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo)
 				{
 					// Can't save the record if it's checked out and editable
 					if (!$checkedOut && $itemEditable)
 					{
-						$childBar->apply('article.apply');
 						$childBar->save('article.save');
 
 						// We can save this record, but check the create permission to see if we can return to make a new one.
@@ -188,8 +197,13 @@ function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo)
 
 			if (!$isNew)
 			{
-				$url = PreviewHelper::url($this->item);
-				$toolbar->preview($url, Text::_('JGLOBAL_PREVIEW'))
+				$url = Route::link(
+					'site',
+					\ContentHelperRoute::getArticleRoute($this->item->id, $this->item->catid, $this->item->language),
+					true
+				);
+
+				$toolbar->preview($url, 'JGLOBAL_PREVIEW')
 					->bodyHeight(80)
 					->modalWidth(90);
 
@@ -250,6 +264,11 @@ function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo)
 			}
 		}
 
+		if (Associations::isEnabled() && ComponentHelper::isEnabled('com_associations'))
+		{
+			$toolbar->customButton('contract', 'JTOOLBAR_ASSOCIATIONS', 'article.editAssociations');
+		}
+
 		$toolbar->cancel('article.cancel', 'JTOOLBAR_CLOSE');
 
 		$toolbar->divider();
diff --git a/administrator/components/com_content/View/Articles/HtmlView.php b/administrator/components/com_content/View/Articles/HtmlView.php
index 519b585259404..b007b45af48a9 100644
--- a/administrator/components/com_content/View/Articles/HtmlView.php
+++ b/administrator/components/com_content/View/Articles/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -237,14 +237,20 @@ protected function addToolbar()
 					->text('JUNFEATURE')
 					->task('articles.unfeatured')
 					->listCheck(true);
-
-				$childBar->checkin('articles.checkin')->listCheck(true);
 			}
 
 			if ($canDo->get('core.execute.transition'))
 			{
 				$childBar->archive('articles.archive')->listCheck(true);
+			}
+
+			if ($canDo->get('core.edit.state'))
+			{
+				$childBar->checkin('articles.checkin')->listCheck(true);
+			}
 
+			if ($canDo->get('core.execute.transition'))
+			{
 				$childBar->trash('articles.trash')->listCheck(true);
 			}
 		}
diff --git a/administrator/components/com_content/View/Featured/HtmlView.php b/administrator/components/com_content/View/Featured/HtmlView.php
index 600c87b5f411a..582a72d37acee 100644
--- a/administrator/components/com_content/View/Featured/HtmlView.php
+++ b/administrator/components/com_content/View/Featured/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -197,14 +197,9 @@ protected function addToolbar()
 
 			if ($canDo->get('core.execute.transition'))
 			{
-				$childBar->standardButton('publish')
-					->text('JTOOLBAR_PUBLISH')
-					->task('articles.publish')
-					->listCheck(true);
-				$childBar->standardButton('unpublish')
-					->text('JTOOLBAR_UNPUBLISH')
-					->task('articles.unpublish')
-					->listCheck(true);
+				$childBar->publish('articles.publish')->listCheck(true);
+
+				$childBar->unpublish('articles.unpublish')->listCheck(true);
 			}
 
 			if ($canDo->get('core.edit.state'))
@@ -221,20 +216,18 @@ protected function addToolbar()
 
 			if ($canDo->get('core.execute.transition'))
 			{
-				$childBar->standardButton('archive')
-					->text('JTOOLBAR_ARCHIVE')
-					->task('articles.archive')
-					->listCheck(true);
-				$childBar->standardButton('trash')
-					->text('JTOOLBAR_TRASH')
-					->task('articles.trash')
-					->listCheck(true);
+				$childBar->archive('articles.archive')->listCheck(true);
 			}
 
 			if ($canDo->get('core.edit.state'))
 			{
 				$childBar->checkin('articles.checkin')->listCheck(true);
 			}
+
+			if ($canDo->get('core.execute.transition'))
+			{
+				$childBar->trash('articles.trash')->listCheck(true);
+			}
 		}
 
 		if ($this->state->get('filter.condition') == ContentComponent::CONDITION_TRASHED && $canDo->get('core.delete'))
diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml
index f9641e02943e7..a9265ae622d63 100644
--- a/administrator/components/com_content/config.xml
+++ b/administrator/components/com_content/config.xml
@@ -327,6 +327,18 @@
 			<option value="1">JSHOW</option>
 		</field>
 
+		<field
+			name="record_hits"
+			type="radio"
+			label="JGLOBAL_RECORD_HITS_LABEL"
+			description="JGLOBAL_RECORD_HITS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
 		<field
 			name="show_noauth"
 			type="radio"
@@ -790,6 +802,7 @@
 			<option value="author">JAUTHOR</option>
 			<option value="hits">JGLOBAL_HITS</option>
 			<option value="tag">JTAG</option>
+			<option value="month">JMONTH_PUBLISHED</option>
 		</field>
 
 		<field
diff --git a/administrator/components/com_content/content.xml b/administrator/components/com_content/content.xml
index bd88a612d9f58..ea26ce352727f 100644
--- a/administrator/components/com_content/content.xml
+++ b/administrator/components/com_content/content.xml
@@ -3,7 +3,7 @@
 	<name>com_content</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_content/forms/article.xml b/administrator/components/com_content/forms/article.xml
index 15824972b0986..0684232883feb 100644
--- a/administrator/components/com_content/forms/article.xml
+++ b/administrator/components/com_content/forms/article.xml
@@ -31,6 +31,15 @@
 			size="40"
 		/>
 
+		<field
+			name="note"
+			type="text"
+			label="COM_CONTENT_FIELD_NOTE_LABEL"
+			class="span12"
+			size="40"
+			maxlength="255"
+		/>
+
 		<field
 			name="version_note"
 			type="text"
@@ -59,7 +68,7 @@
 		<field
 			name="transition"
 			type="transition"
-			component="com_content"
+			extension="com_content"
 			label="COM_CONTENT_TRANSITION"
 		>
 		</field>
diff --git a/administrator/components/com_content/forms/filter_articles.xml b/administrator/components/com_content/forms/filter_articles.xml
index 63061f4246747..921c9ffa8e786 100644
--- a/administrator/components/com_content/forms/filter_articles.xml
+++ b/administrator/components/com_content/forms/filter_articles.xml
@@ -9,6 +9,17 @@
 			hint="JSEARCH_FILTER"
 		/>
 
+		<field
+			name="featured"
+			type="list"
+			onchange="this.form.submit();"
+			default=""
+			>
+			<option value="">COM_CONTENT_SELECT_FEATURED</option>
+			<option value="0">COM_CONTENT_FILTER_FEATURED_NO</option>
+			<option value="1">COM_CONTENT_FILTER_FEATURED_YES</option>
+		</field>
+
 		<field
 			name="stage"
 			type="workflowstage"
diff --git a/administrator/components/com_content/helpers/content.php b/administrator/components/com_content/helpers/content.php
index a4d4e43cdddb0..4405a5a2b7ef2 100644
--- a/administrator/components/com_content/helpers/content.php
+++ b/administrator/components/com_content/helpers/content.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/services/provider.php b/administrator/components/com_content/services/provider.php
index 506424c0dabe9..d7d17c3239859 100644
--- a/administrator/components/com_content/services/provider.php
+++ b/administrator/components/com_content/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/tmpl/article/edit.php b/administrator/components/com_content/tmpl/article/edit.php
index c3941a608862f..959e793e3f4e3 100644
--- a/administrator/components/com_content/tmpl/article/edit.php
+++ b/administrator/components/com_content/tmpl/article/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -51,6 +51,7 @@
 		<div class="row">
 			<div class="col-md-9">
 				<fieldset class="adminform">
+					<?php echo $this->form->getLabel('articletext'); ?>
 					<?php echo $this->form->getInput('articletext'); ?>
 				</fieldset>
 			</div>
diff --git a/administrator/components/com_content/tmpl/article/edit.xml b/administrator/components/com_content/tmpl/article/edit.xml
old mode 100755
new mode 100644
diff --git a/administrator/components/com_content/tmpl/article/edit_associations.php b/administrator/components/com_content/tmpl/article/edit_associations.php
index 965f41d498972..32c2b5af41e32 100644
--- a/administrator/components/com_content/tmpl/article/edit_associations.php
+++ b/administrator/components/com_content/tmpl/article/edit_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/tmpl/article/edit_metadata.php b/administrator/components/com_content/tmpl/article/edit_metadata.php
index 2c097c53a6b86..7d7cd29fd671e 100644
--- a/administrator/components/com_content/tmpl/article/edit_metadata.php
+++ b/administrator/components/com_content/tmpl/article/edit_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/tmpl/article/modal.php b/administrator/components/com_content/tmpl/article/modal.php
index a49852294838b..0043cda95730d 100644
--- a/administrator/components/com_content/tmpl/article/modal.php
+++ b/administrator/components/com_content/tmpl/article/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/tmpl/article/modal_associations.php b/administrator/components/com_content/tmpl/article/modal_associations.php
index 965f41d498972..32c2b5af41e32 100644
--- a/administrator/components/com_content/tmpl/article/modal_associations.php
+++ b/administrator/components/com_content/tmpl/article/modal_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/tmpl/article/modal_metadata.php b/administrator/components/com_content/tmpl/article/modal_metadata.php
index 2c097c53a6b86..7d7cd29fd671e 100644
--- a/administrator/components/com_content/tmpl/article/modal_metadata.php
+++ b/administrator/components/com_content/tmpl/article/modal_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/tmpl/article/pagebreak.php b/administrator/components/com_content/tmpl/article/pagebreak.php
index 73c3f2b73ce26..890531b0f6ade 100644
--- a/administrator/components/com_content/tmpl/article/pagebreak.php
+++ b/administrator/components/com_content/tmpl/article/pagebreak.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php
index c3877ebf2c9fd..43732dadedc1c 100644
--- a/administrator/components/com_content/tmpl/articles/default.php
+++ b/administrator/components/com_content/tmpl/articles/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -173,6 +173,10 @@
 							$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
 							$canEditOwn = $user->authorise('core.edit.own', 'com_content.article.' . $item->id) && $item->created_by == $userId;
 							$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $item->id) && $canCheckin;
+							$canEditCat       = $user->authorise('core.edit',       'com_content.category.' . $item->catid);
+							$canEditOwnCat    = $user->authorise('core.edit.own',   'com_content.category.' . $item->catid) && $item->category_uid == $userId;
+							$canEditParCat    = $user->authorise('core.edit',       'com_content.category.' . $item->parent_category_id);
+							$canEditOwnParCat = $user->authorise('core.edit.own',   'com_content.category.' . $item->parent_category_id) && $item->parent_category_uid == $userId;
 
 							$transitions = ContentHelper::filterTransitions($this->transitions, $item->stage_id, $item->workflow_id);
 
@@ -271,10 +275,64 @@
 											<span title="<?php echo Text::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"><?php echo $this->escape($item->title); ?></span>
 										<?php endif; ?>
 											<span class="small break-word">
-												<?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+												<?php if (empty($item->note)) : ?>
+													<?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+												<?php else : ?>
+													<?php echo Text::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note)); ?>
+												<?php endif; ?>
 											</span>
 											<div class="small">
-												<?php echo Text::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
+												<?php
+												$ParentCatUrl = Route::_('index.php?option=com_categories&task=category.edit&id=' . $item->parent_category_id . '&extension=com_content');
+												$CurrentCatUrl = Route::_('index.php?option=com_categories&task=category.edit&id=' . $item->catid . '&extension=com_content');
+												$EditCatTxt = Text::_('JACTION_EDIT') . ' ' . Text::_('JCATEGORY');
+												echo Text::_('JCATEGORY') . ': ';
+												if ($item->category_level != '1') :
+													if ($item->parent_category_level != '1') :
+														echo ' &#187; ';
+													endif;
+												endif;
+												if (Factory::getLanguage()->isRtl())
+												{
+													if ($canEditCat || $canEditOwnCat) :
+														echo '<a class="hasTooltip" href="' . $CurrentCatUrl . '" title="' . $EditCatTxt . '">';
+													endif;
+													echo $this->escape($item->category_title);
+													if ($canEditCat || $canEditOwnCat) :
+														echo '</a>';
+													endif;
+													if ($item->category_level != '1') :
+														echo ' &#171; ';
+														if ($canEditParCat || $canEditOwnParCat) :
+															echo '<a class="hasTooltip" href="' . $ParentCatUrl . '" title="' . $EditCatTxt . '">';
+														endif;
+														echo $this->escape($item->parent_category_title);
+														if ($canEditParCat || $canEditOwnParCat) :
+															echo '</a>';
+														endif;
+													endif;
+												}
+												else
+												{
+													if ($item->category_level != '1') :
+														if ($canEditParCat || $canEditOwnParCat) :
+															echo '<a class="hasTooltip" href="' . $ParentCatUrl . '" title="' . $EditCatTxt . '">';
+														endif;
+														echo $this->escape($item->parent_category_title);
+														if ($canEditParCat || $canEditOwnParCat) :
+															echo '</a>';
+														endif;
+														echo ' &#187; ';
+													endif;
+													if ($canEditCat || $canEditOwnCat) :
+														echo '<a class="hasTooltip" href="' . $CurrentCatUrl . '" title="' . $EditCatTxt . '">';
+													endif;
+													echo $this->escape($item->category_title);
+													if ($canEditCat || $canEditOwnCat) :
+														echo '</a>';
+													endif;
+												}
+												?>
 											</div>
 									</div>
 								</th>
diff --git a/administrator/components/com_content/tmpl/articles/default.xml b/administrator/components/com_content/tmpl/articles/default.xml
index b3dec7f7be330..aaacb96288aef 100644
--- a/administrator/components/com_content/tmpl/articles/default.xml
+++ b/administrator/components/com_content/tmpl/articles/default.xml
@@ -5,4 +5,79 @@
 			<![CDATA[COM_CONTENT_ARTICLES_VIEW_DEFAULT_DESC]]>
 		</message>
 	</layout>
+		<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request"
+			addfieldpath="/administrator/components/com_categories/models/fields"
+		>
+			<field
+				name="filter_category_id"
+				type="modal_category"
+				label="COM_MENUS_ADMIN_CATEGORY_LABEL"
+				description="COM_MENUS_ADMIN_CATEGORY_DESC"
+				extension="com_content"
+				select="true"
+				new="true"
+				edit="true"
+				clear="true"
+				filter="integer"
+			/>
+
+			<field
+				name="filter_level"
+				type="integer"
+				label="COM_MENUS_ADMIN_LEVEL_LABEL"
+				description="COM_MENUS_ADMIN_LEVEL_DESC"
+				first="1"
+				last="10"
+				step="1"
+				languages="*"
+				filter="integer"
+				>
+				<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+			</field>
+
+			<field
+				name="filter_author_id"
+				type="author"
+				label="COM_MENUS_ADMIN_AUTHOR_LABEL"
+				description="COM_MENUS_ADMIN_AUTHOR_DESC"
+				multiple="true"
+				class="multipleAuthors"
+				filter="int_array"
+				>
+				<option value="0">JNONE</option>
+			</field>
+
+			<field
+				name="filter_tag"
+				type="tag"
+				label="COM_MENUS_ADMIN_TAGS_LABEL"
+				description="COM_MENUS_ADMIN_TAGS_DESC"
+				multiple="true"
+				filter="int_array"
+			/>
+
+			<field
+				name="filter_access"
+				type="accesslevel"
+				label="COM_MENUS_ADMIN_ACCESS_LABEL"
+				description="COM_MENUS_ADMIN_ACCESS_DESC"
+				multiple="true"
+				filter="int_array"
+			/>
+
+			<field
+				name="filter_language"
+				type="contentlanguage"
+				label="COM_MENUS_ADMIN_LANGUAGE_LABEL"
+				description="COM_MENUS_ADMIN_LANGUAGE_DESC"
+				>
+				<option value="">JOPTION_SELECT_LANGUAGE</option>
+				<option value="*">JALL</option>
+			</field>
+
+		</fieldset>
+	</fields>
+
 </metadata>
diff --git a/administrator/components/com_content/tmpl/articles/default_batch_body.php b/administrator/components/com_content/tmpl/articles/default_batch_body.php
index 034c04356e917..bc8851c48e505 100644
--- a/administrator/components/com_content/tmpl/articles/default_batch_body.php
+++ b/administrator/components/com_content/tmpl/articles/default_batch_body.php
@@ -3,16 +3,17 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\Layout\LayoutHelper;
 
 $published = $this->state->get('filter.published');
 
-$user = \Joomla\CMS\Factory::getUser();
+$user = Factory::getUser();
 ?>
 
 <div class="container">
diff --git a/administrator/components/com_content/tmpl/articles/default_batch_footer.php b/administrator/components/com_content/tmpl/articles/default_batch_footer.php
index f4de2c5b2c9ee..041a84863a67a 100644
--- a/administrator/components/com_content/tmpl/articles/default_batch_footer.php
+++ b/administrator/components/com_content/tmpl/articles/default_batch_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -13,9 +13,9 @@
 
 HTMLHelper::_('script', 'com_content/admin-articles-default-batch-footer.js', ['version' => 'auto', 'relative' => true]);
 ?>
-<button class="btn btn-secondary" type="button" data-dismiss="modal">
+<button type="button" class="btn btn-secondary" data-dismiss="modal">
 	<?php echo Text::_('JCANCEL'); ?>
 </button>
-<button id='batch-submit-button-id' class="btn btn-success" type="submit" data-submit-task='article.batch'>
+<button type="submit" id='batch-submit-button-id' class="btn btn-success" data-submit-task='article.batch'>
 	<?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?>
 </button>
diff --git a/administrator/components/com_content/tmpl/articles/default_stage_body.php b/administrator/components/com_content/tmpl/articles/default_stage_body.php
index ff27039a8a619..5c45de087c832 100644
--- a/administrator/components/com_content/tmpl/articles/default_stage_body.php
+++ b/administrator/components/com_content/tmpl/articles/default_stage_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_content/tmpl/articles/default_stage_footer.php b/administrator/components/com_content/tmpl/articles/default_stage_footer.php
index 593e4247ca339..c37b721907c68 100644
--- a/administrator/components/com_content/tmpl/articles/default_stage_footer.php
+++ b/administrator/components/com_content/tmpl/articles/default_stage_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_content/tmpl/articles/modal.php b/administrator/components/com_content/tmpl/articles/modal.php
index 7e47fa7970b09..ac6c62f55f4ff 100644
--- a/administrator/components/com_content/tmpl/articles/modal.php
+++ b/administrator/components/com_content/tmpl/articles/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -125,6 +125,13 @@
 							<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
 								<?php echo $this->escape($item->title); ?>
 							</a>
+							<span class="small break-word">
+								<?php if (empty($item->note)) : ?>
+									<?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+								<?php else : ?>
+									<?php echo Text::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note)); ?>
+								<?php endif; ?>
+ 							</span>
 							<div class="small">
 								<?php echo Text::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
 							</div>
diff --git a/administrator/components/com_content/tmpl/featured/default.php b/administrator/components/com_content/tmpl/featured/default.php
index 00751574ac8a8..ac980dea478ea 100644
--- a/administrator/components/com_content/tmpl/featured/default.php
+++ b/administrator/components/com_content/tmpl/featured/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -55,7 +55,7 @@
 	  var elements = [].slice.call(document.querySelectorAll('.article-status'));
 
 	  elements.forEach(function (element) {
-	    element.addEventListener('click', function(event) {
+		element.addEventListener('click', function(event) {
 			event.stopPropagation();
 		});
 	  });
@@ -104,6 +104,9 @@
 								<td style="width:1%" class="text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
+								<th scope="col" style="width:1%" class="text-center">
+									<?php echo JText::_('JFEATURED'); ?>
+								</th>
 								<th scope="col" style="width:1%; min-width:85px" class="text-center">
 									<?php echo JText::_('JSTATUS'); ?>
 								</th>
@@ -144,12 +147,16 @@
 						<?php $count = count($this->items); ?>
 						<?php foreach ($this->items as $i => $item) :
 							$item->max_ordering = 0;
-							$ordering   = ($listOrder == 'fp.ordering');
-							$assetId    = 'com_content.article.' . $item->id;
-							$canCreate  = $user->authorise('core.create', 'com_content.category.' . $item->catid);
-							$canEdit    = $user->authorise('core.edit', 'com_content.article.' . $item->id);
-							$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
-							$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $item->id) && $canCheckin;
+							$ordering         = ($listOrder == 'fp.ordering');
+							$assetId          = 'com_content.article.' . $item->id;
+							$canCreate        = $user->authorise('core.create', 'com_content.category.' . $item->catid);
+							$canEdit          = $user->authorise('core.edit', 'com_content.article.' . $item->id);
+							$canCheckin       = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
+							$canChange        = $user->authorise('core.edit.state', 'com_content.article.' . $item->id) && $canCheckin;
+							$canEditCat       = $user->authorise('core.edit',       'com_content.category.' . $item->catid);
+							$canEditOwnCat    = $user->authorise('core.edit.own',   'com_content.category.' . $item->catid) && $item->category_uid == $userId;
+							$canEditParCat    = $user->authorise('core.edit',       'com_content.category.' . $item->parent_category_id);
+							$canEditOwnParCat = $user->authorise('core.edit.own',   'com_content.category.' . $item->parent_category_id) && $item->parent_category_uid == $userId;
 
 							$transitions = ContentHelper::filterTransitions($this->transitions, $item->stage_id, $item->workflow_id);
 
@@ -207,10 +214,12 @@
 								<td class="text-center">
 									<?php echo HTMLHelper::_('grid.id', $i, $item->id); ?>
 								</td>
+								<td class="text-center">
+									<?php echo $featuredButton->render($item->featured, $i, ['disabled' => !$canChange]); ?>
+								</td>
 								<td class="article-status">
 									<div class="d-flex">
 										<div class="btn-group tbody-icon mr-1">
-										<?php echo $featuredButton->render($item->featured, $i, ['disabled' => !$canChange]); ?>
 										<?php
 
 											$options = [
@@ -247,10 +256,64 @@
 											<span title="<?php echo Text::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"><?php echo $this->escape($item->title); ?></span>
 										<?php endif; ?>
 										<span class="small break-word">
-											<?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+											<?php if (empty($item->note)) : ?>
+												<?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+											<?php else : ?>
+												<?php echo Text::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note)); ?>
+											<?php endif; ?>
 										</span>
 										<div class="small">
-											<?php echo Text::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
+											<?php
+											$ParentCatUrl = Route::_('index.php?option=com_categories&task=category.edit&id=' . $item->parent_category_id . '&extension=com_content');
+											$CurrentCatUrl = Route::_('index.php?option=com_categories&task=category.edit&id=' . $item->catid . '&extension=com_content');
+											$EditCatTxt = Text::_('JACTION_EDIT') . ' ' . Text::_('JCATEGORY');
+											echo Text::_('JCATEGORY') . ': ';
+											if ($item->category_level != '1') :
+												if ($item->parent_category_level != '1') :
+													echo ' &#187; ';
+												endif;
+											endif;
+											if (Factory::getLanguage()->isRtl())
+											{
+												if ($canEditCat || $canEditOwnCat) :
+													echo '<a class="hasTooltip" href="' . $CurrentCatUrl . '" title="' . $EditCatTxt . '">';
+												endif;
+												echo $this->escape($item->category_title);
+												if ($canEditCat || $canEditOwnCat) :
+													echo '</a>';
+												endif;
+												if ($item->category_level != '1') :
+													echo ' &#171; ';
+													if ($canEditParCat || $canEditOwnParCat) :
+														echo '<a class="hasTooltip" href="' . $ParentCatUrl . '" title="' . $EditCatTxt . '">';
+													endif;
+													echo $this->escape($item->parent_category_title);
+													if ($canEditParCat || $canEditOwnParCat) :
+														echo '</a>';
+													endif;
+												endif;
+											}
+											else
+											{
+												if ($item->category_level != '1') :
+													if ($canEditParCat || $canEditOwnParCat) :
+														echo '<a class="hasTooltip" href="' . $ParentCatUrl . '" title="' . $EditCatTxt . '">';
+													endif;
+													echo $this->escape($item->parent_category_title);
+													if ($canEditParCat || $canEditOwnParCat) :
+														echo '</a>';
+													endif;
+													echo ' &#187; ';
+												endif;
+												if ($canEditCat || $canEditOwnCat) :
+													echo '<a class="hasTooltip" href="' . $CurrentCatUrl . '" title="' . $EditCatTxt . '">';
+												endif;
+												echo $this->escape($item->category_title);
+												if ($canEditCat || $canEditOwnCat) :
+													echo '</a>';
+												endif;
+											}
+											?>
 										</div>
 									</div>
 								</th>
@@ -260,17 +323,17 @@
 								<td class="small d-none d-md-table-cell">
 									<?php if ((int) $item->created_by != 0) : ?>
 										<?php if ($item->created_by_alias) : ?>
-                                            <a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_users&task=user.edit&id=' . (int) $item->created_by); ?>" title="<?php echo Text::_('JAUTHOR'); ?>">
+											<a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_users&task=user.edit&id=' . (int) $item->created_by); ?>" title="<?php echo Text::_('JAUTHOR'); ?>">
 												<?php echo $this->escape($item->author_name); ?></a>
-                                            <div class="smallsub"><?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></div>
+											<div class="smallsub"><?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></div>
 										<?php else : ?>
-                                            <a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_users&task=user.edit&id=' . (int) $item->created_by); ?>" title="<?php echo Text::_('JAUTHOR'); ?>">
+											<a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_users&task=user.edit&id=' . (int) $item->created_by); ?>" title="<?php echo Text::_('JAUTHOR'); ?>">
 												<?php echo $this->escape($item->author_name); ?></a>
 										<?php endif; ?>
 									<?php else : ?>
 										<?php if ($item->created_by_alias) : ?>
 											<?php echo Text::_('JNONE'); ?>
-                                            <div class="smallsub"><?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></div>
+											<div class="smallsub"><?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></div>
 										<?php else : ?>
 											<?php echo Text::_('JNONE'); ?>
 										<?php endif; ?>
diff --git a/administrator/components/com_content/tmpl/featured/default_stage_body.php b/administrator/components/com_content/tmpl/featured/default_stage_body.php
index ff27039a8a619..5c45de087c832 100644
--- a/administrator/components/com_content/tmpl/featured/default_stage_body.php
+++ b/administrator/components/com_content/tmpl/featured/default_stage_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_content/tmpl/featured/default_stage_footer.php b/administrator/components/com_content/tmpl/featured/default_stage_footer.php
index 593e4247ca339..c37b721907c68 100644
--- a/administrator/components/com_content/tmpl/featured/default_stage_footer.php
+++ b/administrator/components/com_content/tmpl/featured/default_stage_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_contenthistory/Controller/DisplayController.php b/administrator/components/com_contenthistory/Controller/DisplayController.php
index 032fc48d51183..91c0cf485b44f 100644
--- a/administrator/components/com_contenthistory/Controller/DisplayController.php
+++ b/administrator/components/com_contenthistory/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/Controller/HistoryController.php b/administrator/components/com_contenthistory/Controller/HistoryController.php
index 8a8681e853e84..1f030ae291533 100644
--- a/administrator/components/com_contenthistory/Controller/HistoryController.php
+++ b/administrator/components/com_contenthistory/Controller/HistoryController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -33,7 +33,7 @@ class HistoryController extends AdminController
 	 */
 	public function delete()
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Get items to remove from the request.
 		$cid = $this->input->get('cid', array(), 'array');
@@ -95,7 +95,7 @@ public function getModel($name = 'History', $prefix = 'Administrator', $config =
 	 */
 	public function keep()
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Get items to remove from the request.
 		$cid = $this->input->get('cid', array(), 'array');
diff --git a/administrator/components/com_contenthistory/Controller/PreviewController.php b/administrator/components/com_contenthistory/Controller/PreviewController.php
index c4cf8e5da3968..6a03c01aacbab 100644
--- a/administrator/components/com_contenthistory/Controller/PreviewController.php
+++ b/administrator/components/com_contenthistory/Controller/PreviewController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/Dispatcher/Dispatcher.php b/administrator/components/com_contenthistory/Dispatcher/Dispatcher.php
index 2d35f34c153e6..2f7471a06a89b 100644
--- a/administrator/components/com_contenthistory/Dispatcher/Dispatcher.php
+++ b/administrator/components/com_contenthistory/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/Helper/ContenthistoryHelper.php b/administrator/components/com_contenthistory/Helper/ContenthistoryHelper.php
index 58d2cbb0fab17..91d6fd925fa28 100644
--- a/administrator/components/com_contenthistory/Helper/ContenthistoryHelper.php
+++ b/administrator/components/com_contenthistory/Helper/ContenthistoryHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/Model/CompareModel.php b/administrator/components/com_contenthistory/Model/CompareModel.php
index 831db1e4d8e1d..9283ad49f1164 100644
--- a/administrator/components/com_contenthistory/Model/CompareModel.php
+++ b/administrator/components/com_contenthistory/Model/CompareModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/Model/HistoryModel.php b/administrator/components/com_contenthistory/Model/HistoryModel.php
index 94f5055ce36b4..082c6e5671791 100644
--- a/administrator/components/com_contenthistory/Model/HistoryModel.php
+++ b/administrator/components/com_contenthistory/Model/HistoryModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/Model/PreviewModel.php b/administrator/components/com_contenthistory/Model/PreviewModel.php
index a2204d50825ec..9a8abdf3b8919 100644
--- a/administrator/components/com_contenthistory/Model/PreviewModel.php
+++ b/administrator/components/com_contenthistory/Model/PreviewModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/View/Compare/HtmlView.php b/administrator/components/com_contenthistory/View/Compare/HtmlView.php
index dcdf6bbc6d548..faab1d33017fb 100644
--- a/administrator/components/com_contenthistory/View/Compare/HtmlView.php
+++ b/administrator/components/com_contenthistory/View/Compare/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/View/History/HtmlView.php b/administrator/components/com_contenthistory/View/History/HtmlView.php
index 8c7e9286ddece..beede5fe4b6da 100644
--- a/administrator/components/com_contenthistory/View/History/HtmlView.php
+++ b/administrator/components/com_contenthistory/View/History/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/View/Preview/HtmlView.php b/administrator/components/com_contenthistory/View/Preview/HtmlView.php
index 4821c34beb299..f42172b021a43 100644
--- a/administrator/components/com_contenthistory/View/Preview/HtmlView.php
+++ b/administrator/components/com_contenthistory/View/Preview/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/contenthistory.xml b/administrator/components/com_contenthistory/contenthistory.xml
index 6f0eab11be717..c13e407bd53cd 100644
--- a/administrator/components/com_contenthistory/contenthistory.xml
+++ b/administrator/components/com_contenthistory/contenthistory.xml
@@ -3,7 +3,7 @@
 	<name>com_contenthistory</name>
 	<author>Joomla! Project</author>
 	<creationDate>May 2013</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_contenthistory/helpers/contenthistory.php b/administrator/components/com_contenthistory/helpers/contenthistory.php
index c738d556824ea..af8dd976d636f 100644
--- a/administrator/components/com_contenthistory/helpers/contenthistory.php
+++ b/administrator/components/com_contenthistory/helpers/contenthistory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/services/provider.php b/administrator/components/com_contenthistory/services/provider.php
index c30c7a0f2ca2b..fdf9734364b5d 100644
--- a/administrator/components/com_contenthistory/services/provider.php
+++ b/administrator/components/com_contenthistory/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/tmpl/compare/compare.php b/administrator/components/com_contenthistory/tmpl/compare/compare.php
index b7ad2207c376a..f1b06b5e4557f 100644
--- a/administrator/components/com_contenthistory/tmpl/compare/compare.php
+++ b/administrator/components/com_contenthistory/tmpl/compare/compare.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/tmpl/history/modal.php b/administrator/components/com_contenthistory/tmpl/history/modal.php
index a3128ab3860e0..1ce7a1684464c 100644
--- a/administrator/components/com_contenthistory/tmpl/history/modal.php
+++ b/administrator/components/com_contenthistory/tmpl/history/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/tmpl/preview/preview.php b/administrator/components/com_contenthistory/tmpl/preview/preview.php
index 10c2ead439f20..425f5a87375ce 100644
--- a/administrator/components/com_contenthistory/tmpl/preview/preview.php
+++ b/administrator/components/com_contenthistory/tmpl/preview/preview.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_cpanel/Controller/DisplayController.php b/administrator/components/com_cpanel/Controller/DisplayController.php
index 4eaa886c92657..2623938e768f8 100644
--- a/administrator/components/com_cpanel/Controller/DisplayController.php
+++ b/administrator/components/com_cpanel/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cpanel
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_cpanel/Controller/SystemController.php b/administrator/components/com_cpanel/Controller/SystemController.php
new file mode 100644
index 0000000000000..b33abe06ad695
--- /dev/null
+++ b/administrator/components/com_cpanel/Controller/SystemController.php
@@ -0,0 +1,213 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_cpanel
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Cpanel\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Response\JsonResponse;
+use Joomla\CMS\Updater\Updater;
+
+/**
+ * Cpanel System Controller
+ *
+ * @since  4.0.0
+ */
+class SystemController extends BaseController
+{
+	/**
+	 * Ajax target point for reading the specific information
+	 *
+	 * @throws \Exception
+	 *
+	 * @return void
+	 * 
+	 * @since  4.0.0
+	 */
+	public function loadSystemInfo()
+	{
+		$type = $this->input->get('type');
+
+		$count = 0;
+
+		switch ($type)
+		{
+			case 'postinstall':
+				$count = $this->countItems('com_postinstall', 'Messages');
+				break;
+
+			case 'installationwarnings':
+				$count = $this->countItems('com_installer', 'Warnings');
+				break;
+
+			case 'checkins':
+				$count = $this->countItems('com_checkin', 'Checkin');
+				break;
+
+			case 'databaseupdate':
+				$count = $this->countDatabaseUpdates();
+				break;
+
+			case 'systemupdate':
+				$count = $this->countSystemUpdates();
+				break;
+
+			case 'extensionupdate':
+				$count = $this->countExtensionUpdates();
+				break;
+
+			case 'extensiondiscover':
+				$count = $this->countExtensionDiscover();
+				break;
+
+			default:
+				/**
+				 * @TODO: Plugin event to allow custom sections to be added (see SystemModel)
+				 */
+				throw new \Exception(Text::_('COM_CPANEL_ERROR_DASHBOARD_TYPE_NOT_SUPPORTED'));
+		}
+
+		echo new JsonResponse($count);
+	}
+
+	/**
+	 * Returns the existing database errors of the table structur
+	 *
+	 * @return integer  Number of database table errors
+	 *
+	 * @throws \Exception
+	 * @since  4.0.0
+	 */
+	protected function countDatabaseUpdates()
+	{
+		if (!Factory::getUser()->authorise('core.manage', 'com_installer'))
+		{
+			throw new \Exception(Text::_('JGLOBAL_AUTH_ACCESS_DENIED'));
+		}
+
+		$boot      = Factory::getApplication()->bootComponent('com_installer');
+		$model     = $boot->getMVCFactory()->createModel('Database', 'Administrator', ['ignore_request' => true]);
+
+		$changeSet = $model->getItems();
+
+		$changeSetCount = 0;
+
+		foreach ($changeSet as $item)
+		{
+			$changeSetCount += $item['errorsCount'];
+		}
+
+		return $changeSetCount;
+	}
+
+	/**
+	 * Returns the version number of the latest update or empty string if system is uptodate
+	 *
+	 * @return string  The version number or empty string
+	 *
+	 * @throws \Exception
+	 * @since  4.0.0
+	 */
+	protected function countSystemUpdates()
+	{
+		if (!Factory::getUser()->authorise('core.manage', 'com_joomlaupdate'))
+		{
+			throw new \Exception(Text::_('JGLOBAL_AUTH_ACCESS_DENIED'));
+		}
+
+		$boot    = Factory::getApplication()->bootComponent('com_joomlaupdate');
+		$model   = $boot->getMVCFactory()->createModel('Update', 'Administrator', ['ignore_request' => true]);
+
+		$model->refreshUpdates(true);
+
+		$joomlaUpdate = $model->getUpdateInformation();
+
+		$hasUpdate = $joomlaUpdate['hasUpdate'] ? '&#x200E;' . $joomlaUpdate['latest'] : '';
+
+		return $hasUpdate;
+	}
+
+	/**
+	 * Returns the number of outdates extensions installed in the system
+	 *
+	 * @return integer  Number of available updates
+	 *
+	 * @throws \Exception
+	 * @since  4.0.0
+	 */
+	protected function countExtensionUpdates()
+	{
+		if (!Factory::getUser()->authorise('core.manage', 'com_installer'))
+		{
+			throw new \Exception(Text::_('JGLOBAL_AUTH_ACCESS_DENIED'));
+		}
+
+		$boot    = Factory::getApplication()->bootComponent('com_installer');
+		$model   = $boot->getMVCFactory()->createModel('Update', 'Administrator', ['ignore_request' => true]);
+
+		$model->findUpdates();
+
+		$items   = count($model->getItems());
+
+		return $items;
+	}
+
+	/**
+	 * Returns the number of available extensions for installation
+	 *
+	 * @return integer  Number of available updates
+	 *
+	 * @throws \Exception
+	 */
+	protected function countExtensionDiscover()
+	{
+		if (!Factory::getUser()->authorise('core.manage', 'com_installer'))
+		{
+			throw new \Exception(Text::_('JGLOBAL_AUTH_ACCESS_DENIED'));
+		}
+
+		$boot    = Factory::getApplication()->bootComponent('com_installer');
+		$model   = $boot->getMVCFactory()->createModel('Discover', 'Administrator', ['ignore_request' => true]);
+
+		$model->discover();
+
+		$items   = count($model->getItems());
+
+		return $items;
+	}
+
+	/**
+	 * Generic getItems counter for different calls
+	 *
+	 * @param   type  $extension  The extension to check and authorise for
+	 * @param   type  $model      The Model to load
+	 *
+	 * @return integer The number of items
+	 *
+	 * @throws \Exception
+	 * @since  4.0.0
+	 */
+	protected function countItems($extension, $modelname)
+	{
+		if (!Factory::getUser()->authorise('core.manage', $extension))
+		{
+			throw new \Exception(Text::_('JGLOBAL_AUTH_ACCESS_DENIED'));
+		}
+
+		$boot    = Factory::getApplication()->bootComponent($extension);
+		$model   = $boot->getMVCFactory()->createModel($modelname, 'Administrator', ['ignore_request' => true]);
+
+		$items   = count($model->getItems());
+
+		return $items;
+	}
+}
diff --git a/administrator/components/com_cpanel/Dispatcher/Dispatcher.php b/administrator/components/com_cpanel/Dispatcher/Dispatcher.php
index 8ef4dc5003e41..b8bc7ed7d7c13 100644
--- a/administrator/components/com_cpanel/Dispatcher/Dispatcher.php
+++ b/administrator/components/com_cpanel/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cpanel
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_cpanel/Entities/SystemHeader.php b/administrator/components/com_cpanel/Entities/SystemHeader.php
index 829bd825f05d1..3e0b80ad33a7f 100644
--- a/administrator/components/com_cpanel/Entities/SystemHeader.php
+++ b/administrator/components/com_cpanel/Entities/SystemHeader.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cpanel
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_cpanel/Entities/SystemItem.php b/administrator/components/com_cpanel/Entities/SystemItem.php
index ffbe29a8fdaaa..376e516f0e8d2 100644
--- a/administrator/components/com_cpanel/Entities/SystemItem.php
+++ b/administrator/components/com_cpanel/Entities/SystemItem.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cpanel
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -33,29 +33,29 @@ class SystemItem
 	private $link;
 
 	/**
-	 * An optional badge of the item
+	 * An optional type for the ajax request
 	 *
 	 * @var string|null
 	 */
-	private $badge;
+	private $type;
 
 	/**
 	 * Class constructor.
 	 *
 	 * @param   string  $title  The title of the item
 	 * @param   string  $link   The link for the item
-	 * @param   string  $badge  The optional badge for the item
+	 * @param   string  $type   The type, requested by the ajax request
 	 *
 	 * @since  4.0.0
 	 */
-	public function __construct($title, $link, $badge = '')
+	public function __construct($title, $link, $type = '')
 	{
 		$this->title = $title;
 		$this->link  = $link;
 
-		if (!empty($badge))
+		if (!empty($type))
 		{
-			$this->badge = $badge;
+			$this->type = $type;
 		}
 	}
 
@@ -84,14 +84,14 @@ public function getLink()
 	}
 
 	/**
-	 * The string to display in the notification badge if there is one. Else null.
+	 * The type to load in the notification badge if there is one. Else null.
 	 *
 	 * @return string|null
 	 *
 	 * @since  4.0.0
 	 */
-	public function getBadge()
+	public function getType()
 	{
-		return $this->badge;
+		return $this->type;
 	}
 }
diff --git a/administrator/components/com_cpanel/Model/SystemModel.php b/administrator/components/com_cpanel/Model/SystemModel.php
index 6edfce0ac1006..372837dbb6a80 100644
--- a/administrator/components/com_cpanel/Model/SystemModel.php
+++ b/administrator/components/com_cpanel/Model/SystemModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cpanel
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -64,37 +64,22 @@ public function getItems()
 
 		if ($user->authorise('core.manage', 'com_checkin'))
 		{
-			/** @var \Joomla\Component\Checkin\Administrator\Model\CheckinModel $checkinModel */
-			$checkinModel = $this->bootComponent('com_checkin')->getMVCFactory()->createModel('Checkin', 'Administrator', ['ignore_request' => true]);
-			$checkins     = count($checkinModel->getItems());
-
 			$maintainSection->addItem(
-				new SystemItem('MOD_MENU_GLOBAL_CHECKIN', 'index.php?option=com_checkin', $checkins)
+				new SystemItem('MOD_MENU_GLOBAL_CHECKIN', 'index.php?option=com_checkin', 'checkins')
 			);
 		}
 
 		if ($user->authorise('core.manage', 'com_installer'))
 		{
-			/** @var \Joomla\Component\Installer\Administrator\Extension\InstallerComponent $installerComponent */
-			$installerComponent = $this->bootComponent('com_installer');
-
-			/** @var \Joomla\Component\Installer\Administrator\Model\WarningsModel $warningsModel */
-			$warningsModel = $installerComponent->getMVCFactory()->createModel('Warnings', 'Administrator', ['ignore_request' => true]);
-			$warningMessages = count($warningsModel->getItems());
-
 			$infoSection->addItem(
-				new SystemItem('MOD_MENU_INFORMATION_WARNINGS', 'index.php?option=com_installer&view=warnings', $warningMessages)
+				new SystemItem('MOD_MENU_INFORMATION_WARNINGS', 'index.php?option=com_installer&view=warnings', 'installationwarnings')
 			);
 		}
 
 		if ($user->authorise('core.manage', 'com_postinstall'))
 		{
-			/** @var \Joomla\Component\Postinstall\Administrator\Model\MessagesModel $messagesModel */
-			$messagesModel = $this->bootComponent('com_postinstall')->getMVCFactory()->createModel('Messages', 'Administrator', ['ignore_request' => true]);
-			$messages      = count($messagesModel->getItems());
-
 			$infoSection->addItem(
-				new SystemItem('MOD_MENU_INFORMATION_POST_INSTALL_MESSAGES', 'index.php?option=com_postinstall', $messages)
+				new SystemItem('MOD_MENU_INFORMATION_POST_INSTALL_MESSAGES', 'index.php?option=com_postinstall', 'postinstall')
 			);
 		}
 
@@ -107,38 +92,19 @@ public function getItems()
 
 		if ($user->authorise('core.manage', 'com_installer'))
 		{
-			/** @var \Joomla\Component\Installer\Administrator\Model\DatabaseModel $warningsModel */
-			$databaseModel  = $installerComponent->getMVCFactory()->createModel('Database', 'Administrator', ['ignore_request' => true]);
-			$changeSet      = $databaseModel->getItems();
-			$changeSetCount = 0;
-
-			foreach ($changeSet as $item)
-			{
-				$changeSetCount += $item['errorsCount'];
-			}
-
 			$infoSection->addItem(
-				new SystemItem(
-					'MOD_MENU_SYSTEM_INFORMATION_DATABASE',
-					'index.php?option=com_installer&view=database',
-					$changeSetCount === 0 ? '' : $changeSetCount
-				)
+				new SystemItem('MOD_MENU_SYSTEM_INFORMATION_DATABASE', 'index.php?option=com_installer&view=database', 'databaseupdate')
 			);
 		}
 
 		// Install
 		if ($user->authorise('core.manage', 'com_installer'))
 		{
-			/** @var \Joomla\Component\Installer\Administrator\Model\DiscoverModel $discoverModel */
-			$discoverModel = $this->bootComponent('com_installer')->getMVCFactory()->createModel('Discover', 'Administrator', ['ignore_request' => true]);
-			$discoverModel->discover();
-			$discoveredExtensions = count($discoverModel->getItems());
-
 			$installSection->addItem(
 				new SystemItem('MOD_MENU_INSTALL_EXTENSIONS', 'index.php?option=com_installer&view=install')
 			);
 			$installSection->addItem(
-				new SystemItem('MOD_MENU_INSTALL_DISCOVER', 'index.php?option=com_installer&view=discover', $discoveredExtensions)
+				new SystemItem('MOD_MENU_INSTALL_DISCOVER', 'index.php?option=com_installer&view=discover', 'extensiondiscover')
 			);
 			$installSection->addItem(
 				new SystemItem('MOD_MENU_INSTALL_LANGUAGES', 'index.php?option=com_installer&view=languages')
@@ -199,27 +165,15 @@ public function getItems()
 
 		if ($user->authorise('core.manage', 'com_joomlaupdate'))
 		{
-			/** @var \Joomla\Component\Joomlaupdate\Administrator\Model\UpdateModel $joomlaUpdateModel */
-			$joomlaUpdateModel = $this->bootComponent('com_joomlaupdate')->getMVCFactory()->createModel('Update', 'Administrator', ['ignore_request' => true]);
-			$joomlaUpdateModel->refreshUpdates(true);
-			$joomlaUpdate      = $joomlaUpdateModel->getUpdateInformation();
-			$hasUpdate         = $joomlaUpdate['hasUpdate'] ? $joomlaUpdate['latest'] : '';
-
 			$updateSection->addItem(
-				new SystemItem('MOD_MENU_UPDATE_JOOMLA', 'index.php?option=com_joomlaupdate', $hasUpdate)
+				new SystemItem('MOD_MENU_UPDATE_JOOMLA', 'index.php?option=com_joomlaupdate', 'systemupdate')
 			);
 		}
 
 		if ($user->authorise('core.manage', 'com_installer'))
 		{
-			Updater::getInstance()->findUpdates();
-
-			/** @var \Joomla\Component\Installer\Administrator\Model\UpdateModel $updateModel */
-			$updateModel     = $installerComponent->getMVCFactory()->createModel('Update', 'Administrator', ['ignore_request' => true]);
-			$extensionsCount = count($updateModel->getItems());
-
 			$updateSection->addItem(
-				new SystemItem('MOD_MENU_UPDATE_EXTENSIONS', 'index.php?option=com_installer&view=update', $extensionsCount)
+				new SystemItem('MOD_MENU_UPDATE_EXTENSIONS', 'index.php?option=com_installer&view=update', 'extensionupdate')
 			);
 
 			$updateSection->addItem(
diff --git a/administrator/components/com_cpanel/View/Cpanel/HtmlView.php b/administrator/components/com_cpanel/View/Cpanel/HtmlView.php
index 9b2770fdba95a..e09180c12f260 100644
--- a/administrator/components/com_cpanel/View/Cpanel/HtmlView.php
+++ b/administrator/components/com_cpanel/View/Cpanel/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cpanel
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_cpanel/View/Help/HtmlView.php b/administrator/components/com_cpanel/View/Help/HtmlView.php
index 7bcf38bc4ff75..c421866fb126d 100644
--- a/administrator/components/com_cpanel/View/Help/HtmlView.php
+++ b/administrator/components/com_cpanel/View/Help/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cpanel
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_cpanel/View/System/HtmlView.php b/administrator/components/com_cpanel/View/System/HtmlView.php
index 87f8c8346e957..3e0cd9cc81518 100644
--- a/administrator/components/com_cpanel/View/System/HtmlView.php
+++ b/administrator/components/com_cpanel/View/System/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cpanel
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_cpanel/cpanel.xml b/administrator/components/com_cpanel/cpanel.xml
index 82f6e5c762049..0135ea451cd4f 100644
--- a/administrator/components/com_cpanel/cpanel.xml
+++ b/administrator/components/com_cpanel/cpanel.xml
@@ -3,7 +3,7 @@
 	<name>com_cpanel</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_cpanel/services/provider.php b/administrator/components/com_cpanel/services/provider.php
index 4c481ee6d1ac2..e5f6c97e1c3f0 100644
--- a/administrator/components/com_cpanel/services/provider.php
+++ b/administrator/components/com_cpanel/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cpanel
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_cpanel/tmpl/cpanel/default.php b/administrator/components/com_cpanel/tmpl/cpanel/default.php
index e68533e3640a0..ff70da5a2adbe 100644
--- a/administrator/components/com_cpanel/tmpl/cpanel/default.php
+++ b/administrator/components/com_cpanel/tmpl/cpanel/default.php
@@ -3,14 +3,22 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cpanel
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\Helper\ModuleHelper;
+use Joomla\CMS\HTML\HTMLHelper;
+
+HTMLHelper::_('behavior.core');
+Text::script('COM_CPANEL_UNPUBLISH_MODULE_SUCCESS');
+Text::script('COM_CPANEL_UNPUBLISH_MODULE_ERROR');
+
+HTMLHelper::_('script', 'com_cpanel/admin-cpanel-default.min.js', array('version' => 'auto', 'relative' => true));
 
 $user = Factory::getUser();
 ?>
@@ -18,6 +26,7 @@
 <div class="row">
 	<?php $iconmodules = ModuleHelper::getModules('icon');
 	if ($iconmodules) : ?>
+        <?php HTMLHelper::_('bootstrap.framework'); ?>
 		<div class="col-md-12">
 			<?php
 			// Display the submenu position modules
@@ -29,7 +38,7 @@
 		</div>
 	<?php endif; ?>
 </div>
-<div class="row">
+<div id="cpanel-modules" class="row">
 	<?php
 	$cols = 0;
 	foreach ($this->modules as $module)
diff --git a/administrator/components/com_cpanel/tmpl/help/default.php b/administrator/components/com_cpanel/tmpl/help/default.php
index d4ef90fde5d82..69e0c7358b2c5 100644
--- a/administrator/components/com_cpanel/tmpl/help/default.php
+++ b/administrator/components/com_cpanel/tmpl/help/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_cpanel/tmpl/system/default.php b/administrator/components/com_cpanel/tmpl/system/default.php
index 3c28404b00fc5..310c829bd91e8 100644
--- a/administrator/components/com_cpanel/tmpl/system/default.php
+++ b/administrator/components/com_cpanel/tmpl/system/default.php
@@ -3,14 +3,17 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
+HTMLHelper::_('script', 'com_cpanel/admin-system-loader.js', ['version' => 'auto', 'relative' => true]);
+
 /** @var  \Joomla\Component\Cpanel\Administrator\View\System\HtmlView  $this */
 ?>
 
@@ -25,9 +28,9 @@
 			<?php foreach ($section->getItems() as $item) : ?>
 				<li class="list-group-item">
 					<a href="<?php echo $item->getLink(); ?>"><?php echo Text::_($item->getTitle()); ?>
-					<?php if (!empty($item->getBadge())) : ?>
-						<span class="pull-right badge badge-pill badge-warning">
-							<?php echo '&#x200E;' . Text::_($item->getBadge()); ?>
+					<?php if (!empty($item->getType())) : ?>
+						<span class="fa fa-spin fa-spinner pull-right mt-1 system-counter" data-type="<?php echo $item->getType(); ?>">
+
 						</span>
 					<?php endif; ?>
 					</a>
diff --git a/administrator/components/com_csp/Controller/DisplayController.php b/administrator/components/com_csp/Controller/DisplayController.php
index 32b0886217325..cb3c68b1b8021 100644
--- a/administrator/components/com_csp/Controller/DisplayController.php
+++ b/administrator/components/com_csp/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_csp
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_csp/Controller/ReportsController.php b/administrator/components/com_csp/Controller/ReportsController.php
index 08671a53c2d81..f68b254087f93 100644
--- a/administrator/components/com_csp/Controller/ReportsController.php
+++ b/administrator/components/com_csp/Controller/ReportsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_csp
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_csp/Helper/ReporterHelper.php b/administrator/components/com_csp/Helper/ReporterHelper.php
index e11b924cfa89e..6f122497ba773 100644
--- a/administrator/components/com_csp/Helper/ReporterHelper.php
+++ b/administrator/components/com_csp/Helper/ReporterHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_csp
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_csp/Model/ReportModel.php b/administrator/components/com_csp/Model/ReportModel.php
index 6c88f63018bcb..7029d7f979f83 100644
--- a/administrator/components/com_csp/Model/ReportModel.php
+++ b/administrator/components/com_csp/Model/ReportModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_csp
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_csp/Model/ReportsModel.php b/administrator/components/com_csp/Model/ReportsModel.php
index 98be9c635bfec..a21f15ba93a53 100644
--- a/administrator/components/com_csp/Model/ReportsModel.php
+++ b/administrator/components/com_csp/Model/ReportsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_csp
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_csp/Table/ReportTable.php b/administrator/components/com_csp/Table/ReportTable.php
index 8731f9ee248b2..d0d99124e3ec8 100644
--- a/administrator/components/com_csp/Table/ReportTable.php
+++ b/administrator/components/com_csp/Table/ReportTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_csp
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_csp/View/Reports/HtmlView.php b/administrator/components/com_csp/View/Reports/HtmlView.php
index 545c14d9233a3..6bdf8d753c910 100644
--- a/administrator/components/com_csp/View/Reports/HtmlView.php
+++ b/administrator/components/com_csp/View/Reports/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_csp
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_csp/csp.xml b/administrator/components/com_csp/csp.xml
index 7759c53f74991..f955c1f2cf005 100644
--- a/administrator/components/com_csp/csp.xml
+++ b/administrator/components/com_csp/csp.xml
@@ -3,7 +3,7 @@
 	<name>com_csp</name>
 	<author>Joomla! Project</author>
 	<creationDate>May 2018</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_csp/services/provider.php b/administrator/components/com_csp/services/provider.php
index 825ac0df56d67..a0f65a79e7f32 100644
--- a/administrator/components/com_csp/services/provider.php
+++ b/administrator/components/com_csp/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_csp
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_csp/tmpl/reports/default.php b/administrator/components/com_csp/tmpl/reports/default.php
index 317f3d13ffd36..7f40b237ede66 100644
--- a/administrator/components/com_csp/tmpl/reports/default.php
+++ b/administrator/components/com_csp/tmpl/reports/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_csp
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_fields/Controller/DisplayController.php b/administrator/components/com_fields/Controller/DisplayController.php
index 0ac67aea0e1bc..78cf7f8ebff2f 100644
--- a/administrator/components/com_fields/Controller/DisplayController.php
+++ b/administrator/components/com_fields/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_fields/Controller/FieldController.php b/administrator/components/com_fields/Controller/FieldController.php
index 1698f846b0121..7f1014d7edfdb 100644
--- a/administrator/components/com_fields/Controller/FieldController.php
+++ b/administrator/components/com_fields/Controller/FieldController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,11 +13,9 @@
 
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\CMS\Session\Session;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
 use Joomla\Registry\Registry;
 
@@ -132,7 +130,7 @@ protected function allowEdit($data = array(), $key = 'id')
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Set the model
 		$model = $this->getModel('Field');
diff --git a/administrator/components/com_fields/Controller/FieldsController.php b/administrator/components/com_fields/Controller/FieldsController.php
index 484d5cf58cc6b..cba400e444530 100644
--- a/administrator/components/com_fields/Controller/FieldsController.php
+++ b/administrator/components/com_fields/Controller/FieldsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_fields/Controller/GroupController.php b/administrator/components/com_fields/Controller/GroupController.php
index affde2bf3a9b1..692cc724c2923 100644
--- a/administrator/components/com_fields/Controller/GroupController.php
+++ b/administrator/components/com_fields/Controller/GroupController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,11 +12,9 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\CMS\Session\Session;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
 use Joomla\Registry\Registry;
 
@@ -79,7 +77,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Set the model
 		$model = $this->getModel('Group');
diff --git a/administrator/components/com_fields/Controller/GroupsController.php b/administrator/components/com_fields/Controller/GroupsController.php
index bc07f2fbc32cb..42e7c49bbe842 100644
--- a/administrator/components/com_fields/Controller/GroupsController.php
+++ b/administrator/components/com_fields/Controller/GroupsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_fields/Dispatcher/Dispatcher.php b/administrator/components/com_fields/Dispatcher/Dispatcher.php
index e3c6399ef1351..9edbb585a1056 100644
--- a/administrator/components/com_fields/Dispatcher/Dispatcher.php
+++ b/administrator/components/com_fields/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_fields/Field/FieldcontextsField.php b/administrator/components/com_fields/Field/FieldcontextsField.php
index 23e1c9b58d29b..793a8b736d64c 100644
--- a/administrator/components/com_fields/Field/FieldcontextsField.php
+++ b/administrator/components/com_fields/Field/FieldcontextsField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,16 +13,14 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Fields\FieldsServiceInterface;
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('list');
+use Joomla\CMS\Form\Field\ListField;
 
 /**
  * Fields Contexts
  *
  * @since  3.7.0
  */
-class FieldcontextsField extends \JFormFieldList
+class FieldcontextsField extends ListField
 {
 	public $type = 'Fieldcontexts';
 
diff --git a/administrator/components/com_fields/Field/FieldgroupsField.php b/administrator/components/com_fields/Field/FieldgroupsField.php
index a7c26547416af..e1d9ab0cd451c 100644
--- a/administrator/components/com_fields/Field/FieldgroupsField.php
+++ b/administrator/components/com_fields/Field/FieldgroupsField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,17 +12,16 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\Utilities\ArrayHelper;
 
-FormHelper::loadFieldClass('list');
 
 /**
  * Fields Groups
  *
  * @since  3.7.0
  */
-class FieldgroupsField extends \JFormFieldList
+class FieldgroupsField extends ListField
 {
 	public $type = 'Fieldgroups';
 
diff --git a/administrator/components/com_fields/Field/Modal/FieldField.php b/administrator/components/com_fields/Field/Modal/FieldField.php
index edfe6972e4ca0..c4fb9f2604728 100644
--- a/administrator/components/com_fields/Field/Modal/FieldField.php
+++ b/administrator/components/com_fields/Field/Modal/FieldField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_fields/Field/SectionField.php b/administrator/components/com_fields/Field/SectionField.php
index 86b267d4e8033..bdea06aee7c75 100644
--- a/administrator/components/com_fields/Field/SectionField.php
+++ b/administrator/components/com_fields/Field/SectionField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,16 +12,14 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('list');
+use Joomla\CMS\Form\Field\ListField;
 
 /**
  * Fields Section
  *
  * @since  3.7.0
  */
-class SectionField extends \JFormFieldList
+class SectionField extends ListField
 {
 	public $type = 'Section';
 
diff --git a/administrator/components/com_fields/Field/TypeField.php b/administrator/components/com_fields/Field/TypeField.php
index de8cddf169ab7..cfbd63afce5fb 100644
--- a/administrator/components/com_fields/Field/TypeField.php
+++ b/administrator/components/com_fields/Field/TypeField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,18 +12,17 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Fields Type
  *
  * @since  3.7.0
  */
-class TypeField extends \JFormFieldList
+class TypeField extends ListField
 {
 	public $type = 'Type';
 
diff --git a/administrator/components/com_fields/Field/fieldlayout.php b/administrator/components/com_fields/Field/fieldlayout.php
new file mode 100644
index 0000000000000..eb2a449ff5a46
--- /dev/null
+++ b/administrator/components/com_fields/Field/fieldlayout.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+jimport('joomla.filesystem.folder');
+
+/**
+ * Form Field to display a list of the layouts for a field from
+ * the extension or template overrides.
+ *
+ * @since  3.9.0
+ */
+class JFormFieldFieldlayout extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	protected $type = 'FieldLayout';
+
+	/**
+	 * Method to get the field input for a field layout field.
+	 *
+	 * @return  string   The field input.
+	 *
+	 * @since   3.9.0
+	 */
+	protected function getInput()
+	{
+		$extension = explode('.', $this->form->getValue('context'))[0];
+
+		if ($extension)
+		{
+			// Get the database object and a new query object.
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true);
+
+			// Build the query.
+			$query->select('element, name')
+				->from('#__extensions')
+				->where('client_id = 0')
+				->where('type = ' . $db->quote('template'))
+				->where('enabled = 1');
+
+			// Set the query and load the templates.
+			$db->setQuery($query);
+			$templates = $db->loadObjectList('element');
+
+			// Build the search paths for component layouts.
+			$component_path = JPath::clean(JPATH_SITE . '/components/' . $extension . '/layouts/field');
+
+			// Prepare array of component layouts
+			$component_layouts = array();
+
+			// Prepare the grouped list
+			$groups = array();
+
+			// Add "Use Default"
+			$groups[]['items'][] = JHtml::_('select.option', '', JText::_('JOPTION_USE_DEFAULT'));
+
+			// Add the layout options from the component path.
+			if (is_dir($component_path) && ($component_layouts = JFolder::files($component_path, '^[^_]*\.php$', false, true)))
+			{
+				// Create the group for the component
+				$groups['_'] = array();
+				$groups['_']['id'] = $this->id . '__';
+				$groups['_']['text'] = JText::sprintf('JOPTION_FROM_COMPONENT');
+				$groups['_']['items'] = array();
+
+				foreach ($component_layouts as $i => $file)
+				{
+					// Add an option to the component group
+					$value = basename($file, '.php');
+					$component_layouts[$i] = $value;
+
+					if ($value === 'render')
+					{
+						continue;
+					}
+
+					$groups['_']['items'][] = JHtml::_('select.option', $value, $value);
+				}
+			}
+
+			// Loop on all templates
+			if ($templates)
+			{
+				foreach ($templates as $template)
+				{
+					$files = array();
+					$template_paths = array(
+						JPath::clean(JPATH_SITE . '/templates/' . $template->element . '/html/layouts/' . $extension . '/field'),
+						JPath::clean(JPATH_SITE . '/templates/' . $template->element . '/html/layouts/com_fields/field'),
+						JPath::clean(JPATH_SITE . '/templates/' . $template->element . '/html/layouts/field'),
+					);
+
+					// Add the layout options from the template paths.
+					foreach ($template_paths as $template_path)
+					{
+						if (is_dir($template_path))
+						{
+							$files = array_merge($files, JFolder::files($template_path, '^[^_]*\.php$', false, true));
+						}
+					}
+
+					foreach ($files as $i => $file)
+					{
+						$value = basename($file, '.php');
+
+						// Remove the default "render.php" or layout files that exist in the component folder
+						if ($value === 'render' || in_array($value, $component_layouts))
+						{
+							unset($files[$i]);
+						}
+					}
+
+					if (count($files))
+					{
+						// Create the group for the template
+						$groups[$template->name] = array();
+						$groups[$template->name]['id'] = $this->id . '_' . $template->element;
+						$groups[$template->name]['text'] = JText::sprintf('JOPTION_FROM_TEMPLATE', $template->name);
+						$groups[$template->name]['items'] = array();
+
+						foreach ($files as $file)
+						{
+							// Add an option to the template group
+							$value = basename($file, '.php');
+							$groups[$template->name]['items'][] = JHtml::_('select.option', $value, $value);
+						}
+					}
+				}
+			}
+
+			// Compute attributes for the grouped list
+			$attr = $this->element['size'] ? ' size="' . (int) $this->element['size'] . '"' : '';
+			$attr .= $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+			// Prepare HTML code
+			$html = array();
+
+			// Compute the current selected values
+			$selected = array($this->value);
+
+			// Add a grouped list
+			$html[] = JHtml::_(
+				'select.groupedlist', $groups, $this->name,
+				array('id' => $this->id, 'group.id' => 'id', 'list.attr' => $attr, 'list.select' => $selected)
+			);
+
+			return implode($html);
+		}
+
+		return '';
+	}
+}
diff --git a/administrator/components/com_fields/Helper/FieldsHelper.php b/administrator/components/com_fields/Helper/FieldsHelper.php
index b579fa3151407..85b03e79abc0b 100644
--- a/administrator/components/com_fields/Helper/FieldsHelper.php
+++ b/administrator/components/com_fields/Helper/FieldsHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -333,9 +333,9 @@ public static function prepareForm($context, Form $form, $data)
 			/*
 			 * Setting some parameters for the category field
 			 */
-			$form->setFieldAttribute('catid', 'custom-fields-enabled', true);
-			$form->setFieldAttribute('catid', 'custom-fields-cat-id', $assignedCatids);
-			$form->setFieldAttribute('catid', 'custom-fields-section', $section);
+			$form->setFieldAttribute('catid', 'refresh-enabled', true);
+			$form->setFieldAttribute('catid', 'refresh-cat-id', $assignedCatids);
+			$form->setFieldAttribute('catid', 'refresh-section', $section);
 		}
 
 		// Getting the fields
diff --git a/administrator/components/com_fields/Model/FieldModel.php b/administrator/components/com_fields/Model/FieldModel.php
index 0e672cefb74d4..060a260c1ae3a 100644
--- a/administrator/components/com_fields/Model/FieldModel.php
+++ b/administrator/components/com_fields/Model/FieldModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -528,7 +528,7 @@ public function getForm($data = array(), $loadData = true)
 
 		// Get the form.
 		$form = $this->loadForm(
-			'com_fields.field' . $context, 'field',
+			'com_fields.field.' . $context, 'field',
 			array(
 				'control'   => 'jform',
 				'load_data' => true,
@@ -986,7 +986,7 @@ protected function preprocessForm(\JForm $form, $data, $group = 'content')
 				throw new SectionNotFoundException;
 			}
 
-			$cat = $componentObject->getCategory();
+			$cat = $componentObject->getCategory([], $section ?: '');
 
 			if ($cat->get('root')->hasChildren())
 			{
diff --git a/administrator/components/com_fields/Model/FieldsModel.php b/administrator/components/com_fields/Model/FieldsModel.php
index 13ab958edd342..764902bea433d 100644
--- a/administrator/components/com_fields/Model/FieldsModel.php
+++ b/administrator/components/com_fields/Model/FieldsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -164,7 +164,7 @@ protected function getListQuery()
 		$query->select('ua.name AS author_name')->join('LEFT', '#__users AS ua ON ua.id = a.created_user_id');
 
 		// Join over the field groups.
-		$query->select('g.title AS group_title, g.access as group_access, g.state AS group_state');
+		$query->select('g.title AS group_title, g.access as group_access, g.state AS group_state, g.note as group_note');
 		$query->join('LEFT', '#__fields_groups AS g ON g.id = a.group_id');
 
 		// Filter by context
@@ -196,7 +196,13 @@ protected function getListQuery()
 			if ($parts)
 			{
 				// Get the category
-				$cat = Categories::getInstance(str_replace('com_', '', $parts[0]));
+				$cat = Categories::getInstance(str_replace('com_', '', $parts[0]) . '.' . $parts[1]);
+
+				// If there is no category for the component and section, so check the component only
+				if (!$cat)
+				{
+					$cat = Categories::getInstance(str_replace('com_', '', $parts[0]));
+				}
 
 				if ($cat)
 				{
diff --git a/administrator/components/com_fields/Model/GroupModel.php b/administrator/components/com_fields/Model/GroupModel.php
index bd799c6bc3509..114c11c5cf85b 100644
--- a/administrator/components/com_fields/Model/GroupModel.php
+++ b/administrator/components/com_fields/Model/GroupModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_fields/Model/GroupsModel.php b/administrator/components/com_fields/Model/GroupsModel.php
index e862786faea9b..cad334b9be3bd 100644
--- a/administrator/components/com_fields/Model/GroupsModel.php
+++ b/administrator/components/com_fields/Model/GroupsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_fields/Plugin/FieldsListPlugin.php b/administrator/components/com_fields/Plugin/FieldsListPlugin.php
index f3ddd9149dcd3..7263ccd16581b 100644
--- a/administrator/components/com_fields/Plugin/FieldsListPlugin.php
+++ b/administrator/components/com_fields/Plugin/FieldsListPlugin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_fields/Plugin/FieldsPlugin.php b/administrator/components/com_fields/Plugin/FieldsPlugin.php
index 592bc0958b69e..e9061d1f9a1fc 100644
--- a/administrator/components/com_fields/Plugin/FieldsPlugin.php
+++ b/administrator/components/com_fields/Plugin/FieldsPlugin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -189,6 +189,7 @@ public function onCustomFieldsPrepareDom($field, \DOMElement $parent, Form $form
 		$node->setAttribute('name', $field->name);
 		$node->setAttribute('type', $field->type);
 		$node->setAttribute('label', $field->label);
+		$node->setAttribute('labelclass', $field->params->get('label_class'));
 		$node->setAttribute('description', $field->description);
 		$node->setAttribute('class', $field->params->get('class'));
 		$node->setAttribute('hint', $field->params->get('hint'));
diff --git a/administrator/components/com_fields/Table/FieldTable.php b/administrator/components/com_fields/Table/FieldTable.php
index 8e3ec9d0ec336..3a555a9a1b96f 100644
--- a/administrator/components/com_fields/Table/FieldTable.php
+++ b/administrator/components/com_fields/Table/FieldTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -143,16 +143,14 @@ public function check()
 		}
 		else
 		{
+			$this->modified_time = $this->getDbo()->getNullDate();
+			$this->modified_by = 0;
+
 			if (!(int) $this->created_time)
 			{
 				$this->created_time = $date->toSql();
 			}
 
-			if (!(int) $this->modified_time)
-			{
-				$this->modified_time = $date->toSql();
-			}
-
 			if (empty($this->created_user_id))
 			{
 				$this->created_user_id = $user->get('id');
diff --git a/administrator/components/com_fields/Table/GroupTable.php b/administrator/components/com_fields/Table/GroupTable.php
index 37284c4fcdaa5..7530f575ef8d3 100644
--- a/administrator/components/com_fields/Table/GroupTable.php
+++ b/administrator/components/com_fields/Table/GroupTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -102,6 +102,9 @@ public function check()
 		}
 		else
 		{
+			$this->modified = $this->getDbo()->getNullDate();
+			$this->modified_by = 0;
+
 			if (!(int) $this->created)
 			{
 				$this->created = $date->toSql();
diff --git a/administrator/components/com_fields/View/Field/HtmlView.php b/administrator/components/com_fields/View/Field/HtmlView.php
index eab5e44dacfd3..d6b8775448d08 100644
--- a/administrator/components/com_fields/View/Field/HtmlView.php
+++ b/administrator/components/com_fields/View/Field/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -117,9 +117,10 @@ protected function addToolbar()
 		// For new records, check the create permission.
 		if ($isNew)
 		{
+			ToolbarHelper::apply('field.apply');
+			
 			ToolbarHelper::saveGroup(
 				[
-					['apply', 'field.apply'],
 					['save', 'field.save'],
 					['save2new', 'field.save2new']
 				],
@@ -138,7 +139,8 @@ protected function addToolbar()
 			// Can't save the record if it's checked out and editable
 			if (!$checkedOut && $itemEditable)
 			{
-				$toolbarButtons[] = ['apply', 'field.apply'];
+				ToolbarHelper::apply('field.apply');
+				
 				$toolbarButtons[] = ['save', 'field.save'];
 
 				// We can save this record, but check the create permission to see if we can return to make a new one.
diff --git a/administrator/components/com_fields/View/Fields/HtmlView.php b/administrator/components/com_fields/View/Fields/HtmlView.php
index bc48a39f985c8..e5723d6749722 100644
--- a/administrator/components/com_fields/View/Fields/HtmlView.php
+++ b/administrator/components/com_fields/View/Fields/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_fields/View/Group/HtmlView.php b/administrator/components/com_fields/View/Group/HtmlView.php
index 8a8b2ea1397c2..8829eb3719310 100644
--- a/administrator/components/com_fields/View/Group/HtmlView.php
+++ b/administrator/components/com_fields/View/Group/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -144,9 +144,10 @@ protected function addToolbar()
 		// For new records, check the create permission.
 		if ($isNew)
 		{
+			ToolbarHelper::apply('group.apply');
+			
 			ToolbarHelper::saveGroup(
 				[
-					['apply', 'group.apply'],
 					['save', 'group.save'],
 					['save2new', 'group.save2new']
 				],
@@ -165,7 +166,8 @@ protected function addToolbar()
 			// Can't save the record if it's checked out and editable
 			if (!$checkedOut && $itemEditable)
 			{
-				$toolbarButtons[] = ['apply', 'group.apply'];
+				ToolbarHelper::apply('group.apply');
+
 				$toolbarButtons[] = ['save', 'group.save'];
 
 				// We can save this record, but check the create permission to see if we can return to make a new one.
diff --git a/administrator/components/com_fields/View/Groups/HtmlView.php b/administrator/components/com_fields/View/Groups/HtmlView.php
index ef066b0bce431..5e545ea5277ae 100644
--- a/administrator/components/com_fields/View/Groups/HtmlView.php
+++ b/administrator/components/com_fields/View/Groups/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_fields/fields.xml b/administrator/components/com_fields/fields.xml
index 4015afce26185..d4b3596c5c22e 100644
--- a/administrator/components/com_fields/fields.xml
+++ b/administrator/components/com_fields/fields.xml
@@ -3,7 +3,7 @@
 	<name>com_fields</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2016</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_fields/forms/field.xml b/administrator/components/com_fields/forms/field.xml
index 17906b556b1d9..e469b812752e2 100644
--- a/administrator/components/com_fields/forms/field.xml
+++ b/administrator/components/com_fields/forms/field.xml
@@ -206,6 +206,13 @@
 
 	<fields name="params" label="COM_FIELDS_FIELD_BASIC_LABEL">
 		<fieldset name="basic">
+
+			<field
+				name="formoptions"
+				type="note"
+				label="COM_FIELDS_FIELD_FORMOPTIONS_HEADING"
+			/>
+
 			<field
 				name="hint"
 				type="text"
@@ -215,18 +222,40 @@
 			/>
 
 			<field
-				name="render_class"
+				name="class"
 				type="textarea"
-				label="COM_FIELDS_FIELD_RENDER_CLASS_LABEL"
-				description="COM_FIELDS_FIELD_RENDER_CLASS_DESC"
+				label="COM_FIELDS_FIELD_CLASS_LABEL"
 				size="40"
 			/>
 
 			<field
-				name="class"
+				name="label_class"
 				type="textarea"
-				label="COM_FIELDS_FIELD_CLASS_LABEL"
-				description="COM_FIELDS_FIELD_CLASS_DESC"
+				label="COM_FIELDS_FIELD_LABEL_FORM_CLASS_LABEL"
+				size="40"
+			/>
+
+			<field
+				name="show_on"
+				type="list"
+				label="COM_FIELDS_FIELD_SHOW_ON_LABEL"
+				default=""
+			>
+				<option value="1">COM_FIELDS_FIELD_SHOW_ON_SITE</option>
+				<option value="2">COM_FIELDS_FIELD_SHOW_ON_ADMIN</option>
+				<option value="">COM_FIELDS_FIELD_SHOW_ON_BOTH</option>
+			</field>
+
+			<field
+				name="renderoptions"
+				type="note"
+				label="COM_FIELDS_FIELD_RENDEROPTIONS_HEADING"
+			/>
+
+			<field
+				name="render_class"
+				type="textarea"
+				label="COM_FIELDS_FIELD_RENDER_CLASS_LABEL"
 				size="40"
 			/>
 
@@ -242,15 +271,12 @@
 			</field>
 
 			<field
-				name="show_on"
-				type="list"
-				label="COM_FIELDS_FIELD_SHOW_ON_LABEL"
-				default=""
-				>
-				<option value="1">COM_FIELDS_FIELD_SHOW_ON_SITE</option>
-				<option value="2">COM_FIELDS_FIELD_SHOW_ON_ADMIN</option>
-				<option value="">COM_FIELDS_FIELD_SHOW_ON_BOTH</option>
-			</field>
+				name="label_render_class"
+				type="textarea"
+				label="COM_FIELDS_FIELD_LABEL_RENDER_CLASS_LABEL"
+				size="40"
+				showon="showlabel:1"
+			/>
 
 			<field
 				name="display"
@@ -264,12 +290,18 @@
 				<option value="0">COM_FIELDS_FIELD_DISPLAY_NO_DISPLAY</option>
 			</field>
 
+			<field
+				name="layout"
+				type="fieldlayout"
+				label="COM_FIELDS_FIELD_LAYOUT_LABEL"
+				description="COM_FIELDS_FIELD_LAYOUT_DESC"
+			/>
+
 			<field
 				name="display_readonly"
-				type="radio"
+				type="list"
 				label="JFIELD_DISPLAY_READONLY_LABEL"
 				description="JFIELD_DISPLAY_READONLY_DESC"
-				class="btn-group btn-group-yesno"
 				default="2"
 				>
 				<option value="2">JGLOBAL_INHERIT</option>
diff --git a/administrator/components/com_fields/helpers/fields.php b/administrator/components/com_fields/helpers/fields.php
index 13d8d76526870..7d9de1972cab3 100644
--- a/administrator/components/com_fields/helpers/fields.php
+++ b/administrator/components/com_fields/helpers/fields.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_fields/services/provider.php b/administrator/components/com_fields/services/provider.php
index da5185fbc8594..3f5f3e216a8d2 100644
--- a/administrator/components/com_fields/services/provider.php
+++ b/administrator/components/com_fields/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_fields/tmpl/field/edit.php b/administrator/components/com_fields/tmpl/field/edit.php
index 98b1d0293a32d..f95a7e533303f 100644
--- a/administrator/components/com_fields/tmpl/field/edit.php
+++ b/administrator/components/com_fields/tmpl/field/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_fields/tmpl/field/modal.php b/administrator/components/com_fields/tmpl/field/modal.php
index 6ab9a96aab686..cd5c4a3199409 100644
--- a/administrator/components/com_fields/tmpl/field/modal.php
+++ b/administrator/components/com_fields/tmpl/field/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_fields/tmpl/field/modal_options.php b/administrator/components/com_fields/tmpl/field/modal_options.php
index 40d07743d73af..c1c1dfcac891c 100644
--- a/administrator/components/com_fields/tmpl/field/modal_options.php
+++ b/administrator/components/com_fields/tmpl/field/modal_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_fields/tmpl/fields/default.php b/administrator/components/com_fields/tmpl/fields/default.php
index 9555a2743b2a2..6d43e413cbf54 100644
--- a/administrator/components/com_fields/tmpl/fields/default.php
+++ b/administrator/components/com_fields/tmpl/fields/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -25,13 +25,20 @@
 $userId    = $user->get('id');
 $context   = $this->escape($this->state->get('filter.context'));
 $component = $this->state->get('filter.component');
+$section   = $this->state->get('filter.section');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $ordering  = ($listOrder == 'a.ordering');
 $saveOrder = ($listOrder == 'a.ordering' && strtolower($listDirn) == 'asc');
 
 // The category object of the component
-$category = Categories::getInstance(str_replace('com_', '', $component));
+$category = Categories::getInstance(str_replace('com_', '', $component) . '.' . $section);
+
+// If there is no category for the component and section, then check the component only
+if (!$category)
+{
+	$category = Categories::getInstance(str_replace('com_', '', $component));
+}
 
 if ($saveOrder && !empty($this->items))
 {
diff --git a/administrator/components/com_fields/tmpl/fields/default_batch_body.php b/administrator/components/com_fields/tmpl/fields/default_batch_body.php
index b2be9c0cafde4..da6c62b81a365 100644
--- a/administrator/components/com_fields/tmpl/fields/default_batch_body.php
+++ b/administrator/components/com_fields/tmpl/fields/default_batch_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_fields/tmpl/fields/default_batch_footer.php b/administrator/components/com_fields/tmpl/fields/default_batch_footer.php
index c758c6437e0f6..9ae14560a39fe 100644
--- a/administrator/components/com_fields/tmpl/fields/default_batch_footer.php
+++ b/administrator/components/com_fields/tmpl/fields/default_batch_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -11,9 +11,9 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<button class="btn btn-secondary" type="button" onclick="document.getElementById('batch-field-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
+<button type="button" class="btn btn-secondary" onclick="document.getElementById('batch-field-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
 	<?php echo Text::_('JCANCEL'); ?>
 </button>
-<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('field.batch');">
+<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('field.batch');">
 	<?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?>
-</button>
\ No newline at end of file
+</button>
diff --git a/administrator/components/com_fields/tmpl/fields/modal.php b/administrator/components/com_fields/tmpl/fields/modal.php
index 25fc4a5c18519..3c512df66dd07 100644
--- a/administrator/components/com_fields/tmpl/fields/modal.php
+++ b/administrator/components/com_fields/tmpl/fields/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_fields/tmpl/group/edit.php b/administrator/components/com_fields/tmpl/group/edit.php
index 23875b2075ebf..7af0e4ed0ff7e 100644
--- a/administrator/components/com_fields/tmpl/group/edit.php
+++ b/administrator/components/com_fields/tmpl/group/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_fields/tmpl/groups/default.php b/administrator/components/com_fields/tmpl/groups/default.php
index 01588a65bdc99..6deb6e5f56598 100644
--- a/administrator/components/com_fields/tmpl/groups/default.php
+++ b/administrator/components/com_fields/tmpl/groups/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_fields/tmpl/groups/default_batch_body.php b/administrator/components/com_fields/tmpl/groups/default_batch_body.php
index 06b3e42c75dfb..12e807bb36c66 100644
--- a/administrator/components/com_fields/tmpl/groups/default_batch_body.php
+++ b/administrator/components/com_fields/tmpl/groups/default_batch_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_fields/tmpl/groups/default_batch_footer.php b/administrator/components/com_fields/tmpl/groups/default_batch_footer.php
index 90e776c34cad5..86dca38324298 100644
--- a/administrator/components/com_fields/tmpl/groups/default_batch_footer.php
+++ b/administrator/components/com_fields/tmpl/groups/default_batch_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -11,9 +11,9 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<button class="btn btn-secondary" type="button" onclick="document.getElementById('batch-field-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
+<button type="button" class="btn btn-secondary" onclick="document.getElementById('batch-field-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
 	<?php echo Text::_('JCANCEL'); ?>
 </button>
-<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('group.batch');">
+<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('group.batch');">
 	<?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?>
-</button>
\ No newline at end of file
+</button>
diff --git a/administrator/components/com_finder/Controller/DisplayController.php b/administrator/components/com_finder/Controller/DisplayController.php
index f530a39bdf3ea..36db39810a1f8 100644
--- a/administrator/components/com_finder/Controller/DisplayController.php
+++ b/administrator/components/com_finder/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Controller/FilterController.php b/administrator/components/com_finder/Controller/FilterController.php
index ddb71172ba8ef..5a2c34d94f22b 100644
--- a/administrator/components/com_finder/Controller/FilterController.php
+++ b/administrator/components/com_finder/Controller/FilterController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -35,7 +35,7 @@ class FilterController extends FormController
 	public function save($key = null, $urlVar = null)
 	{
 		// Check for request forgeries.
-		\JSession::checkToken() or jexit(\JText::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$app = Factory::getApplication();
 		$input = $app->input;
diff --git a/administrator/components/com_finder/Controller/FiltersController.php b/administrator/components/com_finder/Controller/FiltersController.php
index 80447b3a26376..107d169c762e2 100644
--- a/administrator/components/com_finder/Controller/FiltersController.php
+++ b/administrator/components/com_finder/Controller/FiltersController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Controller/IndexController.php b/administrator/components/com_finder/Controller/IndexController.php
index 13c830676b19c..d64bc8933cfd6 100644
--- a/administrator/components/com_finder/Controller/IndexController.php
+++ b/administrator/components/com_finder/Controller/IndexController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -45,7 +45,7 @@ public function getModel($name = 'Index', $prefix = 'Administrator', $config = a
 	 */
 	public function purge()
 	{
-		\JSession::checkToken() or jexit(\JText::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Remove the script time limit.
 		@set_time_limit(0);
diff --git a/administrator/components/com_finder/Controller/IndexerController.php b/administrator/components/com_finder/Controller/IndexerController.php
index 3a519be11e534..4e86871aeb688 100644
--- a/administrator/components/com_finder/Controller/IndexerController.php
+++ b/administrator/components/com_finder/Controller/IndexerController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -62,7 +62,7 @@ public function start()
 		$this->app->allowCache(false);
 
 		// Check for a valid token. If invalid, send a 403 with the error message.
-		Session::checkToken('request') or static::sendResponse(new \Exception(\JText::_('JINVALID_TOKEN'), 403));
+		Session::checkToken('request') or static::sendResponse(new \Exception(\JText::_('JINVALID_TOKEN_NOTICE'), 403));
 
 		// Put in a buffer to silence noise.
 		ob_start();
@@ -130,7 +130,7 @@ public function batch()
 		$this->app->allowCache(false);
 
 		// Check for a valid token. If invalid, send a 403 with the error message.
-		Session::checkToken('request') or static::sendResponse(new \Exception(\JText::_('JINVALID_TOKEN'), 403));
+		Session::checkToken('request') or static::sendResponse(new \Exception(\JText::_('JINVALID_TOKEN_NOTICE'), 403));
 
 		// Put in a buffer to silence noise.
 		ob_start();
@@ -246,7 +246,7 @@ public function optimize()
 		$this->app->allowCache(false);
 
 		// Check for a valid token. If invalid, send a 403 with the error message.
-		Session::checkToken('request') or static::sendResponse(new \Exception(\JText::_('JINVALID_TOKEN'), 403));
+		Session::checkToken('request') or static::sendResponse(new \Exception(\JText::_('JINVALID_TOKEN_NOTICE'), 403));
 
 		// Put in a buffer to silence noise.
 		ob_start();
diff --git a/administrator/components/com_finder/Controller/MapsController.php b/administrator/components/com_finder/Controller/MapsController.php
index eb86d60f26de3..7b4a5700ed5fa 100644
--- a/administrator/components/com_finder/Controller/MapsController.php
+++ b/administrator/components/com_finder/Controller/MapsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Controller/SearchesController.php b/administrator/components/com_finder/Controller/SearchesController.php
index 3e435d2690017..34bfe9f4b151d 100644
--- a/administrator/components/com_finder/Controller/SearchesController.php
+++ b/administrator/components/com_finder/Controller/SearchesController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Extension/FinderComponent.php b/administrator/components/com_finder/Extension/FinderComponent.php
index cbd9c7374cebf..4514b2679e446 100644
--- a/administrator/components/com_finder/Extension/FinderComponent.php
+++ b/administrator/components/com_finder/Extension/FinderComponent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Field/BranchesField.php b/administrator/components/com_finder/Field/BranchesField.php
index ffded897c3024..79217bc88540e 100644
--- a/administrator/components/com_finder/Field/BranchesField.php
+++ b/administrator/components/com_finder/Field/BranchesField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Field/ContentmapField.php b/administrator/components/com_finder/Field/ContentmapField.php
index 541bd1b2168f8..32735c6efc0b0 100644
--- a/administrator/components/com_finder/Field/ContentmapField.php
+++ b/administrator/components/com_finder/Field/ContentmapField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Field/ContenttypesField.php b/administrator/components/com_finder/Field/ContenttypesField.php
index 2e97103fb2a08..e19fbbd36d3a2 100644
--- a/administrator/components/com_finder/Field/ContenttypesField.php
+++ b/administrator/components/com_finder/Field/ContenttypesField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Field/SearchfilterField.php b/administrator/components/com_finder/Field/SearchfilterField.php
index 9b24acbd2e9bc..2e24e83cac051 100644
--- a/administrator/components/com_finder/Field/SearchfilterField.php
+++ b/administrator/components/com_finder/Field/SearchfilterField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Helper/FinderHelper.php b/administrator/components/com_finder/Helper/FinderHelper.php
index f37f4fe0f13de..104751a39ac5a 100644
--- a/administrator/components/com_finder/Helper/FinderHelper.php
+++ b/administrator/components/com_finder/Helper/FinderHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Helper/FinderHelperLanguage.php b/administrator/components/com_finder/Helper/FinderHelperLanguage.php
index 871ba7034defa..99cef9bdc4e66 100644
--- a/administrator/components/com_finder/Helper/FinderHelperLanguage.php
+++ b/administrator/components/com_finder/Helper/FinderHelperLanguage.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/Model/FilterModel.php b/administrator/components/com_finder/Model/FilterModel.php
index c7d117c16f03e..58e6eef79d3a5 100644
--- a/administrator/components/com_finder/Model/FilterModel.php
+++ b/administrator/components/com_finder/Model/FilterModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Model/FiltersModel.php b/administrator/components/com_finder/Model/FiltersModel.php
index 55f5276b0d74e..d16d62499129b 100644
--- a/administrator/components/com_finder/Model/FiltersModel.php
+++ b/administrator/components/com_finder/Model/FiltersModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Model/IndexModel.php b/administrator/components/com_finder/Model/IndexModel.php
index 3ccecff74f508..5a0e0e6a1bf8e 100644
--- a/administrator/components/com_finder/Model/IndexModel.php
+++ b/administrator/components/com_finder/Model/IndexModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -353,7 +353,19 @@ public function purge()
 
 		// Truncate the taxonomy table and insert the root node.
 		$db->truncateTable('#__finder_taxonomy');
-		$root = (object) array('id' => 1, 'parent_id' => 0, 'title' => 'ROOT', 'state' => 0, 'access' => 0, 'ordering' => 0);
+		$root = (object) array(
+			'id' => 1,
+			'parent_id' => 0,
+			'lft' => 0,
+			'rgt' => 1,
+			'level' => 0,
+			'path' => '',
+			'title' => 'ROOT',
+			'alias' => 'root',
+			'state' => 1,
+			'access' => 1,
+			'language' => '*'
+		);
 		$db->insertObject('#__finder_taxonomy', $root);
 
 		// Truncate the tokens tables.
diff --git a/administrator/components/com_finder/Model/IndexerModel.php b/administrator/components/com_finder/Model/IndexerModel.php
index 80b803f202240..71c582cabb3ba 100644
--- a/administrator/components/com_finder/Model/IndexerModel.php
+++ b/administrator/components/com_finder/Model/IndexerModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Model/MapsModel.php b/administrator/components/com_finder/Model/MapsModel.php
index 3fb39b5487023..b33d586ac0cfe 100644
--- a/administrator/components/com_finder/Model/MapsModel.php
+++ b/administrator/components/com_finder/Model/MapsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -165,24 +165,13 @@ protected function getListQuery()
 
 		// Select all fields from the table.
 		$query = $db->getQuery(true)
-			->select('a.id, a.parent_id, a.title, a.state, a.access, a.ordering')
-			->select('CASE WHEN a.parent_id = 1 THEN 1 ELSE 2 END AS level')
-			->select('p.title AS parent_title')
+			->select('a.id, a.parent_id, a.lft, a.rgt, a.level, a.path, a.title, a.alias, a.state, a.access, a.language')
 			->from($db->quoteName('#__finder_taxonomy', 'a'))
-			->leftJoin($db->quoteName('#__finder_taxonomy', 'p') . ' ON p.id = a.parent_id')
 			->where('a.parent_id != 0');
 
-		$childQuery = $db->getQuery(true)
-			->select('parent_id')
-			->select('COUNT(*) AS num_children')
-			->from($db->quoteName('#__finder_taxonomy'))
-			->where('parent_id != 0')
-			->group('parent_id');
-
-		// Join to get children.
-		$query->select('b.num_children');
-		$query->select('CASE WHEN a.parent_id = 1 THEN a.title ELSE p.title END AS branch_title');
-		$query->leftJoin('(' . $childQuery . ') AS b ON b.parent_id = a.id');
+		// Join to get the branch title
+		$query->select([$query->qn('b.id', 'branch_id'), $query->qn('b.title', 'branch_title')])
+			->leftJoin($query->qn('#__finder_taxonomy', 'b') . ' ON b.level = 1 AND b.lft <= a.lft AND a.rgt <= b.rgt');
 
 		// Join to get the map links.
 		$stateQuery = $db->getQuery(true)
@@ -229,16 +218,16 @@ protected function getListQuery()
 		}
 
 		// Handle the list ordering.
-		$listOrdering = $this->getState('list.ordering', 'd.branch_title');
+		$listOrdering = $this->getState('list.ordering', 'a.lft');
 		$listDirn     = $this->getState('list.direction', 'ASC');
 
-		if ($listOrdering === 'd.branch_title')
+		if ($listOrdering === 'a.state')
 		{
-			$query->order("branch_title $listDirn, level ASC, a.title $listDirn");
+			$query->order("a.state $listDirn, a.lft $listDirn, level ASC");
 		}
-		elseif ($listOrdering === 'a.state')
+		else
 		{
-			$query->order("a.state $listDirn, branch_title $listDirn, level ASC");
+			$query->order($listOrdering . ' ' . $listDirn);
 		}
 
 		return $query;
@@ -311,7 +300,7 @@ public function getTable($type = 'Map', $prefix = 'Administrator', $config = arr
 	 *
 	 * @since   2.5
 	 */
-	protected function populateState($ordering = 'd.branch_title', $direction = 'ASC')
+	protected function populateState($ordering = 'a.lft', $direction = 'ASC')
 	{
 		// Load the filter state.
 		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
diff --git a/administrator/components/com_finder/Model/SearchesModel.php b/administrator/components/com_finder/Model/SearchesModel.php
index a7acd23f72863..0b01f289d24d6 100644
--- a/administrator/components/com_finder/Model/SearchesModel.php
+++ b/administrator/components/com_finder/Model/SearchesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Model/StatisticsModel.php b/administrator/components/com_finder/Model/StatisticsModel.php
index f0c15f99a970c..f60efce80840d 100644
--- a/administrator/components/com_finder/Model/StatisticsModel.php
+++ b/administrator/components/com_finder/Model/StatisticsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Service/HTML/Filter.php b/administrator/components/com_finder/Service/HTML/Filter.php
index c2a02abe8818e..c5d1bb147f361 100644
--- a/administrator/components/com_finder/Service/HTML/Filter.php
+++ b/administrator/components/com_finder/Service/HTML/Filter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -84,8 +84,8 @@ public function slider($options = array())
 			->where('t.parent_id = 1')
 			->where('t.state = 1')
 			->where('t.access IN (' . $groups . ')')
-			->group('t.id, t.parent_id, t.state, t.access, t.ordering, t.title, c.parent_id')
-			->order('t.ordering, t.title');
+			->group('t.id, t.parent_id, t.state, t.access, t.title, c.parent_id')
+			->order('t.lft, t.title');
 
 		// Limit the branch children to a predefined filter.
 		if ($filter)
@@ -131,10 +131,11 @@ public function slider($options = array())
 			$query->clear()
 				->select('t.*')
 				->from($db->quoteName('#__finder_taxonomy') . ' AS t')
-				->where('t.parent_id = ' . (int) $bk)
+				->where('t.lft > ' . (int) $bv->lft)
+				->where('t.rgt < ' . (int) $bv->rgt)
 				->where('t.state = 1')
 				->where('t.access IN (' . $groups . ')')
-				->order('t.ordering, t.title');
+				->order('t.lft, t.title');
 
 			// Self-join to get the parent title.
 			$query->select('e.title AS parent_title')
@@ -195,7 +196,7 @@ public function slider($options = array())
 				$html .= '<div class="form-check">';
 				$html .= '<label class="form-check-label">';
 				$html .= '<input type="checkbox" class="form-check-input selector filter-node' . $classSuffix . '" value="' . $nk . '" name="t[]" id="tax-'
-					. $bk . '"' . $checked . '> ' . $nv->title;
+					. $bk . '"' . $checked . '> ' . str_repeat('&mdash;', $nv->level - 2) . $nv->title;
 				$html .= '</label>';
 				$html .= '</div>';
 			}
@@ -280,8 +281,8 @@ public function select($idxQuery, $options)
 				->where('c.access IN (' . $groups . ')')
 				->group($db->quoteName('t.id'))
 				->group($db->quoteName('t.parent_id'))
-				->group('t.title, t.state, t.access, t.ordering')
-				->order('t.ordering, t.title');
+				->group('t.title, t.state, t.access, t.lft')
+				->order('t.lft, t.title');
 
 			// Limit the branch children to a predefined filter.
 			if (!empty($filter->data))
@@ -320,10 +321,11 @@ public function select($idxQuery, $options)
 				$query->clear()
 					->select('t.*')
 					->from($db->quoteName('#__finder_taxonomy') . ' AS t')
-					->where('t.parent_id = ' . (int) $bk)
+					->where('t.lft >= ' . (int) $bv->lft)
+					->where('t.rgt <= ' . (int) $bv->rgt)
 					->where('t.state = 1')
 					->where('t.access IN (' . $groups . ')')
-					->order('t.ordering, t.title');
+					->order('t.lft, t.title');
 
 				// Self-join to get the parent title.
 				$query->select('e.title AS parent_title')
@@ -362,7 +364,14 @@ public function select($idxQuery, $options)
 						$title = $language->hasKey($key) ? Text::_($key) : $node->title;
 					}
 
-					$branches[$bk]->nodes[$node_id]->title = $title;
+					if ($node->level > 2)
+					{
+						$branches[$bk]->nodes[$node_id]->title = str_repeat('-', $node->level - 2) . $title;
+					}
+					else
+					{
+						$branches[$bk]->nodes[$node_id]->title = $title;
+					}
 				}
 
 				// Add the Search All option to the branch.
diff --git a/administrator/components/com_finder/Service/HTML/Finder.php b/administrator/components/com_finder/Service/HTML/Finder.php
index 3127ab519ea25..64fe6e1a75909 100644
--- a/administrator/components/com_finder/Service/HTML/Finder.php
+++ b/administrator/components/com_finder/Service/HTML/Finder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Service/HTML/Query.php b/administrator/components/com_finder/Service/HTML/Query.php
index ca1555bf1a571..17f1ae5f53513 100644
--- a/administrator/components/com_finder/Service/HTML/Query.php
+++ b/administrator/components/com_finder/Service/HTML/Query.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Table/FilterTable.php b/administrator/components/com_finder/Table/FilterTable.php
index 2368f7f1025d6..0eb548cfaf805 100644
--- a/administrator/components/com_finder/Table/FilterTable.php
+++ b/administrator/components/com_finder/Table/FilterTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/Table/LinkTable.php b/administrator/components/com_finder/Table/LinkTable.php
index 4eeafc53bec24..f1ed5fd8c306e 100644
--- a/administrator/components/com_finder/Table/LinkTable.php
+++ b/administrator/components/com_finder/Table/LinkTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Finder\Administrator\Table;
diff --git a/administrator/components/com_finder/Table/MapTable.php b/administrator/components/com_finder/Table/MapTable.php
index 2715cce6d9f9f..7a8a32eb9088d 100644
--- a/administrator/components/com_finder/Table/MapTable.php
+++ b/administrator/components/com_finder/Table/MapTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,7 +11,9 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Table\Nested;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Utilities\ArrayHelper;
 
@@ -20,7 +22,7 @@
  *
  * @since  2.5
  */
-class MapTable extends Table
+class MapTable extends Nested
 {
 	/**
 	 * Constructor
@@ -32,6 +34,46 @@ class MapTable extends Table
 	public function __construct(DatabaseDriver $db)
 	{
 		parent::__construct('#__finder_taxonomy', 'id', $db);
+		$this->access = (int) Factory::getConfig()->get('access');
+	}
+
+	/**
+	 * Override check function
+	 *
+	 * @return  boolean
+	 *
+	 * @see     Table::check()
+	 * @since   4.0.0
+	 */
+	public function check()
+	{
+		try
+		{
+			parent::check();
+		}
+		catch (\Exception $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// Check for a title.
+		if (trim($this->title) == '')
+		{
+			$this->setError(Text::_('JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_CATEGORY'));
+
+			return false;
+		}
+
+		$this->alias = ApplicationHelper::stringURLSafe($this->title, $this->language);
+
+		if (trim($this->alias) == '')
+		{
+			$this->alias = md5(serialize($this->getProperties()));
+		}
+
+		return true;
 	}
 
 	/**
diff --git a/administrator/components/com_finder/View/Filter/HtmlView.php b/administrator/components/com_finder/View/Filter/HtmlView.php
index ad7e3274ebbe3..23b9376ebe499 100644
--- a/administrator/components/com_finder/View/Filter/HtmlView.php
+++ b/administrator/components/com_finder/View/Filter/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -123,9 +123,10 @@ protected function addToolbar()
 			// For new records, check the create permission.
 			if ($canDo->get('core.create'))
 			{
+				ToolbarHelper::apply('filter.apply');
+				
 				ToolbarHelper::saveGroup(
 					[
-						['apply', 'filter.apply'],
 						['save', 'filter.save'],
 						['save2new', 'filter.save2new']
 					],
@@ -143,7 +144,8 @@ protected function addToolbar()
 			// Since it's an existing record, check the edit permission.
 			if (!$checkedOut && $canDo->get('core.edit'))
 			{
-				$toolbarButtons[] = ['apply', 'filter.apply'];
+				ToolbarHelper::apply('filter.apply');
+				
 				$toolbarButtons[] = ['save', 'filter.save'];
 
 				// We can save this record, but check the create permission to see if we can return to make a new one.
diff --git a/administrator/components/com_finder/View/Filters/HtmlView.php b/administrator/components/com_finder/View/Filters/HtmlView.php
index 62ae64a016f50..a4b698898fcba 100644
--- a/administrator/components/com_finder/View/Filters/HtmlView.php
+++ b/administrator/components/com_finder/View/Filters/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/View/Index/HtmlView.php b/administrator/components/com_finder/View/Index/HtmlView.php
index fecdaa73aa16d..9b338b0b0a796 100644
--- a/administrator/components/com_finder/View/Index/HtmlView.php
+++ b/administrator/components/com_finder/View/Index/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/View/Indexer/HtmlView.php b/administrator/components/com_finder/View/Indexer/HtmlView.php
index 43eca298f9680..433191319c95b 100644
--- a/administrator/components/com_finder/View/Indexer/HtmlView.php
+++ b/administrator/components/com_finder/View/Indexer/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/View/Maps/HtmlView.php b/administrator/components/com_finder/View/Maps/HtmlView.php
index a8ecc9b5718f2..85f06bee218f8 100644
--- a/administrator/components/com_finder/View/Maps/HtmlView.php
+++ b/administrator/components/com_finder/View/Maps/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/View/Searches/HtmlView.php b/administrator/components/com_finder/View/Searches/HtmlView.php
index 8e1f2c8d9f8bc..52b34c700e660 100644
--- a/administrator/components/com_finder/View/Searches/HtmlView.php
+++ b/administrator/components/com_finder/View/Searches/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/View/Statistics/HtmlView.php b/administrator/components/com_finder/View/Statistics/HtmlView.php
index aaffb21992fa2..77d53216d6707 100644
--- a/administrator/components/com_finder/View/Statistics/HtmlView.php
+++ b/administrator/components/com_finder/View/Statistics/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/finder.xml b/administrator/components/com_finder/finder.xml
index 8363d548cef01..2e3baff5ea895 100644
--- a/administrator/components/com_finder/finder.xml
+++ b/administrator/components/com_finder/finder.xml
@@ -2,7 +2,7 @@
 <extension type="component" version="4.0" method="upgrade">
 	<name>com_finder</name>
 	<author>Joomla! Project</author>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<creationDate>August 2011</creationDate>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/administrator/components/com_finder/helpers/indexer/adapter.php b/administrator/components/com_finder/helpers/indexer/adapter.php
index 6ef6b2e422958..528fd16083291 100644
--- a/administrator/components/com_finder/helpers/indexer/adapter.php
+++ b/administrator/components/com_finder/helpers/indexer/adapter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -160,7 +160,7 @@ public function __construct(&$subject, $config)
 	/**
 	 * Method to get the adapter state and push it into the indexer.
 	 *
-	 * @return  boolean  True on success.
+	 * @return  void
 	 *
 	 * @since   2.5
 	 * @throws  Exception on error.
@@ -312,7 +312,7 @@ abstract protected function index(FinderIndexerResult $item);
 	 *
 	 * @param   integer  $id  The ID of the item to reindex.
 	 *
-	 * @return  boolean  True on success.
+	 * @return  void
 	 *
 	 * @since   2.5
 	 * @throws  Exception on database error.
@@ -902,12 +902,9 @@ protected function pluginDisable($pks)
 	protected function translateState($item, $category = null)
 	{
 		// If category is present, factor in its states as well
-		if ($category !== null)
+		if ($category !== null && $category == 0)
 		{
-			if ($category == 0)
-			{
-				$item = 0;
-			}
+			$item = 0;
 		}
 
 		// Translate the state
diff --git a/administrator/components/com_finder/helpers/indexer/driver/mysql.php b/administrator/components/com_finder/helpers/indexer/driver/mysql.php
index 124a390f4704d..671ef6994a7f4 100644
--- a/administrator/components/com_finder/helpers/indexer/driver/mysql.php
+++ b/administrator/components/com_finder/helpers/indexer/driver/mysql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -57,7 +57,7 @@ public function index($item, $format = 'html')
 
 		// Get the signatures of the item.
 		$curSig = static::getSignature($item);
-		$oldSig = isset($link->md5sum) ? $link->md5sum : null;
+		$oldSig = $link->md5sum ?? null;
 
 		// Get the other item information.
 		$linkId = empty($link->link_id) ? null : $link->link_id;
@@ -104,69 +104,35 @@ public function index($item, $format = 'html')
 		 * already exists in the database, we need to use an UPDATE query.
 		 * Otherwise, we need to use an INSERT to get the link id back.
 		 */
+		$entry = new stdClass;
+		$entry->url = $item->url;
+		$entry->route = $item->route;
+		$entry->title = $item->title;
+		$entry->description = $item->description;
+		$entry->indexdate = JFactory::getDate()->toSql();
+		$entry->state = (int) $item->state;
+		$entry->access = (int) $item->access;
+		$entry->language = $item->language;
+		$entry->type_id = (int) $item->type_id;
+		$entry->object = '';
+		$entry->publish_start_date = $item->publish_start_date;
+		$entry->publish_end_date = $item->publish_end_date;
+		$entry->start_date = $item->start_date;
+		$entry->end_date = $item->end_date;
+		$entry->list_price = (double) ($item->list_price ?: 0);
+		$entry->sale_price = (double) ($item->sale_price ?: 0);
 
 		if ($isNew)
 		{
-			$columnsArray = array(
-				$db->quoteName('url'), $db->quoteName('route'), $db->quoteName('title'), $db->quoteName('description'),
-				$db->quoteName('indexdate'), $db->quoteName('published'), $db->quoteName('state'), $db->quoteName('access'),
-				$db->quoteName('language'), $db->quoteName('type_id'), $db->quoteName('object'), $db->quoteName('publish_start_date'),
-				$db->quoteName('publish_end_date'), $db->quoteName('start_date'), $db->quoteName('end_date'), $db->quoteName('list_price'),
-				$db->quoteName('sale_price')
-			);
-
-			// Insert the link.
-			$query->clear()
-				->insert($db->quoteName('#__finder_links'))
-				->columns($columnsArray)
-				->values(
-					$db->quote($item->url) . ', '
-					. $db->quote($item->route) . ', '
-					. $db->quote($item->title) . ', '
-					. $db->quote($item->description) . ', '
-					. $query->currentTimestamp() . ', '
-					. '1, '
-					. (int) $item->state . ', '
-					. (int) $item->access . ', '
-					. $db->quote($item->language) . ', '
-					. (int) $item->type_id . ', '
-					. $db->quote(serialize($item)) . ', '
-					. $db->quote($item->publish_start_date) . ', '
-					. $db->quote($item->publish_end_date) . ', '
-					. $db->quote($item->start_date) . ', '
-					. $db->quote($item->end_date) . ', '
-					. (double) ($item->list_price ?: 0) . ', '
-					. (double) ($item->sale_price ?: 0)
-				);
-			$db->setQuery($query);
-			$db->execute();
-
-			// Get the link id.
+			// Insert the link and get its id.
+			$db->insertObject('#__finder_links', $entry);
 			$linkId = (int) $db->insertid();
 		}
 		else
 		{
 			// Update the link.
-			$query->clear()
-				->update($db->quoteName('#__finder_links'))
-				->set($db->quoteName('route') . ' = ' . $db->quote($item->route))
-				->set($db->quoteName('title') . ' = ' . $db->quote($item->title))
-				->set($db->quoteName('description') . ' = ' . $db->quote($item->description))
-				->set($db->quoteName('indexdate') . ' = ' . $query->currentTimestamp())
-				->set($db->quoteName('state') . ' = ' . (int) $item->state)
-				->set($db->quoteName('access') . ' = ' . (int) $item->access)
-				->set($db->quoteName('language') . ' = ' . $db->quote($item->language))
-				->set($db->quoteName('type_id') . ' = ' . (int) $item->type_id)
-				->set($db->quoteName('object') . ' = ' . $db->quote(serialize($item)))
-				->set($db->quoteName('publish_start_date') . ' = ' . $db->quote($item->publish_start_date))
-				->set($db->quoteName('publish_end_date') . ' = ' . $db->quote($item->publish_end_date))
-				->set($db->quoteName('start_date') . ' = ' . $db->quote($item->start_date))
-				->set($db->quoteName('end_date') . ' = ' . $db->quote($item->end_date))
-				->set($db->quoteName('list_price') . ' = ' . (double) ($item->list_price ?: 0))
-				->set($db->quoteName('sale_price') . ' = ' . (double) ($item->sale_price ?: 0))
-				->where('link_id = ' . (int) $linkId);
-			$db->setQuery($query);
-			$db->execute();
+			$entry->link_id = $linkId;
+			$db->updateObject('#__finder_links', $entry, 'link_id');
 		}
 
 		// Set up the variables we will need during processing.
@@ -211,8 +177,7 @@ public function index($item, $format = 'html')
 						if ($group === static::PATH_CONTEXT)
 						{
 							$ip = JFile::stripExt($ip);
-							$ip = str_replace('/', ' ', $ip);
-							$ip = str_replace('-', ' ', $ip);
+							$ip = str_replace(array('/', '-'), ' ', $ip);
 						}
 
 						// Tokenize a string of content and add it to the database.
@@ -261,10 +226,18 @@ public function index($item, $format = 'html')
 			foreach ($nodes as $node)
 			{
 				// Add the node to the tree.
-				$nodeId = FinderIndexerTaxonomy::addNode($branch, $node->title, $node->state, $node->access);
+				if ($node->nested)
+				{
+					$nodeId = FinderIndexerTaxonomy::addNestedNode($branch, $node->node, $node->state, $node->access, $node->language);
+				}
+				else
+				{
+					$nodeId = FinderIndexerTaxonomy::addNode($branch, $node->title, $node->state, $node->access, $node->language);
+				}
 
 				// Add the link => node map.
 				FinderIndexerTaxonomy::addMap($linkId, $nodeId);
+				$node->id = $nodeId;
 
 				// Tokenize the node title and add them to the database.
 				$count += $this->tokenizeToDb($node->title, static::META_CONTEXT, $item->language, $format);
@@ -398,6 +371,7 @@ public function index($item, $format = 'html')
 		$query->clear()
 			->update($db->quoteName('#__finder_links'))
 			->set($db->quoteName('md5sum') . ' = ' . $db->quote($curSig))
+			->set($db->quoteName('object') . ' = ' . $db->quote(serialize($item)))
 			->where($db->quoteName('link_id') . ' = ' . $db->quote($linkId));
 		$db->setQuery($query);
 		$db->execute();
@@ -508,15 +482,15 @@ protected function toggleTables($memory)
 			// Set the internal state.
 			$state = $memory;
 		}
-		// We must be setting the tables to the MyISAM engine.
+		// We must be setting the tables to the InnoDB engine.
 		elseif ($memory === false && $state !== false)
 		{
-			// Set the tokens table to MyISAM.
-			$db->setQuery('ALTER TABLE ' . $db->quoteName('#__finder_tokens') . ' ENGINE = MYISAM');
+			// Set the tokens table to InnoDB.
+			$db->setQuery('ALTER TABLE ' . $db->quoteName('#__finder_tokens') . ' ENGINE = INNODB');
 			$db->execute();
 
-			// Set the tokens aggregate table to MyISAM.
-			$db->setQuery('ALTER TABLE ' . $db->quoteName('#__finder_tokens_aggregate') . ' ENGINE = MYISAM');
+			// Set the tokens aggregate table to InnoDB.
+			$db->setQuery('ALTER TABLE ' . $db->quoteName('#__finder_tokens_aggregate') . ' ENGINE = INNODB');
 			$db->execute();
 
 			// Set the internal state.
diff --git a/administrator/components/com_finder/helpers/indexer/driver/postgresql.php b/administrator/components/com_finder/helpers/indexer/driver/postgresql.php
index adcbe727c6daa..acba32a7d47e5 100644
--- a/administrator/components/com_finder/helpers/indexer/driver/postgresql.php
+++ b/administrator/components/com_finder/helpers/indexer/driver/postgresql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -56,7 +56,7 @@ public function index($item, $format = 'html')
 		$isNew = empty($link->link_id) ? true : false;
 
 		// Check the signatures. If they match, the item is up to date.
-		if (!$isNew && $curSig == $oldSig)
+		if (!$isNew && $curSig === $oldSig)
 		{
 			return $linkId;
 		}
@@ -96,69 +96,35 @@ public function index($item, $format = 'html')
 		 * already exists in the database, we need to use an UPDATE query.
 		 * Otherwise, we need to use an INSERT to get the link id back.
 		 */
+		$entry = new stdClass;
+		$entry->url = $item->url;
+		$entry->route = $item->route;
+		$entry->title = $item->title;
+		$entry->description = $item->description;
+		$entry->indexdate = JFactory::getDate()->toSql();
+		$entry->state = (int) $item->state;
+		$entry->access = (int) $item->access;
+		$entry->language = $item->language;
+		$entry->type_id = (int) $item->type_id;
+		$entry->object = '';
+		$entry->publish_start_date = $item->publish_start_date;
+		$entry->publish_end_date = $item->publish_end_date;
+		$entry->start_date = $item->start_date;
+		$entry->end_date = $item->end_date;
+		$entry->list_price = (double) ($item->list_price ?: 0);
+		$entry->sale_price = (double) ($item->sale_price ?: 0);
 
 		if ($isNew)
 		{
-			$columnsArray = array(
-				$db->quoteName('url'), $db->quoteName('route'), $db->quoteName('title'), $db->quoteName('description'),
-				$db->quoteName('indexdate'), $db->quoteName('published'), $db->quoteName('state'), $db->quoteName('access'),
-				$db->quoteName('language'), $db->quoteName('type_id'), $db->quoteName('object'), $db->quoteName('publish_start_date'),
-				$db->quoteName('publish_end_date'), $db->quoteName('start_date'), $db->quoteName('end_date'), $db->quoteName('list_price'),
-				$db->quoteName('sale_price')
-			);
-
-			// Insert the link.
-			$query->clear()
-				->insert($db->quoteName('#__finder_links'))
-				->columns($columnsArray)
-				->values(
-					$db->quote($item->url) . ', '
-					. $db->quote($item->route) . ', '
-					. $db->quote($item->title) . ', '
-					. $db->quote($item->description) . ', '
-					. $query->currentTimestamp() . ', '
-					. '1, '
-					. (int) $item->state . ', '
-					. (int) $item->access . ', '
-					. $db->quote($item->language) . ', '
-					. (int) $item->type_id . ', '
-					. $db->quote(serialize($item)) . ', '
-					. $db->quote($item->publish_start_date) . ', '
-					. $db->quote($item->publish_end_date) . ', '
-					. $db->quote($item->start_date) . ', '
-					. $db->quote($item->end_date) . ', '
-					. (double) ($item->list_price ?: 0) . ', '
-					. (double) ($item->sale_price ?: 0)
-				);
-			$db->setQuery($query);
-			$db->execute();
-
-			// Get the link id.
+			// Insert the link and get its id.
+			$db->insertObject('#__finder_links', $entry);
 			$linkId = (int) $db->insertid();
 		}
 		else
 		{
 			// Update the link.
-			$query->clear()
-				->update($db->quoteName('#__finder_links'))
-				->set($db->quoteName('route') . ' = ' . $db->quote($item->route))
-				->set($db->quoteName('title') . ' = ' . $db->quote($item->title))
-				->set($db->quoteName('description') . ' = ' . $db->quote($item->description))
-				->set($db->quoteName('indexdate') . ' = ' . $query->currentTimestamp())
-				->set($db->quoteName('state') . ' = ' . (int) $item->state)
-				->set($db->quoteName('access') . ' = ' . (int) $item->access)
-				->set($db->quoteName('language') . ' = ' . $db->quote($item->language))
-				->set($db->quoteName('type_id') . ' = ' . (int) $item->type_id)
-				->set($db->quoteName('object') . ' = ' . $db->quote(serialize($item)))
-				->set($db->quoteName('publish_start_date') . ' = ' . $db->quote($item->publish_start_date))
-				->set($db->quoteName('publish_end_date') . ' = ' . $db->quote($item->publish_end_date))
-				->set($db->quoteName('start_date') . ' = ' . $db->quote($item->start_date))
-				->set($db->quoteName('end_date') . ' = ' . $db->quote($item->end_date))
-				->set($db->quoteName('list_price') . ' = ' . (double) ($item->list_price ?: 0))
-				->set($db->quoteName('sale_price') . ' = ' . (double) ($item->sale_price ?: 0))
-				->where('link_id = ' . (int) $linkId);
-			$db->setQuery($query);
-			$db->execute();
+			$entry->link_id = $linkId;
+			$db->updateObject('#__finder_links', $entry, 'link_id');
 		}
 
 		// Set up the variables we will need during processing.
@@ -203,8 +169,7 @@ public function index($item, $format = 'html')
 						if ($group === static::PATH_CONTEXT)
 						{
 							$ip = JFile::stripExt($ip);
-							$ip = str_replace('/', ' ', $ip);
-							$ip = str_replace('-', ' ', $ip);
+							$ip = str_replace(array('/', '-'), ' ', $ip);
 						}
 
 						// Tokenize a string of content and add it to the database.
@@ -253,10 +218,18 @@ public function index($item, $format = 'html')
 			foreach ($nodes as $node)
 			{
 				// Add the node to the tree.
-				$nodeId = FinderIndexerTaxonomy::addNode($branch, $node->title, $node->state, $node->access);
+				if ($node->nested)
+				{
+					$nodeId = FinderIndexerTaxonomy::addNestedNode($branch, $node->node, $node->state, $node->access, $node->language);
+				}
+				else
+				{
+					$nodeId = FinderIndexerTaxonomy::addNode($branch, $node->title, $node->state, $node->access, $node->language);
+				}
 
 				// Add the link => node map.
 				FinderIndexerTaxonomy::addMap($linkId, $nodeId);
+				$node->id = $nodeId;
 
 				// Tokenize the node title and add them to the database.
 				$count += $this->tokenizeToDb($node->title, static::META_CONTEXT, $item->language, $format);
@@ -274,28 +247,28 @@ public function index($item, $format = 'html')
 		 * table.
 		 */
 		$query = 'INSERT INTO ' . $db->quoteName('#__finder_tokens_aggregate') .
-				' (' . $db->quoteName('term_id') .
-				', ' . $db->quoteName('term') .
-				', ' . $db->quoteName('stem') .
-				', ' . $db->quoteName('common') .
-				', ' . $db->quoteName('phrase') .
-				', ' . $db->quoteName('term_weight') .
-				', ' . $db->quoteName('context') .
-				', ' . $db->quoteName('context_weight') .
-				', ' . $db->quoteName('language') . ')' .
-				' SELECT' .
-				' t.term_id, t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context,' .
-				' ROUND( t1.weight * COUNT( t2.term ) * %F, 8 ) AS context_weight, t1.language' .
-				' FROM (' .
-				'   SELECT DISTINCT t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context, t1.language' .
-				'   FROM ' . $db->quoteName('#__finder_tokens') . ' AS t1' .
-				'   WHERE t1.context = %d' .
-				' ) AS t1' .
-				' JOIN ' . $db->quoteName('#__finder_tokens') . ' AS t2 ON t2.term = t1.term' .
-				' LEFT JOIN ' . $db->quoteName('#__finder_terms') . ' AS t ON t.term = t1.term' .
-				' WHERE t2.context = %d AND t.term_id IS NOT NULL' .
-				' GROUP BY t1.term, t.term_id, t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context, t1.language' .
-				' ORDER BY t1.term DESC';
+			' (' . $db->quoteName('term_id') .
+			', ' . $db->quoteName('term') .
+			', ' . $db->quoteName('stem') .
+			', ' . $db->quoteName('common') .
+			', ' . $db->quoteName('phrase') .
+			', ' . $db->quoteName('term_weight') .
+			', ' . $db->quoteName('context') .
+			', ' . $db->quoteName('context_weight') .
+			', ' . $db->quoteName('language') . ')' .
+			' SELECT' .
+			' t.term_id, t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context,' .
+			' ROUND( t1.weight * COUNT( t2.term ) * %F, 8 ) AS context_weight, t1.language' .
+			' FROM (' .
+			'   SELECT DISTINCT t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context, t1.language' .
+			'   FROM ' . $db->quoteName('#__finder_tokens') . ' AS t1' .
+			'   WHERE t1.context = %d' .
+			' ) AS t1' .
+			' JOIN ' . $db->quoteName('#__finder_tokens') . ' AS t2 ON t2.term = t1.term' .
+			' LEFT JOIN ' . $db->quoteName('#__finder_terms') . ' AS t ON t.term = t1.term' .
+			' WHERE t2.context = %d AND t.term_id IS NOT NULL' .
+			' GROUP BY t1.term, t.term_id, t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context, t1.language' .
+			' ORDER BY t1.term DESC';
 
 		// Iterate through the contexts and aggregate the tokens per context.
 		foreach ($state->weights as $context => $multiplier)
@@ -323,7 +296,7 @@ public function index($item, $format = 'html')
 			' WHERE ta.term_id = 0'
 		);
 
-		if ($db->loadRow() == null)
+		if ($db->loadRow() === null)
 		{
 			$db->setQuery(
 				'INSERT INTO ' . $db->quoteName('#__finder_terms') .
@@ -401,6 +374,7 @@ public function index($item, $format = 'html')
 		$query->clear()
 			->update($db->quoteName('#__finder_links'))
 			->set($db->quoteName('md5sum') . ' = ' . $db->quote($curSig))
+			->set($db->quoteName('object') . ' = ' . $db->quote(serialize($item)))
 			->where($db->quoteName('link_id') . ' = ' . $db->quote($linkId));
 		$db->setQuery($query);
 		$db->execute();
diff --git a/administrator/components/com_finder/helpers/indexer/helper.php b/administrator/components/com_finder/helpers/indexer/helper.php
index 69f43863f5d82..fedfa0da4569c 100644
--- a/administrator/components/com_finder/helpers/indexer/helper.php
+++ b/administrator/components/com_finder/helpers/indexer/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -49,7 +49,7 @@ public static function parse($input, $format = 'html')
 	 * @param   string   $lang    The language of the input.
 	 * @param   boolean  $phrase  Flag to indicate whether input could be a phrase. [optional]
 	 *
-	 * @return  array  An array of FinderIndexerToken objects.
+	 * @return  array|FinderIndexerToken  An array of FinderIndexerToken objects or a single FinderIndexerToken object.
 	 *
 	 * @since   2.5
 	 */
@@ -224,7 +224,7 @@ public static function addContentType($title, $mime = null)
 	{
 		static $types;
 
-		$db = JFactory::getDbo();
+		$db    = JFactory::getDbo();
 		$query = $db->getQuery(true);
 
 		// Check if the types are loaded.
@@ -393,7 +393,7 @@ public static function getPrimaryLanguage($lang)
 	 * @since   2.5
 	 * @throws  Exception on database error.
 	 */
-	public static function getContentExtras(FinderIndexerResult &$item)
+	public static function getContentExtras(FinderIndexerResult $item)
 	{
 		// Load the finder plugin group.
 		JPluginHelper::importPlugin('finder');
@@ -433,7 +433,7 @@ public static function prepareContent($text, $params = null, FinderIndexerResult
 		}
 
 		// Create a mock content object.
-		$content = JTable::getInstance('Content');
+		$content       = JTable::getInstance('Content');
 		$content->text = $text;
 
 		if ($item)
diff --git a/administrator/components/com_finder/helpers/indexer/indexer.php b/administrator/components/com_finder/helpers/indexer/indexer.php
index c2c3b3aaf01d7..08c3e5994ee8a 100644
--- a/administrator/components/com_finder/helpers/indexer/indexer.php
+++ b/administrator/components/com_finder/helpers/indexer/indexer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -100,7 +100,7 @@ abstract class FinderIndexer
 	/**
 	 * Reusable Query Template. To be used with clone.
 	 *
-	 * @var    JDatabaseQuery
+	 * @var    Joomla\Database\QueryInterface
 	 * @since  3.8.0
 	 */
 	protected $addTokensToDbQueryTemplate;
@@ -116,7 +116,10 @@ public function __construct()
 
 		$db = $this->db;
 
-		// Set up query template for addTokensToDb
+		/**
+		 * Set up query template for addTokensToDb, we will be cloning this template when needed.
+		 * This is about twice as fast as calling the clear function or setting up a new object.
+		 */
 		$this->addTokensToDbQueryTemplate = $db->getQuery(true)->insert($db->quoteName('#__finder_tokens'))
 			->columns(
 				array(
@@ -170,7 +173,7 @@ public static function getInstance()
 	public static function getState()
 	{
 		// First, try to load from the internal state.
-		if (!empty(static::$state))
+		if ((bool) static::$state)
 		{
 			return static::$state;
 		}
@@ -424,8 +427,7 @@ protected function tokenizeToDb($input, $context, $lang, $format)
 				// Parse, tokenise and add tokens to the database.
 				$count = $this->tokenizeToDbShort($string, $context, $lang, $format, $count);
 
-				unset($string);
-				unset($tokens);
+				unset($string, $tokens);
 			}
 
 			return $count;
@@ -484,8 +486,8 @@ private function tokenizeToDbShort($input, $context, $lang, $format, $count)
 	/**
 	 * Method to add a set of tokens to the database.
 	 *
-	 * @param   FinderIndexerToken[]  $tokens   An array or single FinderIndexerToken object.
-	 * @param   mixed                 $context  The context of the tokens. See context constants. [optional]
+	 * @param   FinderIndexerToken[]|FinderIndexerToken  $tokens   An array or single FinderIndexerToken object.
+	 * @param   mixed                                    $context  The context of the tokens. See context constants. [optional]
 	 *
 	 * @return  integer  The number of tokens inserted into the database.
 	 *
@@ -506,45 +508,65 @@ protected function addTokensToDb($tokens, $context = '')
 		// Get the database object.
 		$db = $this->db;
 
-		$query = clone $this->addTokensToDbQueryTemplate;
-
-		// Check if a single FinderIndexerToken object was given and make it to be an array of FinderIndexerToken objects
-		$tokens = is_array($tokens) ? $tokens : array($tokens);
-
 		// Count the number of token values.
 		$values = 0;
 
-		// Break into chunks of no more than 1000 items
-		$chunks = array_chunk($tokens, 1000);
-
-		foreach ($chunks as $tokens)
+		if (($tokens instanceof FinderIndexerToken) === false)
 		{
-			$query->clear('values');
+			// Break into chunks of no more than 1000 items
+			$chunks = count($tokens) > 1000
+				? array_chunk($tokens, 1000)
+				: array($tokens);
 
-			// Iterate through the tokens to create SQL value sets.
-			foreach ($tokens as $token)
+			foreach ($chunks as $chunkTokens)
 			{
-				if ($filterCommon && $token->common)
+				$query = clone $this->addTokensToDbQueryTemplate;
+
+				// Iterate through the tokens to create SQL value sets.
+				foreach ($chunkTokens as $token)
 				{
-					continue;
+					if ($filterCommon && $token->common)
+					{
+						continue;
+					}
+
+					if ($filterNumeric && $token->numeric)
+					{
+						continue;
+					}
+
+					$query->values(
+						$db->quote($token->term) . ', '
+						. $db->quote($token->stem) . ', '
+						. (int) $token->common . ', '
+						. (int) $token->phrase . ', '
+						. $db->quote($token->weight) . ', '
+						. (int) $context . ', '
+						. $db->quote($token->language)
+					);
+					$values++;
 				}
 
-				if ($filterNumeric && $token->numeric)
+				if ($query->values)
 				{
-					continue;
+					$db->setQuery($query)->execute();
 				}
-
-				$query->values(
-					$db->quote($token->term) . ', '
-					. $db->quote($token->stem) . ', '
-					. (int) $token->common . ', '
-					. (int) $token->phrase . ', '
-					. $db->quote($token->weight) . ', '
-					. (int) $context . ', '
-					. $db->quote($token->language)
-				);
-				++$values;
 			}
+		}
+		else
+		{
+			$query = clone $this->addTokensToDbQueryTemplate;
+
+			$query->values(
+				$db->quote($tokens->term) . ', '
+				. $db->quote($tokens->stem) . ', '
+				. (int) $tokens->common . ', '
+				. (int) $tokens->phrase . ', '
+				. $db->escape((float) $tokens->weight) . ', '
+				. (int) $context . ', '
+				. $db->quote($tokens->language)
+			);
+			$values++;
 
 			if ($query->values)
 			{
diff --git a/administrator/components/com_finder/helpers/indexer/language.php b/administrator/components/com_finder/helpers/indexer/language.php
index 57c0ffdd99a0d..a645ef5826899 100644
--- a/administrator/components/com_finder/helpers/indexer/language.php
+++ b/administrator/components/com_finder/helpers/indexer/language.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/language/da.php b/administrator/components/com_finder/helpers/indexer/language/da.php
index b43399da38386..b8f32e31ff768 100644
--- a/administrator/components/com_finder/helpers/indexer/language/da.php
+++ b/administrator/components/com_finder/helpers/indexer/language/da.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/language/de.php b/administrator/components/com_finder/helpers/indexer/language/de.php
index e8a3f7c406e45..1f59903d09133 100644
--- a/administrator/components/com_finder/helpers/indexer/language/de.php
+++ b/administrator/components/com_finder/helpers/indexer/language/de.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/language/el.php b/administrator/components/com_finder/helpers/indexer/language/el.php
index 34b72089685bf..be1b5daa28821 100644
--- a/administrator/components/com_finder/helpers/indexer/language/el.php
+++ b/administrator/components/com_finder/helpers/indexer/language/el.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
  * The Greek stemmer was adapted for Joomla! 4 by Nicholas K. Dionysopoulos <nicholas@akeebabackup.com>. This is
diff --git a/administrator/components/com_finder/helpers/indexer/language/en.php b/administrator/components/com_finder/helpers/indexer/language/en.php
index 3ca92161d4d80..c04b7442d9ca5 100644
--- a/administrator/components/com_finder/helpers/indexer/language/en.php
+++ b/administrator/components/com_finder/helpers/indexer/language/en.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/language/es.php b/administrator/components/com_finder/helpers/indexer/language/es.php
index c19e1c9187f29..d941f389528cf 100644
--- a/administrator/components/com_finder/helpers/indexer/language/es.php
+++ b/administrator/components/com_finder/helpers/indexer/language/es.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/language/fr.php b/administrator/components/com_finder/helpers/indexer/language/fr.php
index 1db6c798932af..51157f18e0d7a 100644
--- a/administrator/components/com_finder/helpers/indexer/language/fr.php
+++ b/administrator/components/com_finder/helpers/indexer/language/fr.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/language/it.php b/administrator/components/com_finder/helpers/indexer/language/it.php
index aea7d18bffd53..e1df4288edddb 100644
--- a/administrator/components/com_finder/helpers/indexer/language/it.php
+++ b/administrator/components/com_finder/helpers/indexer/language/it.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/language/nl.php b/administrator/components/com_finder/helpers/indexer/language/nl.php
index 8d785e92f2e58..c06e11ab3a011 100644
--- a/administrator/components/com_finder/helpers/indexer/language/nl.php
+++ b/administrator/components/com_finder/helpers/indexer/language/nl.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/language/nn.php b/administrator/components/com_finder/helpers/indexer/language/nn.php
index 38d4cb047ef17..051bf934bd55a 100644
--- a/administrator/components/com_finder/helpers/indexer/language/nn.php
+++ b/administrator/components/com_finder/helpers/indexer/language/nn.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/language/pt.php b/administrator/components/com_finder/helpers/indexer/language/pt.php
index f9e5072dc8892..1fecc18091d85 100644
--- a/administrator/components/com_finder/helpers/indexer/language/pt.php
+++ b/administrator/components/com_finder/helpers/indexer/language/pt.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/language/ro.php b/administrator/components/com_finder/helpers/indexer/language/ro.php
index e3be94c873f39..27a8201763ab4 100644
--- a/administrator/components/com_finder/helpers/indexer/language/ro.php
+++ b/administrator/components/com_finder/helpers/indexer/language/ro.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/language/ru.php b/administrator/components/com_finder/helpers/indexer/language/ru.php
index df5982751c8d0..7ca4da2c96141 100644
--- a/administrator/components/com_finder/helpers/indexer/language/ru.php
+++ b/administrator/components/com_finder/helpers/indexer/language/ru.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/language/sv.php b/administrator/components/com_finder/helpers/indexer/language/sv.php
index 3d8fff3c215ab..2912fa285ef24 100644
--- a/administrator/components/com_finder/helpers/indexer/language/sv.php
+++ b/administrator/components/com_finder/helpers/indexer/language/sv.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/language/zh.php b/administrator/components/com_finder/helpers/indexer/language/zh.php
index 60c33c380a56c..b972ec3077405 100644
--- a/administrator/components/com_finder/helpers/indexer/language/zh.php
+++ b/administrator/components/com_finder/helpers/indexer/language/zh.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/parser.php b/administrator/components/com_finder/helpers/indexer/parser.php
index 9237195a3be18..d8c6cb58cf2cf 100644
--- a/administrator/components/com_finder/helpers/indexer/parser.php
+++ b/administrator/components/com_finder/helpers/indexer/parser.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/parser/html.php b/administrator/components/com_finder/helpers/indexer/parser/html.php
index 41ee325409e1d..3a19ead3d433b 100644
--- a/administrator/components/com_finder/helpers/indexer/parser/html.php
+++ b/administrator/components/com_finder/helpers/indexer/parser/html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -101,6 +101,8 @@ protected function process($input)
 	 * @param   string  $endTag    String representing the end tag.
 	 *
 	 * @return  string with blocks removed.
+	 *
+	 * @since   3.4
 	 */
 	private function removeBlocks($input, $startTag, $endTag)
 	{
diff --git a/administrator/components/com_finder/helpers/indexer/parser/rtf.php b/administrator/components/com_finder/helpers/indexer/parser/rtf.php
index fbb2563d2c4db..80fa1d1ac2d7e 100644
--- a/administrator/components/com_finder/helpers/indexer/parser/rtf.php
+++ b/administrator/components/com_finder/helpers/indexer/parser/rtf.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -30,12 +30,12 @@ class FinderIndexerParserRtf extends FinderIndexerParser
 	protected function process($input)
 	{
 		// Remove embedded pictures.
-		$input = preg_replace('#{\\\pict[^}]*}#mis', '', $input);
+		$input = preg_replace('#{\\\pict[^}]*}#mi', '', $input);
 
 		// Remove control characters.
 		$input = str_replace(array('{', '}', "\\\n"), array(' ', ' ', "\n"), $input);
-		$input = preg_replace('#\\\([^;]+?);#mis', ' ', $input);
-		$input = preg_replace('#\\\[\'a-zA-Z0-9]+#mis', ' ', $input);
+		$input = preg_replace('#\\\([^;]+?);#m', ' ', $input);
+		$input = preg_replace('#\\\[\'a-zA-Z0-9]+#mi', ' ', $input);
 
 		return $input;
 	}
diff --git a/administrator/components/com_finder/helpers/indexer/parser/txt.php b/administrator/components/com_finder/helpers/indexer/parser/txt.php
index 4b8b516823589..0af671c969fc6 100644
--- a/administrator/components/com_finder/helpers/indexer/parser/txt.php
+++ b/administrator/components/com_finder/helpers/indexer/parser/txt.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/query.php b/administrator/components/com_finder/helpers/indexer/query.php
index 7942598000ca0..54dde8a5efda4 100644
--- a/administrator/components/com_finder/helpers/indexer/query.php
+++ b/administrator/components/com_finder/helpers/indexer/query.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -111,7 +111,7 @@ class FinderIndexerQuery
 	 * Allow empty searches
 	 *
 	 * @var    boolean
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public $empty;
 
@@ -197,34 +197,34 @@ public function __construct($options)
 		$this->dates = new Registry;
 
 		// Populate the temporary date storage.
-		if (isset($options['date1']) && !empty($options['date1']))
+		if (!empty($options['date1']))
 		{
 			$this->dates->set('date1', $options['date1']);
 		}
 
-		if (isset($options['date2']) && !empty($options['date1']))
+		if (!empty($options['date2']))
 		{
 			$this->dates->set('date2', $options['date2']);
 		}
 
-		if (isset($options['when1']) && !empty($options['date1']))
+		if (!empty($options['when1']))
 		{
 			$this->dates->set('when1', $options['when1']);
 		}
 
-		if (isset($options['when2']) && !empty($options['date1']))
+		if (!empty($options['when2']))
 		{
 			$this->dates->set('when2', $options['when2']);
 		}
 
 		// Process the static taxonomy filters.
-		if (isset($options['filter']) && !empty($options['filter']))
+		if (!empty($options['filter']))
 		{
 			$this->processStaticTaxonomy($options['filter']);
 		}
 
 		// Process the dynamic taxonomy filters.
-		if (isset($options['filters']) && !empty($options['filters']))
+		if (!empty($options['filters']))
 		{
 			$this->processDynamicTaxonomy($options['filters']);
 		}
@@ -281,10 +281,10 @@ public function __construct($options)
 	 *
 	 * @since   2.5
 	 */
-	public function toUri($base = null)
+	public function toUri($base = '')
 	{
 		// Set the base if not specified.
-		if (empty($base))
+		if ($base === '')
 		{
 			$base = 'index.php?option=com_finder&view=search';
 		}
@@ -293,7 +293,7 @@ public function toUri($base = null)
 		$uri = JUri::getInstance($base);
 
 		// Add the static taxonomy filter if present.
-		if (!empty($this->filter))
+		if ((bool) $this->filter)
 		{
 			$uri->setVar('f', $this->filter);
 		}
@@ -302,7 +302,7 @@ public function toUri($base = null)
 		$t = JFactory::getApplication()->input->request->get('t', array(), 'array');
 
 		// Add the dynamic taxonomy filters if present.
-		if (!empty($this->filters))
+		if ((bool) $this->filters)
 		{
 			foreach ($this->filters as $nodes)
 			{
@@ -540,7 +540,7 @@ protected function processStaticTaxonomy($filterId)
 		$filters = ArrayHelper::toInteger($filters);
 
 		// Remove any values of zero.
-		if (array_search(0, $filters, true) !== false)
+		if (in_array(0, $filters, true) !== false)
 		{
 			unset($filters[array_search(0, $filters, true)]);
 		}
@@ -603,7 +603,7 @@ protected function processDynamicTaxonomy($filters)
 		$filters = ArrayHelper::toInteger($filters);
 
 		// Remove any values of zero.
-		if (array_search(0, $filters, true) !== false)
+		if (in_array(0, $filters, true) !== false)
 		{
 			unset($filters[array_search(0, $filters, true)]);
 		}
@@ -616,6 +616,7 @@ protected function processDynamicTaxonomy($filters)
 
 		// Get the database object.
 		$db = JFactory::getDbo();
+
 		$query = $db->getQuery(true);
 
 		/*
@@ -651,7 +652,7 @@ protected function processDynamicTaxonomy($filters)
 		foreach ($results as $result)
 		{
 			// Check if the branch has been cleared.
-			if (!in_array($result->branch, $cleared))
+			if (!in_array($result->branch, $cleared, true))
 			{
 				// Clear the branch.
 				$this->filters[$result->branch] = array();
@@ -708,7 +709,7 @@ protected function processDates($date1, $date2, $when1, $when2)
 		{
 			// Set the date filter.
 			$this->date1 = $date->toSql();
-			$this->when1 = in_array($when1, $whens) ? $when1 : 'before';
+			$this->when1 = in_array($when1, $whens, true) ? $when1 : 'before';
 		}
 
 		// The value of 'today' is a special case that we need to handle.
@@ -725,7 +726,7 @@ protected function processDates($date1, $date2, $when1, $when2)
 		{
 			// Set the date filter.
 			$this->date2 = $date->toSql();
-			$this->when2 = in_array($when2, $whens) ? $when2 : 'before';
+			$this->when2 = in_array($when2, $whens, true) ? $when2 : 'before';
 		}
 
 		return true;
@@ -833,7 +834,7 @@ protected function processString($input, $lang, $mode)
 						{
 							// Set the date filter.
 							$this->date1 = $date->toSql();
-							$this->when1 = in_array($modifier, $whens) ? $modifier : 'before';
+							$this->when1 = in_array($modifier, $whens, true) ? $modifier : 'before';
 						}
 
 						break;
@@ -841,7 +842,7 @@ protected function processString($input, $lang, $mode)
 
 					// Handle a taxonomy branch filter.
 					default:
-						{
+					{
 						// Try to find the node id.
 						$return = FinderIndexerTaxonomy::getNodeByTitle($modifier, $value);
 
@@ -849,7 +850,7 @@ protected function processString($input, $lang, $mode)
 						if ($return)
 						{
 							// Check if the branch has been cleared.
-							if (!in_array($modifier, $cleared))
+							if (!in_array($modifier, $cleared, true))
 							{
 								// Clear the branch.
 								$this->filters[$modifier] = array();
@@ -882,7 +883,7 @@ protected function processString($input, $lang, $mode)
 			$matches = array();
 
 			// Extract the tokens enclosed in double quotes.
-			if (preg_match_all('#\"([^"]+)\"#mi', $input, $matches))
+			if (preg_match_all('#\"([^"]+)\"#m', $input, $matches))
 			{
 				/*
 				 * One or more phrases were found so we need to iterate through
@@ -942,7 +943,7 @@ protected function processString($input, $lang, $mode)
 							if (count($chunk))
 							{
 								$phrases[] = implode(' ', $chunk);
-								$terms[] = implode(' ', $chunk);
+								$terms[]   = implode(' ', $chunk);
 							}
 						}
 					}
@@ -950,14 +951,14 @@ protected function processString($input, $lang, $mode)
 					{
 						// The phrase is <= $tuplecount words so we can use it as is.
 						$phrases[] = $match;
-						$terms[] = $match;
+						$terms[]   = $match;
 					}
 				}
 			}
 		}
 
 		// Add the remaining terms if present.
-		if (!empty($input))
+		if ((bool) $input)
 		{
 			$terms = array_merge($terms, explode(' ', $input));
 		}
@@ -973,7 +974,7 @@ protected function processString($input, $lang, $mode)
 		if (JDEBUG)
 		{
 			$debugStrings = array('**', '??');
-			$operators = str_replace($debugStrings, '', $operators);
+			$operators    = str_replace($debugStrings, '', $operators);
 		}
 
 		/*
@@ -984,16 +985,18 @@ protected function processString($input, $lang, $mode)
 		for ($i = 0, $c = count($terms); $i < $c; $i++)
 		{
 			// Check if the term is followed by an operator that we understand.
-			if (isset($terms[$i + 1]) && in_array($terms[$i + 1], $operators))
+			if (isset($terms[$i + 1]) && in_array($terms[$i + 1], $operators, true))
 			{
 				// Get the operator mode.
-				$op = array_search($terms[$i + 1], $operators);
+				$op = array_search($terms[$i + 1], $operators, true);
 
 				// Handle the AND operator.
 				if ($op === 'AND' && isset($terms[$i + 2]))
 				{
 					// Tokenize the current term.
 					$token = FinderIndexerHelper::tokenize($terms[$i], $lang, true);
+
+					// Todo: The previous function call may return an array, which seems not to be handled by the next one, which expects an object
 					$token = $this->getTokenData(array_shift($token));
 
 					if ($params->get('filter_commonwords', 0) && $token->common)
@@ -1011,7 +1014,7 @@ protected function processString($input, $lang, $mode)
 
 					// Add the current token to the stack.
 					$this->included[] = $token;
-					$this->highlight = array_merge($this->highlight, array_keys($token->matches));
+					$this->highlight  = array_merge($this->highlight, array_keys($token->matches));
 
 					// Skip the next token (the mode operator).
 					$this->operators[] = $terms[$i + 1];
@@ -1025,23 +1028,21 @@ protected function processString($input, $lang, $mode)
 
 					// Add the token after the next token to the stack.
 					$this->included[] = $other;
-					$this->highlight = array_merge($this->highlight, array_keys($other->matches));
+					$this->highlight  = array_merge($this->highlight, array_keys($other->matches));
 
 					// Remove the processed phrases if possible.
-					if (($pk = array_search($terms[$i], $phrases)) !== false)
+					if (($pk = array_search($terms[$i], $phrases, true)) !== false)
 					{
 						unset($phrases[$pk]);
 					}
 
-					if (($pk = array_search($terms[$i + 2], $phrases)) !== false)
+					if (($pk = array_search($terms[$i + 2], $phrases, true)) !== false)
 					{
 						unset($phrases[$pk]);
 					}
 
 					// Remove the processed terms.
-					unset($terms[$i]);
-					unset($terms[$i + 1]);
-					unset($terms[$i + 2]);
+					unset($terms[$i], $terms[$i + 1], $terms[$i + 2]);
 
 					// Adjust the loop.
 					$i += 2;
@@ -1068,10 +1069,10 @@ protected function processString($input, $lang, $mode)
 					$token->required = false;
 
 					// Add the current token to the stack.
-					if (count($token->matches))
+					if ((bool) $token->matches)
 					{
 						$this->included[] = $token;
-						$this->highlight = array_merge($this->highlight, array_keys($token->matches));
+						$this->highlight  = array_merge($this->highlight, array_keys($token->matches));
 					}
 					else
 					{
@@ -1089,10 +1090,10 @@ protected function processString($input, $lang, $mode)
 					$other->required = false;
 
 					// Add the token after the next token to the stack.
-					if (count($other->matches))
+					if ((bool) $other->matches)
 					{
 						$this->included[] = $other;
-						$this->highlight = array_merge($this->highlight, array_keys($other->matches));
+						$this->highlight  = array_merge($this->highlight, array_keys($other->matches));
 					}
 					else
 					{
@@ -1100,20 +1101,18 @@ protected function processString($input, $lang, $mode)
 					}
 
 					// Remove the processed phrases if possible.
-					if (($pk = array_search($terms[$i], $phrases)) !== false)
+					if (($pk = array_search($terms[$i], $phrases, true)) !== false)
 					{
 						unset($phrases[$pk]);
 					}
 
-					if (($pk = array_search($terms[$i + 2], $phrases)) !== false)
+					if (($pk = array_search($terms[$i + 2], $phrases, true)) !== false)
 					{
 						unset($phrases[$pk]);
 					}
 
 					// Remove the processed terms.
-					unset($terms[$i]);
-					unset($terms[$i + 1]);
-					unset($terms[$i + 2]);
+					unset($terms[$i], $terms[$i + 1], $terms[$i + 2]);
 
 					// Adjust the loop.
 					$i += 2;
@@ -1121,7 +1120,7 @@ protected function processString($input, $lang, $mode)
 				}
 			}
 			// Handle an orphaned OR operator.
-			elseif (isset($terms[$i + 1]) && array_search($terms[$i], $operators) === 'OR')
+			elseif (isset($terms[$i + 1]) && array_search($terms[$i], $operators, true) === 'OR')
 			{
 				// Skip the next token (the mode operator).
 				$this->operators[] = $terms[$i];
@@ -1130,12 +1129,12 @@ protected function processString($input, $lang, $mode)
 				$other = FinderIndexerHelper::tokenize($terms[$i + 1], $lang, true);
 				$other = $this->getTokenData(array_shift($other));
 
-				if ($params->get('filter_commonwords', 0) && $token->common)
+				if ($params->get('filter_commonwords', 0) && $other->common)
 				{
 					continue;
 				}
 
-				if ($params->get('filter_numeric', 0) && $token->numeric)
+				if ($params->get('filter_numeric', 0) && $other->numeric)
 				{
 					continue;
 				}
@@ -1144,10 +1143,10 @@ protected function processString($input, $lang, $mode)
 				$other->required = false;
 
 				// Add the token after the next token to the stack.
-				if (count($other->matches))
+				if ((bool) $other->matches)
 				{
 					$this->included[] = $other;
-					$this->highlight = array_merge($this->highlight, array_keys($other->matches));
+					$this->highlight  = array_merge($this->highlight, array_keys($other->matches));
 				}
 				else
 				{
@@ -1155,21 +1154,20 @@ protected function processString($input, $lang, $mode)
 				}
 
 				// Remove the processed phrase if possible.
-				if (($pk = array_search($terms[$i + 1], $phrases)) !== false)
+				if (($pk = array_search($terms[$i + 1], $phrases, true)) !== false)
 				{
 					unset($phrases[$pk]);
 				}
 
 				// Remove the processed terms.
-				unset($terms[$i]);
-				unset($terms[$i + 1]);
+				unset($terms[$i], $terms[$i + 1]);
 
 				// Adjust the loop.
 				$i++;
 				continue;
 			}
 			// Handle the NOT operator.
-			elseif (isset($terms[$i + 1]) && array_search($terms[$i], $operators) === 'NOT')
+			elseif (isset($terms[$i + 1]) && array_search($terms[$i], $operators, true) === 'NOT')
 			{
 				// Skip the next token (the mode operator).
 				$this->operators[] = $terms[$i];
@@ -1178,12 +1176,12 @@ protected function processString($input, $lang, $mode)
 				$other = FinderIndexerHelper::tokenize($terms[$i + 1], $lang, true);
 				$other = $this->getTokenData(array_shift($other));
 
-				if ($params->get('filter_commonwords', 0) && $token->common)
+				if ($params->get('filter_commonwords', 0) && $other->common)
 				{
 					continue;
 				}
 
-				if ($params->get('filter_numeric', 0) && $token->numeric)
+				if ($params->get('filter_numeric', 0) && $other->numeric)
 				{
 					continue;
 				}
@@ -1192,7 +1190,7 @@ protected function processString($input, $lang, $mode)
 				$other->required = false;
 
 				// Add the next token to the stack.
-				if (count($other->matches))
+				if ((bool) $other->matches)
 				{
 					$this->excluded[] = $other;
 				}
@@ -1202,14 +1200,13 @@ protected function processString($input, $lang, $mode)
 				}
 
 				// Remove the processed phrase if possible.
-				if (($pk = array_search($terms[$i + 1], $phrases)) !== false)
+				if (($pk = array_search($terms[$i + 1], $phrases, true)) !== false)
 				{
 					unset($phrases[$pk]);
 				}
 
 				// Remove the processed terms.
-				unset($terms[$i]);
-				unset($terms[$i + 1]);
+				unset($terms[$i], $terms[$i + 1]);
 
 				// Adjust the loop.
 				$i++;
@@ -1243,10 +1240,10 @@ protected function processString($input, $lang, $mode)
 
 			// Add the current token to the stack.
 			$this->included[] = $token;
-			$this->highlight = array_merge($this->highlight, array_keys($token->matches));
+			$this->highlight  = array_merge($this->highlight, array_keys($token->matches));
 
 			// Remove the processed term if possible.
-			if (($pk = array_search($phrases[$i], $terms)) !== false)
+			if (($pk = array_search($phrases[$i], $terms, true)) !== false)
 			{
 				unset($terms[$pk]);
 			}
@@ -1258,10 +1255,10 @@ protected function processString($input, $lang, $mode)
 		/*
 		 * Handle any remaining tokens using the standard processing mechanism.
 		 */
-		if (!empty($terms))
+		if ((bool) $terms)
 		{
 			// Tokenize the terms.
-			$terms = implode(' ', $terms);
+			$terms  = implode(' ', $terms);
 			$tokens = FinderIndexerHelper::tokenize($terms, $lang, false);
 
 			// Make sure we are working with an array.
@@ -1284,13 +1281,13 @@ protected function processString($input, $lang, $mode)
 				}
 
 				// Set the required flag for the token.
-				$token->required = $mode === 'AND' ? ($token->phrase ? false : true) : false;
+				$token->required = $mode === 'AND' ? (!$token->phrase) : false;
 
 				// Add the token to the appropriate stack.
-				if (count($token->matches) || $token->required)
+				if ($token->required || (bool) $token->matches)
 				{
 					$this->included[] = $token;
-					$this->highlight = array_merge($this->highlight, array_keys($token->matches));
+					$this->highlight  = array_merge($this->highlight, array_keys($token->matches));
 				}
 				else
 				{
@@ -1345,11 +1342,8 @@ protected function getTokenData($token)
 		$db->setQuery($query);
 		$matches = $db->loadObjectList();
 
-		// Setup the container.
-		$token->matches = array();
-
 		// Check the matching terms.
-		if (!empty($matches))
+		if ((bool) $matches)
 		{
 			// Add the matches to the token.
 			for ($i = 0, $c = count($matches); $i < $c; $i++)
@@ -1406,7 +1400,7 @@ protected function getTokenData($token)
 
 			// Get the closest match.
 			$keys = array_keys($suggestions);
-			$key = $keys[0];
+			$key  = $keys[0];
 
 			// Add the suggested term.
 			$token->suggestion = $results[$key]->term;
diff --git a/administrator/components/com_finder/helpers/indexer/result.php b/administrator/components/com_finder/helpers/indexer/result.php
index 58629d069bf27..6b39e4c7f1b09 100644
--- a/administrator/components/com_finder/helpers/indexer/result.php
+++ b/administrator/components/com_finder/helpers/indexer/result.php
@@ -3,12 +3,13 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Tree\ImmutableNodeInterface;
 JLoader::register('FinderIndexer', __DIR__ . '/indexer.php');
 
 /**
@@ -21,7 +22,7 @@
  *
  * @since  2.5
  */
-class FinderIndexerResult
+class FinderIndexerResult implements Serializable
 {
 	/**
 	 * An array of extra result properties.
@@ -324,14 +325,11 @@ public function getInstructions()
 	public function addInstruction($group, $property)
 	{
 		// Check if the group exists. We can't add instructions for unknown groups.
-		if (array_key_exists($group, $this->instructions))
+		// Check if the property exists in the group.
+		if (array_key_exists($group, $this->instructions) && !in_array($property, $this->instructions[$group], true))
 		{
-			// Check if the property exists in the group.
-			if (!in_array($property, $this->instructions[$group]))
-			{
-				// Add the property to the group.
-				$this->instructions[$group][] = $property;
-			}
+			// Add the property to the group.
+			$this->instructions[$group][] = $property;
 		}
 	}
 
@@ -375,9 +373,6 @@ public function getTaxonomy($branch = null)
 		// Get the taxonomy branch if available.
 		if ($branch !== null && isset($this->taxonomy[$branch]))
 		{
-			// Filter the input.
-			$branch = preg_replace('#[^\pL\pM\pN\p{Pi}\p{Pf}\'+-.,_]+#mui', ' ', $branch);
-
 			return $this->taxonomy[$branch];
 		}
 
@@ -387,28 +382,62 @@ public function getTaxonomy($branch = null)
 	/**
 	 * Method to add a taxonomy map for an item.
 	 *
-	 * @param   string   $branch  The title of the taxonomy branch to add the node to.
-	 * @param   string   $title   The title of the taxonomy node.
-	 * @param   integer  $state   The published state of the taxonomy node. [optional]
-	 * @param   integer  $access  The access level of the taxonomy node. [optional]
+	 * @param   string   $branch    The title of the taxonomy branch to add the node to.
+	 * @param   string   $title     The title of the taxonomy node.
+	 * @param   integer  $state     The published state of the taxonomy node. [optional]
+	 * @param   integer  $access    The access level of the taxonomy node. [optional]
+	 * @param   string   $language  The language of the taxonomy. [optional]
 	 *
 	 * @return  void
 	 *
 	 * @since   2.5
 	 */
-	public function addTaxonomy($branch, $title, $state = 1, $access = 1)
+	public function addTaxonomy($branch, $title, $state = 1, $access = 1, $language = '')
 	{
 		// Filter the input.
 		$branch = preg_replace('#[^\pL\pM\pN\p{Pi}\p{Pf}\'+-.,_]+#mui', ' ', $branch);
 
 		// Create the taxonomy node.
-		$node = new JObject;
+		$node = new stdClass;
 		$node->title = $title;
 		$node->state = (int) $state;
 		$node->access = (int) $access;
+		$node->language = $language;
+		$node->nested = false;
+
+		// Add the node to the taxonomy branch.
+		$this->taxonomy[$branch][] = $node;
+	}
+
+	/**
+	 * Method to add a nested taxonomy map for an item.
+	 *
+	 * @param   string                  $branch       The title of the taxonomy branch to add the node to.
+	 * @param   ImmutableNodeInterface  $contentNode  The node object.
+	 * @param   integer                 $state        The published state of the taxonomy node. [optional]
+	 * @param   integer                 $access       The access level of the taxonomy node. [optional]
+	 * @param   string                  $language     The language of the taxonomy. [optional]
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function addNestedTaxonomy($branch, ImmutableNodeInterface $contentNode, $state = 1, $access = 1, $language = '')
+	{
+		// Filter the input.
+		$branch = preg_replace('#[^\pL\pM\pN\p{Pi}\p{Pf}\'+-.,_]+#mui', ' ', $branch);
+
+		// Create the taxonomy node.
+		$node = new stdClass;
+		$node->title = $contentNode->title;
+		$node->state = (int) $state;
+		$node->access = (int) $access;
+		$node->language = $language;
+		$node->nested = true;
+		$node->node = $contentNode;
 
 		// Add the node to the taxonomy branch.
-		$this->taxonomy[$branch][$node->title] = $node;
+		$this->taxonomy[$branch][] = $node;
 	}
 
 	/**
@@ -425,4 +454,103 @@ public function setLanguage()
 			$this->language = $this->defaultLanguage;
 		}
 	}
+
+	/**
+	 * Helper function to serialise the data of a FinderIndexerResult object
+	 * 
+	 * @return  string  The serialised data
+	 * 
+	 * @since   4.0.0
+	 */
+	public function serialize()
+	{
+		$taxonomy = array();
+
+		foreach ($this->taxonomy as $branch => $nodes)
+		{
+			$taxonomy[$branch] = array();
+
+			foreach ($nodes as $node)
+			{
+				if ($node->nested)
+				{
+					$n = clone $node;
+					unset($n->node);
+					$taxonomy[$branch][] = $n;
+				}
+				else
+				{
+					$taxonomy[$branch][] = $node;
+				}
+			}
+		}
+
+		return serialize(
+			[
+			$this->access,
+			$this->defaultLanguage,
+			$this->description,
+			$this->elements,
+			$this->end_date,
+			$this->instructions,
+			$this->language,
+			$this->list_price,
+			$this->publish_end_date,
+			$this->publish_start_date,
+			$this->published,
+			$this->route,
+			$this->sale_price,
+			$this->start_date,
+			$this->state,
+			$taxonomy,
+			$this->title,
+			$this->type_id,
+			$this->url
+			]
+		);
+	}
+
+	/**
+	 * Helper function to unserialise the data for this object
+	 * 
+	 * @param   string  $serialized  Serialised data to unserialise
+	 * 
+	 * @return  void
+	 * 
+	 * @since   4.0.0
+	 */
+	public function unserialize($serialized)
+	{
+		list(
+			$this->access,
+			$this->defaultLanguage,
+			$this->description,
+			$this->elements,
+			$this->end_date,
+			$this->instructions,
+			$this->language,
+			$this->list_price,
+			$this->publish_end_date,
+			$this->publish_start_date,
+			$this->published,
+			$this->route,
+			$this->sale_price,
+			$this->start_date,
+			$this->state,
+			$this->taxonomy,
+			$this->title,
+			$this->type_id,
+			$this->url
+		) = unserialize($serialized);
+
+		foreach ($this->taxonomy as $nodes)
+		{
+			foreach ($nodes as $node)
+			{
+				$curTaxonomy = FinderIndexerTaxonomy::getTaxonomy($node->id);
+				$node->state = $curTaxonomy->state;
+				$node->access = $curTaxonomy->access;
+			}
+		}
+	}
 }
diff --git a/administrator/components/com_finder/helpers/indexer/taxonomy.php b/administrator/components/com_finder/helpers/indexer/taxonomy.php
index 0b90dde30d38f..e93cea84585d9 100644
--- a/administrator/components/com_finder/helpers/indexer/taxonomy.php
+++ b/administrator/components/com_finder/helpers/indexer/taxonomy.php
@@ -3,12 +3,15 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Tree\NodeInterface;
+use Joomla\Component\Finder\Administrator\Table\MapTable;
+
 /**
  * Taxonomy base class for the Finder indexer package.
  *
@@ -17,15 +20,23 @@
 class FinderIndexerTaxonomy
 {
 	/**
-	 * An internal cache of taxonomy branch data.
+	 * An internal cache of taxonomy data.
 	 *
 	 * @var    array
-	 * @since  2.5
+	 * @since  4.0.0
+	 */
+	public static $taxonomies = array();
+
+	/**
+	 * An internal cache of branch data.
+	 *
+	 * @var    array
+	 * @since  4.0.0
 	 */
 	public static $branches = array();
 
 	/**
-	 * An internal cache of taxonomy node data.
+	 * An internal cache of taxonomy node data for inserting it.
 	 *
 	 * @var    array
 	 * @since  2.5
@@ -46,111 +57,127 @@ class FinderIndexerTaxonomy
 	 */
 	public static function addBranch($title, $state = 1, $access = 1)
 	{
-		// Check to see if the branch is in the cache.
-		if (isset(static::$branches[$title]))
-		{
-			return static::$branches[$title]->id;
-		}
+		$node = new stdClass;
+		$node->title = $title;
+		$node->state = $state;
+		$node->access = $access;
+		$node->parent_id = 1;
+		$node->language = '';
+
+		return self::storeNode($node, 1);
+	}
 
-		// Check to see if the branch is in the table.
-		$db = JFactory::getDbo();
-		$query = $db->getQuery(true)
-			->select('*')
-			->from($db->quoteName('#__finder_taxonomy'))
-			->where($db->quoteName('parent_id') . ' = 1')
-			->where($db->quoteName('title') . ' = ' . $db->quote($title));
-		$db->setQuery($query);
+	/**
+	 * Method to add a node to the taxonomy tree.
+	 *
+	 * @param   string   $branch    The title of the branch to store the node in.
+	 * @param   string   $title     The title of the node.
+	 * @param   integer  $state     The published state of the node. [optional]
+	 * @param   integer  $access    The access state of the node. [optional]
+	 * @param   string   $language  The language of the node. [optional]
+	 *
+	 * @return  integer  The id of the node.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public static function addNode($branch, $title, $state = 1, $access = 1, $language = '')
+	{
+		// Get the branch id, insert it if it does not exist.
+		$branchId = static::addBranch($branch);
 
-		// Get the result.
-		$result = $db->loadObject();
+		$node = new stdClass;
+		$node->title = $title;
+		$node->state = $state;
+		$node->access = $access;
+		$node->parent_id = $branchId;
+		$node->language = $language;
 
-		// Check if the database matches the input data.
-		if (!empty($result) && $result->state == $state && $result->access == $access)
-		{
-			// The data matches, add the item to the cache.
-			static::$branches[$title] = $result;
+		return self::storeNode($node, $branchId);
+	}
 
-			return static::$branches[$title]->id;
+	/**
+	 * Method to add a nested node to the taxonomy tree.
+	 * 
+	 * @param   string         $branch    The title of the branch to store the node in.
+	 * @param   NodeInterface  $node      The source-node of the taxonomy node.
+	 * @param   integer        $state     The published state of the node. [optional]
+	 * @param   integer        $access    The access state of the node. [optional]
+	 * @param   string         $language  The language of the node. [optional]
+	 * @param   integer        $branchId  ID of a branch if known. [optional]
+	 * 
+	 * @return  integer  The id of the node.
+	 * 
+	 * @since   4.0.0
+	 */
+	public static function addNestedNode($branch, NodeInterface $node, $state = 1, $access = 1, $language = '', $branchId = null)
+	{
+		if (!$branchId)
+		{
+			// Get the branch id, insert it if it does not exist.
+			$branchId = static::addBranch($branch);
 		}
 
-		/*
-		 * The database did not match the input. This could be because the
-		 * state has changed or because the branch does not exist. Let's figure
-		 * out which case is true and deal with it.
-		 */
-		$branch = new JObject;
+		$parent = $node->getParent();
 
-		if (empty($result))
+		if ($parent && $parent->title !='ROOT')
 		{
-			// Prepare the branch object.
-			$branch->parent_id = 1;
-			$branch->title = $title;
-			$branch->state = (int) $state;
-			$branch->access = (int) $access;
+			$parentId = self::addNestedNode($branch, $parent, $state, $access, $language = '', $branchId);
 		}
 		else
 		{
-			// Prepare the branch object.
-			$branch->id = (int) $result->id;
-			$branch->parent_id = (int) $result->parent_id;
-			$branch->title = $result->title;
-			$branch->state = (int) $result->title;
-			$branch->access = (int) $result->access;
-			$branch->ordering = (int) $result->ordering;
+			$parentId = $branchId;
 		}
 
-		// Store the branch.
-		static::storeNode($branch);
-
-		// Add the branch to the cache.
-		static::$branches[$title] = $branch;
+		$temp = new stdClass;
+		$temp->title = $node->title;
+		$temp->state = $state;
+		$temp->access = $access;
+		$temp->parent_id = $parentId;
+		$temp->language = $language;
 
-		return static::$branches[$title]->id;
+		return self::storeNode($temp, $parentId);
 	}
 
 	/**
-	 * Method to add a node to the taxonomy tree.
-	 *
-	 * @param   string   $branch  The title of the branch to store the node in.
-	 * @param   string   $title   The title of the node.
-	 * @param   integer  $state   The published state of the node. [optional]
-	 * @param   integer  $access  The access state of the node. [optional]
-	 *
-	 * @return  integer  The id of the node.
-	 *
-	 * @since   2.5
-	 * @throws  Exception on database error.
+	 * A helper method to store a node in the taxonomy
+	 * 
+	 * @param   object   $node       The node data to include
+	 * @param   integer  $parent_id  The parent id of the node to add.
+	 * 
+	 * @return  integer  The id of the inserted node.
+	 * 
+	 * @since   4.0.0
 	 */
-	public static function addNode($branch, $title, $state = 1, $access = 1)
+	protected static function storeNode($node, $parent_id)
 	{
 		// Check to see if the node is in the cache.
-		if (isset(static::$nodes[$branch][$title]))
+		if (isset(static::$nodes[$parent_id . ':' . $node->title]))
 		{
-			return static::$nodes[$branch][$title]->id;
+			return static::$nodes[$parent_id . ':' . $node->title]->id;
 		}
 
-		// Get the branch id, insert it if it does not exist.
-		$branchId = static::addBranch($branch);
-
 		// Check to see if the node is in the table.
 		$db = JFactory::getDbo();
 		$query = $db->getQuery(true)
 			->select('*')
 			->from($db->quoteName('#__finder_taxonomy'))
-			->where($db->quoteName('parent_id') . ' = ' . $db->quote($branchId))
-			->where($db->quoteName('title') . ' = ' . $db->quote($title));
+			->where($db->quoteName('parent_id') . ' = ' . $db->quote($parent_id))
+			->where($db->quoteName('title') . ' = ' . $db->quote($node->title))
+			->where($db->quoteName('language') . ' = ' . $db->quote($node->language));
+
 		$db->setQuery($query);
 
 		// Get the result.
 		$result = $db->loadObject();
 
 		// Check if the database matches the input data.
-		if (!empty($result) && $result->state == $state && $result->access == $access)
+		if ((bool) $result && $result->state == $node->state && $result->access == $node->access)
 		{
 			// The data matches, add the item to the cache.
-			static::$nodes[$branch][$title] = $result;
+			static::$nodes[$parent_id . ':' . $node->title] = $result;
 
-			return static::$nodes[$branch][$title]->id;
+			return static::$nodes[$parent_id . ':' . $node->title]->id;
 		}
 
 		/*
@@ -158,34 +185,38 @@ public static function addNode($branch, $title, $state = 1, $access = 1)
 		 * state has changed or because the node does not exist. Let's figure
 		 * out which case is true and deal with it.
 		 */
-		$node = new JObject;
+		/** TODO: use factory? **/
+		$nodeTable = new MapTable($db);
 
 		if (empty($result))
 		{
 			// Prepare the node object.
-			$node->parent_id = (int) $branchId;
-			$node->title = $title;
-			$node->state = (int) $state;
-			$node->access = (int) $access;
+			$nodeTable->title = $node->title;
+			$nodeTable->state = (int) $node->state;
+			$nodeTable->access = (int) $node->access;
+			$nodeTable->language = $node->language;
+			$nodeTable->setLocation((int) $parent_id, 'last-child');
 		}
 		else
 		{
 			// Prepare the node object.
-			$node->id = (int) $result->id;
-			$node->parent_id = (int) $result->parent_id;
-			$node->title = $result->title;
-			$node->state = (int) $result->title;
-			$node->access = (int) $result->access;
-			$node->ordering = (int) $result->ordering;
+			$nodeTable->id = (int) $result->id;
+			$nodeTable->title = $result->title;
+			$nodeTable->state = (int) $result->title;
+			$nodeTable->access = (int) $result->access;
+			$nodeTable->language = $node->language;
+			$nodeTable->setLocation($result->parent_id, 'last-child');
 		}
 
-		// Store the node.
-		static::storeNode($node);
+		// Store the branch.
+		$nodeTable->check();
+		$nodeTable->store();
+		$nodeTable->rebuildPath($nodeTable->id);
 
 		// Add the node to the cache.
-		static::$nodes[$branch][$title] = $node;
+		static::$nodes[$parent_id . ':' . $nodeTable->title] = (object) $nodeTable->getProperties();
 
-		return static::$nodes[$branch][$title]->id;
+		return static::$nodes[$parent_id . ':' . $nodeTable->title]->id;
 	}
 
 	/**
@@ -213,16 +244,11 @@ public static function addMap($linkId, $nodeId)
 		$db->execute();
 		$id = (int) $db->loadResult();
 
-		$map = new JObject;
-		$map->link_id = (int) $linkId;
-		$map->node_id = (int) $nodeId;
-
-		if ($id)
-		{
-			$db->updateObject('#__finder_taxonomy_map', $map, array('link_id', 'node_id'));
-		}
-		else
+		if (!$id)
 		{
+			$map = new stdClass;
+			$map->link_id = (int) $linkId;
+			$map->node_id = (int) $nodeId;
 			$db->insertObject('#__finder_taxonomy_map', $map);
 		}
 
@@ -352,31 +378,76 @@ public static function removeOrphanNodes()
 	}
 
 	/**
-	 * Method to store a node to the database.  This method will accept either a branch or a node.
-	 *
-	 * @param   object  $item  The item to store.
-	 *
-	 * @return  boolean  True on success.
-	 *
-	 * @since   2.5
-	 * @throws  Exception on database error.
+	 * Get a taxonomy based on its id or all taxonomies
+	 * 
+	 * @param   integer  $id  Id of the taxonomy
+	 * 
+	 * @return  object|array  A taxonomy object or an array of all taxonomies
+	 * 
+	 * @since   4.0.0
 	 */
-	protected static function storeNode($item)
+	public static function getTaxonomy($id = 0)
 	{
-		$db = JFactory::getDbo();
+		if (!count(self::$taxonomies))
+		{
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true);
+
+			$query->select(array('id','parent_id','lft','rgt','level','path','title','alias','state','access','language'))
+				->from($db->quoteName('#__finder_taxonomy'))
+				->order($db->quoteName('lft'));
 
-		// Check if we are updating or inserting the item.
-		if (empty($item->id))
+			$db->setQuery($query);
+			self::$taxonomies = $db->loadObjectList('id');
+		}
+
+		if ($id == 0)
 		{
-			// Insert the item.
-			$db->insertObject('#__finder_taxonomy', $item, 'id');
+			return self::$taxonomies;
 		}
-		else
+
+		if (isset(self::$taxonomies[$id]))
 		{
-			// Update the item.
-			$db->updateObject('#__finder_taxonomy', $item, 'id');
+			return self::$taxonomies[$id];
 		}
 
-		return true;
+		return false;
+	}
+
+	/**
+	 * Get a taxonomy branch object based on its title or all branches
+	 * 
+	 * @param   string  $title  Title of the branch
+	 * 
+	 * @return  object|array  The object with the branch data or an array of all branches
+	 * 
+	 * @since   4.0.0
+	 */
+	public static function getBranch($title = '')
+	{
+		if (!count(self::$branches))
+		{
+			$taxonomies = self::getTaxonomy();
+
+			foreach ($taxonomies as $t)
+			{
+				if ($t->level == 1)
+				{
+					self::$branches[$t->title] = $t;
+				}
+			}
+		}
+
+		if ($title == '')
+		{
+			return self::$branches;
+		}
+
+		if (isset(self::$branches[$title]))
+		{
+			return self::$branches[$title];
+		}
+
+		return false;
 	}
 }
diff --git a/administrator/components/com_finder/helpers/indexer/token.php b/administrator/components/com_finder/helpers/indexer/token.php
index 40ea5ec9ff406..7a524534abcfc 100644
--- a/administrator/components/com_finder/helpers/indexer/token.php
+++ b/administrator/components/com_finder/helpers/indexer/token.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -87,6 +87,30 @@ class FinderIndexerToken
 	 */
 	public $language;
 
+	/**
+	 * The container for matches.
+	 *
+	 * @var    array
+	 * @since  3.8.12
+	 */
+	public $matches = array();
+
+	/**
+	 * Is derived token (from individual words)
+	 *
+	 * @var    boolean
+	 * @since  3.8.12
+	 */
+	public $derived;
+
+	/**
+	 * The suggested term
+	 *
+	 * @var    string
+	 * @since  3.8.12
+	 */
+	public $suggestion;
+
 	/**
 	 * Method to construct the token object.
 	 *
@@ -145,9 +169,9 @@ public function __construct($term, $lang, $spacer = ' ')
 			 * 3. If numeric, multiply weight by 1.5.
 			 * 4. Round weight to 4 decimal points.
 			 */
-			$this->weight = (($this->length >= 15 ? 15 : $this->length) / 15);
-			$this->weight = ($this->common == true ? $this->weight / 8 : $this->weight);
-			$this->weight = ($this->numeric == true ? $this->weight * 1.5 : $this->weight);
+			$this->weight = ($this->length >= 15 ? 15 : $this->length) / 15;
+			$this->weight = $this->common === true ? $this->weight / 8 : $this->weight;
+			$this->weight = $this->numeric === true ? $this->weight * 1.5 : $this->weight;
 			$this->weight = round($this->weight, 4);
 		}
 	}
diff --git a/administrator/components/com_finder/helpers/language.php b/administrator/components/com_finder/helpers/language.php
index bdeb2e3718e0e..f26abe21d1701 100644
--- a/administrator/components/com_finder/helpers/language.php
+++ b/administrator/components/com_finder/helpers/language.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/services/provider.php b/administrator/components/com_finder/services/provider.php
index f0a0aaf5784b5..625d15aef1fdb 100644
--- a/administrator/components/com_finder/services/provider.php
+++ b/administrator/components/com_finder/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/sql/install.mysql.sql b/administrator/components/com_finder/sql/install.mysql.sql
index 71e4f42ea8235..5c744d2e071bd 100644
--- a/administrator/components/com_finder/sql/install.mysql.sql
+++ b/administrator/components/com_finder/sql/install.mysql.sql
@@ -85,26 +85,33 @@ CREATE TABLE IF NOT EXISTS `#__finder_logging` (
 --
 
 CREATE TABLE IF NOT EXISTS `#__finder_taxonomy` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `parent_id` int(10) unsigned NOT NULL DEFAULT 0,
-  `title` varchar(255) NOT NULL,
-  `state` tinyint(1) unsigned NOT NULL DEFAULT 1,
-  `access` tinyint(1) unsigned NOT NULL DEFAULT 0,
-  `ordering` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `parent_id` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+  `lft` INT(11) NOT NULL DEFAULT '0',
+  `rgt` INT(11) NOT NULL DEFAULT '0',
+  `level` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+  `path` VARCHAR(400) NOT NULL DEFAULT '',
+  `title` VARCHAR(255) NOT NULL DEFAULT '',
+  `alias` VARCHAR(400) NOT NULL DEFAULT '',
+  `state` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
+  `access` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
+  `language` CHAR(7) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
-  KEY `parent_id` (`parent_id`),
-  KEY `state` (`state`),
-  KEY `ordering` (`ordering`),
-  KEY `access` (`access`),
-  KEY `idx_parent_published` (`parent_id`,`state`,`access`)
+  INDEX `idx_state` (`state`),
+  INDEX `idx_access` (`access`),
+  INDEX `idx_path` (`path`(100)),
+  INDEX `idx_left_right` (`lft`, `rgt`),
+  INDEX `idx_alias` (`alias`(100)),
+  INDEX `idx_language` (`language`),
+  INDEX `idx_parent_published` (`parent_id`, `state`, `access`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
 
 --
 -- Dumping data for table `#__finder_taxonomy`
 --
 
-REPLACE INTO `#__finder_taxonomy` (`id`, `parent_id`, `title`, `state`, `access`, `ordering`) VALUES
-(1, 0, 'ROOT', 0, 0, 0);
+INSERT INTO `#__finder_taxonomy` (`id`, `parent_id`, `lft`, `rgt`, `level`, `path`, `title`, `alias`, `state`, `access`, `language`) VALUES
+(1, 0, 0, 1, 0, '', 'ROOT', 'root', 1, 1, '*');
 
 --
 -- Table structure for table `#__finder_taxonomy_map`
diff --git a/administrator/components/com_finder/sql/install.postgresql.sql b/administrator/components/com_finder/sql/install.postgresql.sql
index 086964f903f0f..95d1abbd9afd7 100644
--- a/administrator/components/com_finder/sql/install.postgresql.sql
+++ b/administrator/components/com_finder/sql/install.postgresql.sql
@@ -84,29 +84,32 @@ CREATE INDEX "#__finder_logging_idx_searchterm" on "#__finder_logging" ("searcht
 CREATE TABLE IF NOT EXISTS "#__finder_taxonomy" (
   "id" serial NOT NULL,
   "parent_id" integer DEFAULT 0 NOT NULL,
-  "title" character varying(255) NOT NULL,
+  "lft" integer DEFAULT 0 NOT NULL,
+  "rgt" integer DEFAULT 0 NOT NULL,
+  "level" integer DEFAULT 0 NOT NULL,
+  "path" VARCHAR(400) NOT NULL DEFAULT '',
+  "title" VARCHAR(255) NOT NULL DEFAULT '',
+  "alias" VARCHAR(400) NOT NULL DEFAULT '',
   "state" smallint DEFAULT 1 NOT NULL,
-  "access" smallint DEFAULT 0 NOT NULL,
-  "ordering" smallint DEFAULT 0 NOT NULL,
+  "access" smallint DEFAULT 1 NOT NULL,
+  "language" varchar(7) DEFAULT '' NOT NULL,
   PRIMARY KEY ("id")
 );
-CREATE INDEX "#__finder_taxonomy_parent_id" on "#__finder_taxonomy" ("parent_id");
 CREATE INDEX "#__finder_taxonomy_state" on "#__finder_taxonomy" ("state");
-CREATE INDEX "#__finder_taxonomy_ordering" on "#__finder_taxonomy" ("ordering");
 CREATE INDEX "#__finder_taxonomy_access" on "#__finder_taxonomy" ("access");
+CREATE INDEX "#__finder_taxonomy_path" on "#__finder_taxonomy" ("path");
+CREATE INDEX "#__finder_taxonomy_lft_rgt" on "#__finder_taxonomy" ("lft", "rgt");
+CREATE INDEX "#__finder_taxonomy_alias" on "#__finder_taxonomy" ("alias");
+CREATE INDEX "#__finder_taxonomy_language" on "#__finder_taxonomy" ("language");
 CREATE INDEX "#__finder_taxonomy_idx_parent_published" on "#__finder_taxonomy" ("parent_id", "state", "access");
 
 --
 -- Dumping data for table #__finder_taxonomy
 --
-UPDATE "#__finder_taxonomy" SET ("id", "parent_id", "title", "state", "access", "ordering") = (1, 0, 'ROOT', 0, 0, 0) 
-WHERE "id"=1;
-
-INSERT INTO "#__finder_taxonomy" ("id", "parent_id", "title", "state", "access", "ordering") 
-SELECT 1, 0, 'ROOT', 0, 0, 0 WHERE 1 NOT IN 
-(SELECT 1 FROM "#__finder_taxonomy" WHERE "id"=1);
-
+INSERT INTO "#__finder_taxonomy" ("id", "parent_id", "lft", "rgt", "level", "path", "title", "alias", "state", "access", "language") VALUES
+(1, 0, 0, 1, 0, '', 'ROOT', 'root', 1, 1, '*');
 
+SELECT setval('#__finder_taxonomy_id_seq', 2, false);
 
 --
 -- Table: #__finder_taxonomy_map
diff --git a/administrator/components/com_finder/tmpl/filter/edit.php b/administrator/components/com_finder/tmpl/filter/edit.php
index 73125baf6c856..678f56be2f5be 100644
--- a/administrator/components/com_finder/tmpl/filter/edit.php
+++ b/administrator/components/com_finder/tmpl/filter/edit.php
@@ -3,12 +3,14 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Layout\LayoutHelper;
+
 JHtml::_('behavior.formvalidator');
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.core');
@@ -24,7 +26,7 @@
 
 <form action="<?php echo JRoute::_('index.php?option=com_finder&view=filter&layout=edit&filter_id=' . (int) $this->item->filter_id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate">
 
-	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
+	<?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>
 
 	<?php echo JHtml::_('uitab.startTabSet', 'myTab', array('active' => 'details')); ?>
 
@@ -47,7 +49,7 @@
 		<div class="col-md-3">
 			<div class="card card-light">
 				<div class="card-body">
-					<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+					<?php echo LayoutHelper::render('joomla.edit.global', $this); ?>
 				</div>
 			</div>
 		</div>
@@ -55,10 +57,10 @@
 	<?php echo JHtml::_('uitab.endTab'); ?>
 
 	<?php echo JHtml::_('uitab.addTab', 'myTab', 'publishing', JText::_('JGLOBAL_FIELDSET_PUBLISHING')); ?>
-	<?php echo JLayoutHelper::render('joomla.edit.publishingdata', $this); ?>
+	<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
 	<?php echo JHtml::_('uitab.endTab'); ?>
 
-	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+	<?php echo LayoutHelper::render('joomla.edit.params', $this); ?>
 
 	<?php echo JHtml::_('uitab.endTabSet'); ?>
 
diff --git a/administrator/components/com_finder/tmpl/filters/default.php b/administrator/components/com_finder/tmpl/filters/default.php
index 577e852e8b035..5c46d1d0e340e 100644
--- a/administrator/components/com_finder/tmpl/filters/default.php
+++ b/administrator/components/com_finder/tmpl/filters/default.php
@@ -3,33 +3,37 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
 
-$user      = JFactory::getUser();
+$user      = Factory::getUser();
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 
-JText::script('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT');
+Text::script('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT');
 HTMLHelper::_('script', 'com_finder/filters.js', ['version' => 'auto', 'relative' => true]);
 ?>
-<form action="<?php echo JRoute::_('index.php?option=com_finder&view=filters'); ?>" method="post" name="adminForm" id="adminForm">
+<form action="<?php echo Route::_('index.php?option=com_finder&view=filters'); ?>" method="post" name="adminForm" id="adminForm">
 	<div class="row">
 		<div id="j-sidebar-container" class="col-md-2">
 			<?php echo $this->sidebar; ?>
 		</div>
 		<div class="col-md-10">
 			<div id="j-main-container" class="j-main-container">
-				<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-warning">
-						<?php echo JText::_('COM_FINDER_NO_RESULTS_OR_FILTERS'); ?>
+						<?php echo Text::_('COM_FINDER_NO_RESULTS_OR_FILTERS'); ?>
 					</div>
 				<?php else : ?>
 				<table class="table">
@@ -39,25 +43,25 @@
 					<thead>
 						<tr>
 							<td style="width:1%" class="text-center">
-								<?php echo JHtml::_('grid.checkall'); ?>
+								<?php echo HTMLHelper::_('grid.checkall'); ?>
 							</td>
 							<th scope="col" style="width:1%">
-								<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+								<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col">
-								<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+								<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col" style="width:10%" class="d-none d-md-table-cell">
-								<?php echo JHtml::_('searchtools.sort', 'COM_FINDER_HEADING_CREATED_BY', 'a.created_by_alias', $listDirn, $listOrder); ?>
+								<?php echo HTMLHelper::_('searchtools.sort', 'COM_FINDER_HEADING_CREATED_BY', 'a.created_by_alias', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col" style="width:10%" class="d-none d-md-table-cell">
-								<?php echo JHtml::_('searchtools.sort', 'COM_FINDER_HEADING_CREATED_ON', 'a.created', $listDirn, $listOrder); ?>
+								<?php echo HTMLHelper::_('searchtools.sort', 'COM_FINDER_HEADING_CREATED_ON', 'a.created', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col" style="width:5%" class="d-none d-md-table-cell">
-								<?php echo JHtml::_('searchtools.sort', 'COM_FINDER_HEADING_MAP_COUNT', 'a.map_count', $listDirn, $listOrder); ?>
+								<?php echo HTMLHelper::_('searchtools.sort', 'COM_FINDER_HEADING_MAP_COUNT', 'a.map_count', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col" style="width:1%" class="d-none d-md-table-cell">
-								<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.filter_id', $listDirn, $listOrder); ?>
+								<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.filter_id', $listDirn, $listOrder); ?>
 							</th>
 						</tr>
 					</thead>
@@ -75,17 +79,17 @@
 						?>
 						<tr class="row<?php echo $i % 2; ?>">
 							<td class="text-center">
-								<?php echo JHtml::_('grid.id', $i, $item->filter_id); ?>
+								<?php echo HTMLHelper::_('grid.id', $i, $item->filter_id); ?>
 							</td>
 							<td class="text-center">
-								<?php echo JHtml::_('jgrid.published', $item->state, $i, 'filters.', $canChange); ?>
+								<?php echo HTMLHelper::_('jgrid.published', $item->state, $i, 'filters.', $canChange); ?>
 							</td>
 							<th scope="row">
 								<?php if ($item->checked_out) : ?>
-									<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'filters.', $canCheckIn); ?>
+									<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'filters.', $canCheckIn); ?>
 								<?php endif; ?>
 								<?php if ($canEdit) : ?>
-									<a href="<?php echo JRoute::_('index.php?option=com_finder&task=filter.edit&filter_id=' . (int) $item->filter_id); ?>">
+									<a href="<?php echo Route::_('index.php?option=com_finder&task=filter.edit&filter_id=' . (int) $item->filter_id); ?>">
 										<?php echo $escapedTitle; ?></a>
 								<?php else : ?>
 									<?php echo $escapedTitle; ?>
@@ -95,7 +99,7 @@
 								<?php echo $item->created_by_alias ?: $item->user_name; ?>
 							</td>
 							<td class="d-none d-md-table-cell">
-								<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
+								<?php echo HTMLHelper::_('date', $item->created, Text::_('DATE_FORMAT_LC4')); ?>
 							</td>
 							<td class="d-none d-md-table-cell">
 								<?php echo $item->map_count; ?>
@@ -114,7 +118,7 @@
 				<?php endif; ?>
 				<input type="hidden" name="task" value="">
 				<input type="hidden" name="boxchecked" value="0">
-				<?php echo JHtml::_('form.token'); ?>
+				<?php echo HTMLHelper::_('form.token'); ?>
 			</div>
 		</div>
 	</div>
diff --git a/administrator/components/com_finder/tmpl/index/default.php b/administrator/components/com_finder/tmpl/index/default.php
index 093b039768190..6d239c982e5c6 100644
--- a/administrator/components/com_finder/tmpl/index/default.php
+++ b/administrator/components/com_finder/tmpl/index/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,6 +11,7 @@
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\Component\Finder\Administrator\Helper\FinderHelperLanguage;
 
 JHtml::_('bootstrap.popover');
@@ -30,7 +31,7 @@
 		</div>
 		<div class="col-md-10">
 			<div id="j-main-container" class="j-main-container">
-				<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 				<table class="table">
 					<caption id="captionTable" class="sr-only">
 						<?php echo Text::_('COM_FINDER_INDEX_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
diff --git a/administrator/components/com_finder/tmpl/indexer/default.php b/administrator/components/com_finder/tmpl/indexer/default.php
index c0b35de438b48..da945a7b07429 100644
--- a/administrator/components/com_finder/tmpl/indexer/default.php
+++ b/administrator/components/com_finder/tmpl/indexer/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/tmpl/maps/default.php b/administrator/components/com_finder/tmpl/maps/default.php
index 2f17fac643bb0..e04f3ead91b6a 100644
--- a/administrator/components/com_finder/tmpl/maps/default.php
+++ b/administrator/components/com_finder/tmpl/maps/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -65,6 +65,11 @@
 								<span class="icon-unpublish" aria-hidden="true"></span>
 								<span class="d-none d-md-inline"><?php echo Text::_('COM_FINDER_MAPS_COUNT_UNPUBLISHED_ITEMS'); ?></span>
 							</th>
+							<?php if (Multilanguage::isEnabled()) : ?>
+								<th scope="col" style="width:10%" class="nowrap d-none d-md-table-cell text-center">
+									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+								</th>
+							<?php endif; ?>
 						</tr>
 					</thead>
 					<tbody>
@@ -79,7 +84,7 @@
 							</td>
 							<th scope="row">
 								<?php
-								if (trim($item->parent_title, '**') === 'Language')
+								if (trim($item->branch_title, '**') === 'Language')
 								{
 									$title = FinderHelperLanguage::branchLanguageTitle($item->title);
 								}
@@ -89,9 +94,7 @@
 									$title = $lang->hasKey($key) ? Text::_($key) : $item->title;
 								}
 								?>
-								<?php if ((int) $item->num_children === 0) : ?>
-									<span class="gi">&mdash;</span>
-								<?php endif; ?>
+								<?php echo str_repeat('<span class="gi">&mdash;</span>', $item->level - 1); ?>
 								<label for="cb<?php echo $i; ?>" style="display:inline-block;">
 									<?php echo $this->escape($title); ?>
 								</label>
@@ -101,16 +104,16 @@
 							</th>
 							<?php if (!$branchFilter) : ?>
 							<td class="text-center btns">
-							<?php if ((int) $item->num_children !== 0) : ?>
+							<?php if ($item->rgt - $item->lft > 1) : ?>
 								<a href="<?php echo Route::_('index.php?option=com_finder&view=maps&filter[branch]=' . $item->id); ?>">
-									<span class="badge <?php if ($item->num_children > 0) echo 'badge-info'; ?>"><?php echo $item->num_children; ?></span></a>
+									<span class="badge badge-info"><?php echo floor(($item->rgt - $item->lft) / 2); ?></span></a>
 							<?php else : ?>
 								-
 							<?php endif; ?>
 							</td>
 							<?php endif; ?>
 							<td class="text-center btns">
-							<?php if ((int) $item->num_children === 0) : ?>
+							<?php if ($item->level > 1) : ?>
 								<a class="badge <?php if ((int) $item->count_published > 0) echo 'badge-success'; ?>" title="<?php echo Text::_('COM_FINDER_MAPS_COUNT_PUBLISHED_ITEMS'); ?>" href="<?php echo Route::_('index.php?option=com_finder&view=index&filter[state]=1&filter[content_map]=' . $item->id); ?>">
 								<?php echo (int) $item->count_published; ?></a>
 							<?php else : ?>
@@ -118,13 +121,18 @@
 							<?php endif; ?>
 							</td>
 							<td class="text-center btns">
-							<?php if ((int) $item->num_children === 0) : ?>
+							<?php if ($item->level > 1) : ?>
 								<a class="badge <?php if ((int) $item->count_unpublished > 0) echo 'badge-danger'; ?>" title="<?php echo Text::_('COM_FINDER_MAPS_COUNT_UNPUBLISHED_ITEMS'); ?>" href="<?php echo Route::_('index.php?option=com_finder&view=index&filter[state]=0&filter[content_map]=' . $item->id); ?>">
 								<?php echo (int) $item->count_unpublished; ?></a>
 							<?php else : ?>
 								-
 							<?php endif; ?>
 							</td>
+							<?php if (Multilanguage::isEnabled()) : ?>
+								<td class="small d-none d-md-table-cell text-center">
+									<?php echo $item->language; ?>
+								</td>
+							<?php endif; ?>
 						</tr>
 						<?php endforeach; ?>
 					</tbody>
diff --git a/administrator/components/com_finder/tmpl/searches/default.php b/administrator/components/com_finder/tmpl/searches/default.php
index af64740cef3a1..cb823ce72110c 100644
--- a/administrator/components/com_finder/tmpl/searches/default.php
+++ b/administrator/components/com_finder/tmpl/searches/default.php
@@ -3,13 +3,14 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
 
 // Include the component HTML helpers.
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
@@ -26,7 +27,7 @@
 		</div>
 		<div class="col-md-10">
 			<div id="j-main-container" class="j-main-container">
-				<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false))); ?>
+				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false))); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-warning">
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
diff --git a/administrator/components/com_finder/tmpl/statistics/default.php b/administrator/components/com_finder/tmpl/statistics/default.php
index 484d4fa079235..7366f61d3b913 100644
--- a/administrator/components/com_finder/tmpl/statistics/default.php
+++ b/administrator/components/com_finder/tmpl/statistics/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/Controller/DatabaseController.php b/administrator/components/com_installer/Controller/DatabaseController.php
index 2831f06f70db9..78b77191e1b9a 100644
--- a/administrator/components/com_installer/Controller/DatabaseController.php
+++ b/administrator/components/com_installer/Controller/DatabaseController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -36,8 +36,8 @@ class DatabaseController extends BaseController
 	 */
 	public function fix()
 	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+		// Check for request forgeries.
+		$this->checkToken();
 
 		// Get items to fix the database.
 		$cid = $this->input->get('cid', array(), 'array');
diff --git a/administrator/components/com_installer/Controller/DiscoverController.php b/administrator/components/com_installer/Controller/DiscoverController.php
index a3ff9b0f6c5c4..0f45e198e60f2 100644
--- a/administrator/components/com_installer/Controller/DiscoverController.php
+++ b/administrator/components/com_installer/Controller/DiscoverController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -30,6 +30,8 @@ class DiscoverController extends BaseController
 	 */
 	public function refresh()
 	{
+		$this->checkToken();
+
 		/* @var \Joomla\Component\Installer\Administrator\Model\DiscoverModel $model */
 		$model = $this->getModel('discover');
 		$model->discover();
@@ -45,6 +47,8 @@ public function refresh()
 	 */
 	public function install()
 	{
+		$this->checkToken();
+
 		/* @var \Joomla\Component\Installer\Administrator\Model\DiscoverModel $model */
 		$model = $this->getModel('discover');
 		$model->discover_install();
@@ -60,6 +64,8 @@ public function install()
 	 */
 	public function purge()
 	{
+		$this->checkToken();
+
 		/* @var \Joomla\Component\Installer\Administrator\Model\DiscoverModel $model */
 		$model = $this->getModel('discover');
 		$model->purge();
diff --git a/administrator/components/com_installer/Controller/DisplayController.php b/administrator/components/com_installer/Controller/DisplayController.php
index fbaa4d1f28013..0acfc8fd5ab88 100644
--- a/administrator/components/com_installer/Controller/DisplayController.php
+++ b/administrator/components/com_installer/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -58,8 +58,6 @@ public function display($cachable = false, $urlparams = false)
 			// Push document object into the view.
 			$view->document = $document;
 
-			// Load the submenu.
-			InstallerHelper::addSubmenu($vName);
 			$view->display();
 		}
 
diff --git a/administrator/components/com_installer/Controller/InstallController.php b/administrator/components/com_installer/Controller/InstallController.php
index d4b21e31042a5..6ee17393073ff 100644
--- a/administrator/components/com_installer/Controller/InstallController.php
+++ b/administrator/components/com_installer/Controller/InstallController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,11 +11,9 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Response\JsonResponse;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 
 /**
@@ -35,7 +33,7 @@ class InstallController extends BaseController
 	public function install()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		/* @var \Joomla\Component\Installer\Administrator\Model\InstallModel $model */
 		$model = $this->getModel('install');
diff --git a/administrator/components/com_installer/Controller/ManageController.php b/administrator/components/com_installer/Controller/ManageController.php
index 0f47b81fc1399..67a43cfa09646 100644
--- a/administrator/components/com_installer/Controller/ManageController.php
+++ b/administrator/components/com_installer/Controller/ManageController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,11 +11,13 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\CMS\Response\JsonResponse;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
+use Joomla\Component\Installer\Administrator\Model\ManageModel;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -49,12 +51,14 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 	 *
 	 * @return  void
 	 *
+	 * @throws  \Exception
+	 *
 	 * @since   1.6
 	 */
 	public function publish()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$ids    = $this->input->get('cid', array(), 'array');
 		$values = array('publish' => 1, 'unpublish' => 0);
@@ -67,7 +71,7 @@ public function publish()
 		}
 		else
 		{
-			/* @var \Joomla\Component\Installer\Administrator\Model\ManageModel $model */
+			/** @var ManageModel $model */
 			$model = $this->getModel('manage');
 
 			// Change the state of the records.
@@ -98,14 +102,16 @@ public function publish()
 	 *
 	 * @return  void
 	 *
+	 * @throws  \Exception
+	 *
 	 * @since   1.5
 	 */
 	public function remove()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
-		/* @var \Joomla\Component\Installer\Administrator\Model\ManageModel $model */
+		/** @var ManageModel $model */
 		$model = $this->getModel('manage');
 
 		$eid = $this->input->get('cid', array(), 'array');
@@ -126,9 +132,9 @@ public function remove()
 	public function refresh()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
-		/* @var \Joomla\Component\Installer\Administrator\Model\ManageModel $model */
+		/** @var ManageModel $model */
 		$model = $this->getModel('manage');
 
 		$uid = $this->input->get('cid', array(), 'array');
@@ -136,4 +142,29 @@ public function refresh()
 		$model->refresh($uid);
 		$this->setRedirect(Route::_('index.php?option=com_installer&view=manage', false));
 	}
+
+	/**
+	 * Load the changelog for a given extension.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function loadChangelog()
+	{
+		/** @var ManageModel $model */
+		$model = $this->getModel('manage');
+
+		$eid    = $this->input->get('eid', 0, 'int');
+		$source = $this->input->get('source', 'manage', 'string');
+
+		if (!$eid)
+		{
+			return;
+		}
+
+		$output = $model->loadChangelog($eid, $source);
+
+		echo (new JsonResponse($output));
+	}
 }
diff --git a/administrator/components/com_installer/Controller/UpdateController.php b/administrator/components/com_installer/Controller/UpdateController.php
index 69a8f1472a62a..68f4838b4862f 100644
--- a/administrator/components/com_installer/Controller/UpdateController.php
+++ b/administrator/components/com_installer/Controller/UpdateController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -37,7 +37,7 @@ class UpdateController extends BaseController
 	public function update()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		/* @var \Joomla\Component\Installer\Administrator\Model\UpdateModel $model */
 		$model = $this->getModel('update');
@@ -84,7 +84,7 @@ public function update()
 	 */
 	public function find()
 	{
-		(Session::checkToken() or Session::checkToken('get')) or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken('request');
 
 		// Get the caching duration.
 		$params        = ComponentHelper::getComponent('com_installer')->getParams();
@@ -120,7 +120,7 @@ public function find()
 	public function purge()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		/* @var \Joomla\Component\Installer\Administrator\Model\UpdateModel $model */
 		$model = $this->getModel('update');
@@ -150,7 +150,7 @@ public function ajax()
 		{
 			$app->setHeader('status', 403, true);
 			$app->sendHeaders();
-			echo Text::_('JINVALID_TOKEN');
+			echo Text::_('JINVALID_TOKEN_NOTICE');
 			$app->close();
 		}
 
diff --git a/administrator/components/com_installer/Controller/UpdatesitesController.php b/administrator/components/com_installer/Controller/UpdatesitesController.php
index 50484c9b61d21..eb769deed58ab 100644
--- a/administrator/components/com_installer/Controller/UpdatesitesController.php
+++ b/administrator/components/com_installer/Controller/UpdatesitesController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -60,7 +60,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 	public function publish()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$ids    = $this->input->get('cid', array(), 'array');
 		$values = array('publish' => 1, 'unpublish' => 0);
@@ -101,7 +101,7 @@ public function publish()
 	public function delete()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$ids = $this->input->get('cid', array(), 'array');
 
@@ -126,7 +126,7 @@ public function delete()
 	public function rebuild()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Rebuild the update sites.
 		$this->getModel('Updatesites')->rebuild();
diff --git a/administrator/components/com_installer/Extension/InstallerComponent.php b/administrator/components/com_installer/Extension/InstallerComponent.php
index a4ea5cccdb428..b1e94ca19f06e 100644
--- a/administrator/components/com_installer/Extension/InstallerComponent.php
+++ b/administrator/components/com_installer/Extension/InstallerComponent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/Field/ExtensionstatusField.php b/administrator/components/com_installer/Field/ExtensionstatusField.php
index 9bd1cf764452d..eddddd370b1c0 100644
--- a/administrator/components/com_installer/Field/ExtensionstatusField.php
+++ b/administrator/components/com_installer/Field/ExtensionstatusField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,17 +11,15 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\Component\Installer\Administrator\Helper\InstallerHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Extension Status field.
  *
  * @since  3.5
  */
-class ExtensionstatusField extends \JFormFieldList
+class ExtensionstatusField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/administrator/components/com_installer/Field/FolderField.php b/administrator/components/com_installer/Field/FolderField.php
index ebb803890a185..83d79f4b8a667 100644
--- a/administrator/components/com_installer/Field/FolderField.php
+++ b/administrator/components/com_installer/Field/FolderField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,17 +11,15 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\Component\Installer\Administrator\Helper\InstallerHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Folder field.
  *
  * @since  3.5
  */
-class FolderField extends \JFormFieldList
+class FolderField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/administrator/components/com_installer/Field/LocationField.php b/administrator/components/com_installer/Field/LocationField.php
index e64c3bc68ed91..a53749f081d9f 100644
--- a/administrator/components/com_installer/Field/LocationField.php
+++ b/administrator/components/com_installer/Field/LocationField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,17 +11,15 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\Component\Installer\Administrator\Helper\InstallerHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Location field.
  *
  * @since  3.5
  */
-class LocationField extends \JFormFieldList
+class LocationField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/administrator/components/com_installer/Field/TypeField.php b/administrator/components/com_installer/Field/TypeField.php
index 6d09ec8ba3357..3574dddb41203 100644
--- a/administrator/components/com_installer/Field/TypeField.php
+++ b/administrator/components/com_installer/Field/TypeField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,17 +11,15 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\Component\Installer\Administrator\Helper\InstallerHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
- * Type field.
+ * Form field for a list of extension types.
  *
  * @since  3.5
  */
-class TypeField extends \JFormFieldList
+class TypeField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/administrator/components/com_installer/Helper/InstallerHelper.php b/administrator/components/com_installer/Helper/InstallerHelper.php
index 311b33081d575..e14d5305185a0 100644
--- a/administrator/components/com_installer/Helper/InstallerHelper.php
+++ b/administrator/components/com_installer/Helper/InstallerHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -22,59 +22,6 @@
  */
 class InstallerHelper
 {
-	/**
-	 * Configure the Linkbar.
-	 *
-	 * @param   string  $vName  The name of the active view.
-	 *
-	 * @return  void
-	 *
-	 * @since   1.6
-	 */
-	public static function addSubmenu($vName = 'install')
-	{
-		\JHtmlSidebar::addEntry(
-			Text::_('COM_INSTALLER_SUBMENU_INSTALL'),
-			'index.php?option=com_installer',
-			$vName == 'install'
-		);
-		\JHtmlSidebar::addEntry(
-			Text::_('COM_INSTALLER_SUBMENU_UPDATE'),
-			'index.php?option=com_installer&view=update',
-			$vName == 'update'
-		);
-		\JHtmlSidebar::addEntry(
-			Text::_('COM_INSTALLER_SUBMENU_MANAGE'),
-			'index.php?option=com_installer&view=manage',
-			$vName == 'manage'
-		);
-		\JHtmlSidebar::addEntry(
-			Text::_('COM_INSTALLER_SUBMENU_DISCOVER'),
-			'index.php?option=com_installer&view=discover',
-			$vName == 'discover'
-		);
-		\JHtmlSidebar::addEntry(
-			Text::_('COM_INSTALLER_SUBMENU_DATABASE'),
-			'index.php?option=com_installer&view=database',
-			$vName == 'database'
-		);
-		\JHtmlSidebar::addEntry(
-			Text::_('COM_INSTALLER_SUBMENU_WARNINGS'),
-			'index.php?option=com_installer&view=warnings',
-			$vName == 'warnings'
-		);
-		\JHtmlSidebar::addEntry(
-			Text::_('COM_INSTALLER_SUBMENU_LANGUAGES'),
-			'index.php?option=com_installer&view=languages',
-			$vName == 'languages'
-		);
-		\JHtmlSidebar::addEntry(
-			Text::_('COM_INSTALLER_SUBMENU_UPDATESITES'),
-			'index.php?option=com_installer&view=updatesites',
-			$vName == 'updatesites'
-		);
-	}
-
 	/**
 	 * Get a list of filter options for the extension types.
 	 *
diff --git a/administrator/components/com_installer/Model/DatabaseModel.php b/administrator/components/com_installer/Model/DatabaseModel.php
index f733fa292921a..f7c47a66d2275 100644
--- a/administrator/components/com_installer/Model/DatabaseModel.php
+++ b/administrator/components/com_installer/Model/DatabaseModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/Model/DiscoverModel.php b/administrator/components/com_installer/Model/DiscoverModel.php
index 24c693a726b78..1213b91976dd3 100644
--- a/administrator/components/com_installer/Model/DiscoverModel.php
+++ b/administrator/components/com_installer/Model/DiscoverModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/Model/InstallModel.php b/administrator/components/com_installer/Model/InstallModel.php
index b640cddbc7f38..0bfb3704621a9 100644
--- a/administrator/components/com_installer/Model/InstallModel.php
+++ b/administrator/components/com_installer/Model/InstallModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/Model/InstallerModel.php b/administrator/components/com_installer/Model/InstallerModel.php
index 4007720276507..6b7e32d86e269 100644
--- a/administrator/components/com_installer/Model/InstallerModel.php
+++ b/administrator/components/com_installer/Model/InstallerModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -189,8 +189,15 @@ protected function translate(&$items)
 						$lang->load("$extension.sys", JPATH_SITE, null, false, true);
 				break;
 				case 'library':
-					$extension = 'lib_' . $item->element;
-						$lang->load("$extension.sys", JPATH_SITE, null, false, true);
+					$parts = explode('/', $item->element);
+					$vendor = (isset($parts[1]) ? $parts[0] : null);
+					$extension = 'lib_' . ($vendor ? implode('_', $parts) : $item->element);
+
+					if (!$lang->load("$extension.sys", $path, null, false, true))
+					{
+						$source = $path . '/libraries/' . ($vendor ? $vendor . '/' . $parts[1] : $item->element);
+						$lang->load("$extension.sys", $source, null, false, true);
+					}
 				break;
 				case 'module':
 					$extension = $item->element;
diff --git a/administrator/components/com_installer/Model/LanguagesModel.php b/administrator/components/com_installer/Model/LanguagesModel.php
index ea27b0ab9751c..bd6bfebdd8c05 100644
--- a/administrator/components/com_installer/Model/LanguagesModel.php
+++ b/administrator/components/com_installer/Model/LanguagesModel.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Administrator
  * @subpackage  com_installer
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/Model/ManageModel.php b/administrator/components/com_installer/Model/ManageModel.php
index 4baa85e51607c..b0a706f4af34a 100644
--- a/administrator/components/com_installer/Model/ManageModel.php
+++ b/administrator/components/com_installer/Model/ManageModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,11 +11,14 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Changelog\Changelog;
 use Joomla\CMS\Extension\ExtensionHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\FileLayout;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\CMS\Table\Extension;
 use Joomla\Component\Templates\Administrator\Table\StyleTable;
 use Joomla\Database\DatabaseQuery;
 
@@ -64,6 +67,8 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 	 *
 	 * @return  void
 	 *
+	 * @throws  \Exception
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState($ordering = 'name', $direction = 'asc')
@@ -94,6 +99,8 @@ protected function populateState($ordering = 'name', $direction = 'asc')
 	 *
 	 * @return  boolean  True on success
 	 *
+	 * @throws  \Exception
+	 *
 	 * @since   1.5
 	 */
 	public function publish(&$eid = array(), $value = 1)
@@ -117,7 +124,7 @@ public function publish(&$eid = array(), $value = 1)
 		}
 
 		// Get a table object for the extension type
-		$table = new \Joomla\CMS\Table\Extension($this->getDbo());
+		$table = new Extension($this->getDbo());
 
 		// Enable the extension in the table and store it in the database
 		foreach ($eid as $i => $id)
@@ -145,6 +152,10 @@ public function publish(&$eid = array(), $value = 1)
 			{
 				$table->enabled = $value;
 			}
+		
+			$context = $this->option . '.' . $this->name;
+			JPluginHelper::importPlugin('extension');
+			JEventDispatcher::getInstance()->trigger('onExtensionChangeState', array($context, $eid, $value));
 
 			if (!$table->store())
 			{
@@ -182,7 +193,7 @@ public function refresh($eid)
 
 		// Get an installer object for the extension type
 		$installer = Installer::getInstance();
-		$result = 0;
+		$result    = 0;
 
 		// Uninstall the chosen extensions
 		foreach ($eid as $id)
@@ -200,6 +211,8 @@ public function refresh($eid)
 	 *
 	 * @return  boolean  True on success
 	 *
+	 * @throws  \Exception
+	 *
 	 * @since   1.5
 	 */
 	public function remove($eid = array())
@@ -222,10 +235,10 @@ public function remove($eid = array())
 
 		// Get an installer object for the extension type
 		$installer = Installer::getInstance();
-		$row = new \Joomla\CMS\Table\Extension($this->getDbo());
+		$row       = new \Joomla\CMS\Table\Extension($this->getDbo());
 
 		// Uninstall the chosen extensions
-		$msgs = array();
+		$msgs   = array();
 		$result = false;
 
 		foreach ($eid as $id)
@@ -235,7 +248,7 @@ public function remove($eid = array())
 			$result = false;
 
 			$langstring = 'COM_INSTALLER_TYPE_TYPE_' . strtoupper($row->type);
-			$rowtype = Text::_($langstring);
+			$rowtype    = Text::_($langstring);
 
 			if (strpos($rowtype, $langstring) !== false)
 			{
@@ -376,4 +389,79 @@ protected function getListQuery()
 
 		return $query;
 	}
+
+	/**
+	 * Load the changelog details for a given extension.
+	 *
+	 * @param   integer  $eid     The extension ID
+	 * @param   string   $source  The view the changelog is for, this is used to determine which version number to show
+	 *
+	 * @return  string  The output to show in the modal.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function loadChangelog($eid, $source)
+	{
+		// Get the changelog URL
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select(
+				$db->quoteName(
+					array(
+						'extensions.element',
+						'extensions.type',
+						'extensions.changelogurl',
+						'extensions.manifest_cache',
+						'extensions.client_id'
+					)
+				)
+			)
+			->select($db->quoteName('updates.version', 'updateVersion'))
+			->from($db->quoteName('#__extensions', 'extensions'))
+			->leftJoin(
+				$db->quoteName('#__updates', 'updates')
+				. ' ON ' . $db->quoteName('updates.extension_id') . ' = ' . $db->quoteName('extensions.extension_id')
+			)
+			->where($db->quoteName('extensions.extension_id') . ' = ' . (int) $eid);
+		$db->setQuery($query);
+
+		$extensions = $db->loadObjectList();
+		$this->translate($extensions);
+		$extension = array_shift($extensions);
+
+		if (!$extension->changelogurl)
+		{
+			return '';
+		}
+
+		$changelog = new Changelog;
+		$changelog->setVersion($source === 'manage' ? $extension->version : $extension->updateVersion);
+		$changelog->loadFromXml($extension->changelogurl);
+
+		// Read all the entries
+		$entries = array(
+			'security' => array(),
+			'fix'      => array(),
+			'addition' => array(),
+			'change'   => array(),
+			'remove'   => array(),
+			'language' => array(),
+			'note'     => array()
+		);
+
+		array_walk(
+			$entries,
+			function (&$value, $name) use ($changelog) {
+				if ($field = $changelog->get($name))
+				{
+					$value = $changelog->get($name)->data;
+				}
+			}
+		);
+
+		$layout = new FileLayout('joomla.installer.changelog');
+		$output = $layout->render($entries);
+
+		return $output;
+	}
 }
diff --git a/administrator/components/com_installer/Model/UpdateModel.php b/administrator/components/com_installer/Model/UpdateModel.php
index 96550956db0e2..5b328d7dc5a75 100644
--- a/administrator/components/com_installer/Model/UpdateModel.php
+++ b/administrator/components/com_installer/Model/UpdateModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -459,6 +459,16 @@ private function install($update)
 		$installer = Installer::getInstance();
 		$update->set('type', $package['type']);
 
+		// Check the package
+		$check = InstallerHelper::isChecksumValid($package['packagefile'], $update);
+
+		// The validation was not successful. Just a warning for now.
+		// TODO: In Joomla 4 this will abort the installation
+		if ($check === InstallerHelper::HASH_NOT_VALIDATED)
+		{
+			$app->enqueueMessage(Text::_('COM_INSTALLER_INSTALL_CHECKSUM_WRONG'), 'error');
+		}
+
 		// Install the package
 		if (!$installer->update($package['dir']))
 		{
diff --git a/administrator/components/com_installer/Model/UpdatesitesModel.php b/administrator/components/com_installer/Model/UpdatesitesModel.php
index 3215389eefa0a..ac34a2958385e 100644
--- a/administrator/components/com_installer/Model/UpdatesitesModel.php
+++ b/administrator/components/com_installer/Model/UpdatesitesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -337,7 +337,10 @@ public function rebuild()
 						$query = $db->getQuery(true)
 							->select($db->quoteName('extension_id'))
 							->from($db->quoteName('#__extensions'))
-							->where($db->quoteName('name') . ' = ' . $db->quote($manifest->name))
+							->where('(' 
+								. $db->quoteName('name') . ' = ' . $db->quote($manifest->name) 
+								. ' OR ' . $db->quoteName('name') . ' = ' . $db->quote($manifest->packagename) 
+								. ')' )
 							->where($db->quoteName('type') . ' = ' . $db->quote($manifest['type']))
 							->where($db->quoteName('extension_id') . ' NOT IN (' . $joomlaCoreExtensionIds . ')')
 							->where($db->quoteName('state') . ' != -1');
diff --git a/administrator/components/com_installer/Model/WarningsModel.php b/administrator/components/com_installer/Model/WarningsModel.php
index 3349eae63c0a9..2de105dc783e4 100644
--- a/administrator/components/com_installer/Model/WarningsModel.php
+++ b/administrator/components/com_installer/Model/WarningsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/Service/HTML/Manage.php b/administrator/components/com_installer/Service/HTML/Manage.php
index bd7767fce2c53..9ab1d7da2b7a7 100644
--- a/administrator/components/com_installer/Service/HTML/Manage.php
+++ b/administrator/components/com_installer/Service/HTML/Manage.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/Service/HTML/Updatesites.php b/administrator/components/com_installer/Service/HTML/Updatesites.php
index dcab1f4cba74f..76fb46b8cea94 100644
--- a/administrator/components/com_installer/Service/HTML/Updatesites.php
+++ b/administrator/components/com_installer/Service/HTML/Updatesites.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/View/Database/HtmlView.php b/administrator/components/com_installer/View/Database/HtmlView.php
index 4feb61e748dc4..b3778a238e110 100644
--- a/administrator/components/com_installer/View/Database/HtmlView.php
+++ b/administrator/components/com_installer/View/Database/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/View/Discover/HtmlView.php b/administrator/components/com_installer/View/Discover/HtmlView.php
index 4c81893949df9..6171fb6c364ce 100644
--- a/administrator/components/com_installer/View/Discover/HtmlView.php
+++ b/administrator/components/com_installer/View/Discover/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -70,8 +70,6 @@ protected function addToolbar()
 		ToolbarHelper::custom('discover.refresh', 'refresh', 'refresh', 'COM_INSTALLER_TOOLBAR_DISCOVER', false);
 		ToolbarHelper::divider();
 
-		\JHtmlSidebar::setAction('index.php?option=com_installer&view=discover');
-
 		parent::addToolbar();
 
 		ToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_DISCOVER');
diff --git a/administrator/components/com_installer/View/Install/HtmlView.php b/administrator/components/com_installer/View/Install/HtmlView.php
index a93b8b60cdd14..cbc2822378d09 100644
--- a/administrator/components/com_installer/View/Install/HtmlView.php
+++ b/administrator/components/com_installer/View/Install/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/View/Installer/HtmlView.php b/administrator/components/com_installer/View/Installer/HtmlView.php
index 821b5738a4148..e385693dd7adf 100644
--- a/administrator/components/com_installer/View/Installer/HtmlView.php
+++ b/administrator/components/com_installer/View/Installer/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -111,8 +111,5 @@ protected function addToolbar()
 			ToolbarHelper::preferences('com_installer');
 			ToolbarHelper::divider();
 		}
-
-		// Render side bar.
-		$this->sidebar = \JHtmlSidebar::render();
 	}
 }
diff --git a/administrator/components/com_installer/View/Languages/HtmlView.php b/administrator/components/com_installer/View/Languages/HtmlView.php
index ab792d044347f..80f46b7485e5a 100644
--- a/administrator/components/com_installer/View/Languages/HtmlView.php
+++ b/administrator/components/com_installer/View/Languages/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/View/Manage/HtmlView.php b/administrator/components/com_installer/View/Manage/HtmlView.php
index 1bf14267e7041..c94de5562bfb3 100644
--- a/administrator/components/com_installer/View/Manage/HtmlView.php
+++ b/administrator/components/com_installer/View/Manage/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -82,8 +82,6 @@ protected function addToolbar()
 			ToolbarHelper::divider();
 		}
 
-		\JHtmlSidebar::setAction('index.php?option=com_installer&view=manage');
-
 		parent::addToolbar();
 		ToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_MANAGE');
 	}
diff --git a/administrator/components/com_installer/View/Update/HtmlView.php b/administrator/components/com_installer/View/Update/HtmlView.php
index cd8da65ed9681..ed85362446d53 100644
--- a/administrator/components/com_installer/View/Update/HtmlView.php
+++ b/administrator/components/com_installer/View/Update/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -81,8 +81,6 @@ protected function addToolbar()
 		ToolbarHelper::custom('update.purge', 'purge', 'purge', 'COM_INSTALLER_TOOLBAR_PURGE', false);
 		ToolbarHelper::divider();
 
-		\JHtmlSidebar::setAction('index.php?option=com_installer&view=manage');
-
 		parent::addToolbar();
 		ToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATE');
 	}
diff --git a/administrator/components/com_installer/View/Updatesites/HtmlView.php b/administrator/components/com_installer/View/Updatesites/HtmlView.php
index 2c30599b82958..dcfe7829136ed 100644
--- a/administrator/components/com_installer/View/Updatesites/HtmlView.php
+++ b/administrator/components/com_installer/View/Updatesites/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -88,8 +88,6 @@ protected function addToolbar()
 			ToolbarHelper::custom('updatesites.rebuild', 'refresh.png', 'refresh_f2.png', 'JTOOLBAR_REBUILD', false);
 		}
 
-		\JHtmlSidebar::setAction('index.php?option=com_installer&view=updatesites');
-
 		parent::addToolbar();
 		ToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATESITES');
 	}
diff --git a/administrator/components/com_installer/View/Warnings/HtmlView.php b/administrator/components/com_installer/View/Warnings/HtmlView.php
index 28ef41ba10a20..117e87fd9d47a 100644
--- a/administrator/components/com_installer/View/Warnings/HtmlView.php
+++ b/administrator/components/com_installer/View/Warnings/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/helpers/installer.php b/administrator/components/com_installer/helpers/installer.php
index 5782954a3b90b..2f877afef44ec 100644
--- a/administrator/components/com_installer/helpers/installer.php
+++ b/administrator/components/com_installer/helpers/installer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/installer.xml b/administrator/components/com_installer/installer.xml
index 1072e086fac56..cb93aac8d7c6b 100644
--- a/administrator/components/com_installer/installer.xml
+++ b/administrator/components/com_installer/installer.xml
@@ -3,7 +3,7 @@
 	<name>com_installer</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_installer/services/provider.php b/administrator/components/com_installer/services/provider.php
index 7a4224b83ff7a..e0e26c8366fc2 100644
--- a/administrator/components/com_installer/services/provider.php
+++ b/administrator/components/com_installer/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/tmpl/database/default.php b/administrator/components/com_installer/tmpl/database/default.php
index 65c85630176dc..01c3da3de43c5 100644
--- a/administrator/components/com_installer/tmpl/database/default.php
+++ b/administrator/components/com_installer/tmpl/database/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -24,10 +24,7 @@
 <div id="installer-database" class="clearfix">
 	<form action="<?php echo Route::_('index.php?option=com_installer&view=database'); ?>" method="post" name="adminForm" id="adminForm">
 		<div class="row">
-			<div id="j-sidebar-container" class="col-md-2">
-				<?php echo $this->sidebar; ?>
-			</div>
-			<div class="col-md-10">
+			<div class="col-md-12">
 				<div id="j-main-container" class="j-main-container">
 					<div class="control-group">
 						<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
diff --git a/administrator/components/com_installer/tmpl/discover/default.php b/administrator/components/com_installer/tmpl/discover/default.php
index f853060289ff2..3fd27d66b140e 100644
--- a/administrator/components/com_installer/tmpl/discover/default.php
+++ b/administrator/components/com_installer/tmpl/discover/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -22,10 +22,7 @@
 <div id="installer-discover" class="clearfix">
 	<form action="<?php echo Route::_('index.php?option=com_installer&view=discover'); ?>" method="post" name="adminForm" id="adminForm">
 		<div class="row">
-			<div id="j-sidebar-container" class="col-md-2">
-				<?php echo $this->sidebar; ?>
-			</div>
-			<div class="col-md-10">
+			<div class="col-md-12">
 				<div id="j-main-container" class="j-main-container">
 					<?php if ($this->showMessage) : ?>
 						<?php echo $this->loadTemplate('message'); ?>
diff --git a/administrator/components/com_installer/tmpl/discover/default_item.php b/administrator/components/com_installer/tmpl/discover/default_item.php
index 180487ee7f861..10ec81b90d791 100644
--- a/administrator/components/com_installer/tmpl/discover/default_item.php
+++ b/administrator/components/com_installer/tmpl/discover/default_item.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/tmpl/install/default.php b/administrator/components/com_installer/tmpl/install/default.php
index 1d53f35020689..03b2962e83acc 100644
--- a/administrator/components/com_installer/tmpl/install/default.php
+++ b/administrator/components/com_installer/tmpl/install/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -31,10 +31,7 @@
 
 	<form enctype="multipart/form-data" action="<?php echo Route::_('index.php?option=com_installer&view=install'); ?>" method="post" name="adminForm" id="adminForm">
 		<div class="row">
-			<div id="j-sidebar-container" class="col-md-2">
-				<?php echo $this->sidebar; ?>
-			</div>
-			<div class="col-md-10">
+			<div class="col-md-12">
 				<div id="j-main-container" class="j-main-container">
 					<?php // Render messages set by extension install scripts here ?>
 					<?php if ($this->showMessage) : ?>
diff --git a/administrator/components/com_installer/tmpl/installer/default_ftp.php b/administrator/components/com_installer/tmpl/installer/default_ftp.php
index efc78402c7aea..c9e491d3b79f2 100644
--- a/administrator/components/com_installer/tmpl/installer/default_ftp.php
+++ b/administrator/components/com_installer/tmpl/installer/default_ftp.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,7 +12,7 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<fieldset title="<?php echo Text::_('COM_INSTALLER_MSG_DESCFTPTITLE'); ?>">
+<fieldset>
 	<legend><?php echo Text::_('COM_INSTALLER_MSG_DESCFTPTITLE'); ?></legend>
 
 	<?php echo Text::_('COM_INSTALLER_MSG_DESCFTP'); ?>
diff --git a/administrator/components/com_installer/tmpl/installer/default_message.php b/administrator/components/com_installer/tmpl/installer/default_message.php
index d7a25f6592d99..c99ddbd703fc4 100644
--- a/administrator/components/com_installer/tmpl/installer/default_message.php
+++ b/administrator/components/com_installer/tmpl/installer/default_message.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/tmpl/languages/default.php b/administrator/components/com_installer/tmpl/languages/default.php
index a4b102b2b7bc4..ac3ae2ff108ac 100644
--- a/administrator/components/com_installer/tmpl/languages/default.php
+++ b/administrator/components/com_installer/tmpl/languages/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -22,10 +22,7 @@
 <div id="installer-languages" class="clearfix">
 	<form action="<?php echo Route::_('index.php?option=com_installer&view=languages'); ?>" method="post" name="adminForm" id="adminForm">
 		<div class="row">
-			<div id="j-sidebar-container" class="col-md-2">
-				<?php echo $this->sidebar; ?>
-			</div>
-			<div class="col-md-10">
+			<div class="col-md-12">
 				<div id="j-main-container" class="j-main-container">
 					<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false))); ?>
 					<?php if (empty($this->items)) : ?>
diff --git a/administrator/components/com_installer/tmpl/manage/default.php b/administrator/components/com_installer/tmpl/manage/default.php
index 08717b91bd46d..a510f977ae020 100644
--- a/administrator/components/com_installer/tmpl/manage/default.php
+++ b/administrator/components/com_installer/tmpl/manage/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -22,10 +22,7 @@
 <div id="installer-manage" class="clearfix">
 	<form action="<?php echo Route::_('index.php?option=com_installer&view=manage'); ?>" method="post" name="adminForm" id="adminForm">
 		<div class="row">
-			<div id="j-sidebar-container" class="col-md-2">
-				<?php echo $this->sidebar; ?>
-			</div>
-			<div class="col-md-10">
+			<div class="col-md-12">
 				<div id="j-main-container" class="j-main-container">
 					<?php if ($this->showMessage) : ?>
 						<?php echo $this->loadTemplate('message'); ?>
@@ -107,14 +104,34 @@
 									<?php echo $item->type_translated; ?>
 								</td>
 								<td class="d-none d-md-table-cell">
-									<?php echo @$item->version != '' ? $item->version : '&#160;'; ?>
+									<?php if ($item->version !== '') : ?>
+										<?php if ($item->changelogurl !== null) : ?>
+											<a href="#changelogModal" onclick="Joomla.loadChangelog(<?php echo $item->extension_id; ?>, 'manage'); return false;" data-toggle="modal">
+												<?php echo $item->version?>
+											</a>
+											<?php
+											echo HTMLHelper::_(
+												'bootstrap.renderModal',
+												'changelogModal',
+												array(
+													'title' => Text::sprintf('COM_INSTALLER_CHANGELOG_TITLE', $item->name, $item->version),
+												),
+												''
+											);
+											?>
+										<?php else : ?>
+											<?php echo $item->version; ?>
+										<?php endif; ?>
+									<?php else :
+										echo '&#160;';
+									endif; ?>
 								</td>
 								<td class="d-none d-md-table-cell">
-									<?php echo @$item->creationDate != '' ? $item->creationDate : '&#160;'; ?>
+									<?php echo isset($item->creationDate) && $item->creationDate !== '' ? $item->creationDate : '&#160;'; ?>
 								</td>
 								<td class="d-none d-md-table-cell">
 									<span class="editlinktip hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', Text::_('COM_INSTALLER_AUTHOR_INFORMATION'), $item->author_info, 0); ?>">
-										<?php echo @$item->author != '' ? $item->author : '&#160;'; ?>
+										<?php echo isset($item->author) && $item->author !== '' ? $item->author : '&#160;'; ?>
 									</span>
 								</td>
 								<td class="d-none d-md-table-cell">
diff --git a/administrator/components/com_installer/tmpl/update/default.php b/administrator/components/com_installer/tmpl/update/default.php
index 6b8e3a0f8d26a..cd4ca6ddf9966 100644
--- a/administrator/components/com_installer/tmpl/update/default.php
+++ b/administrator/components/com_installer/tmpl/update/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -22,22 +22,18 @@
 <div id="installer-update" class="clearfix">
 	<form action="<?php echo Route::_('index.php?option=com_installer&view=update'); ?>" method="post" name="adminForm" id="adminForm">
 		<div class="row">
-			<div id="j-sidebar-container" class="col-md-2">
-				<?php echo $this->sidebar; ?>
-			</div>
-			<div class="col-md-10">
+			<div class="col-md-12">
 				<div id="j-main-container" class="j-main-container">
 					<?php if ($this->showMessage) : ?>
 						<?php echo $this->loadTemplate('message'); ?>
 					<?php endif; ?>
-
 					<?php if ($this->ftp) : ?>
 						<?php echo $this->loadTemplate('ftp'); ?>
 					<?php endif; ?>
 					<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 					<?php if (empty($this->items)) : ?>
 						<div class="alert alert-info">
-							<?php echo JText::_('COM_INSTALLER_MSG_UPDATE_NOUPDATES'); ?>
+							<?php echo Text::_('COM_INSTALLER_MSG_UPDATE_NOUPDATES'); ?>
 						</div>
 					<?php else : ?>
 						<table class="table">
@@ -46,9 +42,9 @@
 							</caption>
 							<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<th style="width:1%" class="text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
-								</td>
+								</th>
 								<th scope="col">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_INSTALLER_HEADING_NAME', 'u.name', $listDirn, $listOrder); ?>
 								</th>
@@ -64,8 +60,11 @@
 								<th scope="col">
 									<?php echo Text::_('COM_INSTALLER_NEW_VERSION'); ?>
 								</th>
-								<th scope="col" class="d-none d-md-table-cell">
-									<?php echo HTMLHelper::_('searchtools.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder_translated', $listDirn, $listOrder); ?>
+								<th scope="col">
+									<?php echo Text::_('COM_INSTALLER_CHANGELOG'); ?>
+								</th>
+								<th class="d-none d-md-table-cell">
+									<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder_translated', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col" class="d-none d-md-table-cell">
 									<?php echo Text::_('COM_INSTALLER_HEADING_INSTALLTYPE'); ?>
@@ -105,6 +104,28 @@
 									<td>
 										<span class="badge badge-success"><?php echo $item->version; ?></span>
 									</td>
+									<td class="hidden-sm-down text-center">
+										<?php if ($item->changelogurl !== null) : ?>
+                                        <a href="#changelogModal" class="btn btn-info btn-xs" onclick="Joomla.loadChangelog(<?php echo $item->extension_id; ?>, 'update'); return false;" data-toggle="modal">
+	                                        <?php echo Text::_('COM_INSTALLER_CHANGELOG'); ?>
+                                        </a>
+										<?php
+										echo HTMLHelper::_(
+											'bootstrap.renderModal',
+											'changelogModal',
+											array(
+												'title' => Text::sprintf('COM_INSTALLER_CHANGELOG_TITLE', $item->name, $item->version),
+											),
+											''
+										);
+										?>
+										<?php else:?>
+										<span>
+											<?php echo Text::_('COM_INSTALLER_TYPE_NONAPPLICABLE')?>
+										</span>
+
+										<?php endif; ?>
+									</td>
 									<td class="d-none d-md-table-cell">
 										<?php echo $item->folder_translated; ?>
 									</td>
diff --git a/administrator/components/com_installer/tmpl/updatesites/default.php b/administrator/components/com_installer/tmpl/updatesites/default.php
index eb9e2d1047e55..e295ab7304d09 100644
--- a/administrator/components/com_installer/tmpl/updatesites/default.php
+++ b/administrator/components/com_installer/tmpl/updatesites/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -22,10 +22,7 @@
 <div id="installer-manage" class="clearfix">
 	<form action="<?php echo Route::_('index.php?option=com_installer&view=updatesites'); ?>" method="post" name="adminForm" id="adminForm">
 		<div class="row">
-			<div id="j-sidebar-container" class="col-md-2">
-				<?php echo $this->sidebar; ?>
-			</div>
-			<div class="col-md-10">
+			<div class="col-md-12">
 				<div id="j-main-container" class="j-main-container">
 					<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 					<?php if (empty($this->items)) : ?>
diff --git a/administrator/components/com_installer/tmpl/warnings/default.php b/administrator/components/com_installer/tmpl/warnings/default.php
index 29e33bfee5c81..2c90198305349 100644
--- a/administrator/components/com_installer/tmpl/warnings/default.php
+++ b/administrator/components/com_installer/tmpl/warnings/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,10 +17,7 @@
 <div id="installer-warnings" class="clearfix">
 	<form action="<?php echo Route::_('index.php?option=com_installer&view=warnings'); ?>" method="post" name="adminForm" id="adminForm">
 		<div class="row">
-			<div id="j-sidebar-container" class="col-md-2">
-				<?php echo $this->sidebar; ?>
-			</div>
-			<div class="col-md-10">
+			<div class="col-md-12">
 				<div id="j-main-container" class="j-main-container">
 					<?php if (count($this->messages)) : ?>
 						<?php foreach ($this->messages as $message) : ?>
diff --git a/administrator/components/com_joomlaupdate/Controller/DisplayController.php b/administrator/components/com_joomlaupdate/Controller/DisplayController.php
index a0ef90caf6682..858bb159cc8c2 100644
--- a/administrator/components/com_joomlaupdate/Controller/DisplayController.php
+++ b/administrator/components/com_joomlaupdate/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/Controller/UpdateController.php b/administrator/components/com_joomlaupdate/Controller/UpdateController.php
index df306ec332ea5..71244b0483fe4 100644
--- a/administrator/components/com_joomlaupdate/Controller/UpdateController.php
+++ b/administrator/components/com_joomlaupdate/Controller/UpdateController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -36,7 +36,7 @@ class UpdateController extends BaseController
 	 */
 	public function download()
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
 		$options['text_file'] = 'joomla_update.php';
@@ -55,12 +55,30 @@ public function download()
 		$this->_applyCredentials();
 
 		/* @var \Joomla\Component\Joomlaupdate\Administrator\Model\UpdateModel $model */
-		$model = $this->getModel('Update');
-		$file = $model->download();
+		$model  = $this->getModel('Update');
+		$result = $model->download();
+		$file   = $result['basename'];
 
 		$message = null;
 		$messageType = null;
 
+		// The validation was not successful for now just a warning.
+		// TODO: In Joomla 4 this will abort the installation
+		if ($result['check'] === false)
+		{
+			$message = Text::_('COM_JOOMLAUPDATE_VIEW_UPDATE_CHECKSUM_WRONG');
+			$messageType = 'warning';
+
+			try
+			{
+				Log::add($message, Log::INFO, 'Update');
+			}
+			catch (\RuntimeException $exception)
+			{
+				// Informational log only
+			}
+		}
+
 		if ($file)
 		{
 			$this->app->setUserState('com_joomlaupdate.file', $file);
@@ -95,7 +113,7 @@ public function download()
 	 */
 	public function install()
 	{
-		Session::checkToken('get') or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken('get');
 
 		$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
 		$options['text_file'] = 'joomla_update.php';
@@ -228,7 +246,7 @@ public function cleanup()
 	public function purge()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Purge updates
 		/* @var \Joomla\Component\Joomlaupdate\Administrator\Model\UpdateModel $model */
@@ -249,7 +267,7 @@ public function purge()
 	public function upload()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Did a non Super User tried to upload something (a.k.a. pathetic hacking attempt)?
 		Factory::getUser()->authorise('core.admin') or jexit(Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'));
@@ -284,7 +302,7 @@ public function upload()
 	public function captive()
 	{
 		// Check for request forgeries
-		Session::checkToken('get') or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken('get');
 
 		// Did a non Super User tried to upload something (a.k.a. pathetic hacking attempt)?
 		if (!Factory::getUser()->authorise('core.admin'))
@@ -316,7 +334,7 @@ public function captive()
 	public function confirm()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Did a non Super User tried to upload something (a.k.a. pathetic hacking attempt)?
 		if (!$this->app->getIdentity()->authorise('core.admin'))
@@ -446,7 +464,7 @@ protected function _applyCredentials()
 	public function finaliseconfirm()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Did a non Super User try do this?
 		if (!Factory::getUser()->authorise('core.admin'))
@@ -508,7 +526,7 @@ public function fetchExtensionCompatibility()
 		{
 			echo new JsonResponse($updateFileUrl);
 		}
-		catch (Exception $e)
+		catch (\Exception $e)
 		{
 			echo $e;
 		}
diff --git a/administrator/components/com_joomlaupdate/Dispatcher/Dispatcher.php b/administrator/components/com_joomlaupdate/Dispatcher/Dispatcher.php
new file mode 100644
index 0000000000000..8c9b08b3faba6
--- /dev/null
+++ b/administrator/components/com_joomlaupdate/Dispatcher/Dispatcher.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Joomlaupdate\Administrator\Dispatcher;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Access\Exception\NotAllowed;
+use Joomla\CMS\Dispatcher\ComponentDispatcher;
+
+/**
+ * ComponentDispatcher class for com_admin
+ *
+ * @since  4.0.0
+ */
+class Dispatcher extends ComponentDispatcher
+{
+	/**
+	 * Joomla Update is checked for core.admin rights - not the usual core.manage
+	 *
+	 * @return  void
+	 */
+	protected function checkAccess()
+	{
+		// Check the user has permission to access this component if in the backend
+		if ($this->app->isClient('administrator') && !$this->app->getIdentity()->authorise('core.admin', $this->option))
+		{
+			throw new NotAllowed($this->app->getLanguage()->_('JERROR_ALERTNOAUTHOR'), 403);
+		}
+	}
+}
diff --git a/administrator/components/com_joomlaupdate/Helper/Select.php b/administrator/components/com_joomlaupdate/Helper/Select.php
index 3bdb466263d27..0a3da5bad8771 100644
--- a/administrator/components/com_joomlaupdate/Helper/Select.php
+++ b/administrator/components/com_joomlaupdate/Helper/Select.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/Model/UpdateModel.php
index ddeaad13abd80..848c9980fdf41 100644
--- a/administrator/components/com_joomlaupdate/Model/UpdateModel.php
+++ b/administrator/components/com_joomlaupdate/Model/UpdateModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -21,6 +21,7 @@
 use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Http\HttpFactory;
 use Joomla\CMS\Installer\Installer;
+use Joomla\CMS\Installer\InstallerHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
@@ -180,7 +181,7 @@ public function getUpdateInformation()
 			'installed' => \JVERSION,
 			'latest'    => null,
 			'object'    => null,
-			'hasUpdate' => false
+			'hasUpdate' => false,
 		);
 
 		// Fetch the update information from the database.
@@ -272,7 +273,7 @@ public function purge()
 	/**
 	 * Downloads the update package to the site.
 	 *
-	 * @return  boolean|string  False on failure, basename of the file in any other case.
+	 * @return  array
 	 *
 	 * @since   2.5.4
 	 */
@@ -299,8 +300,9 @@ public function download()
 		}
 
 		// Find the path to the temp directory and the local package.
-		$tempdir = Factory::getApplication()->get('tmp_path');
-		$target  = $tempdir . '/' . $basename;
+		$tempdir  = Factory::getApplication()->get('tmp_path');
+		$target   = $tempdir . '/' . $basename;
+		$response = [];
 
 		// Do we have a cached file?
 		$exists = File::exists($target);
@@ -317,7 +319,7 @@ public function download()
 				$mirror++;
 			}
 
-			return $download;
+			$response['basename'] = $download;
 		}
 		else
 		{
@@ -335,12 +337,49 @@ public function download()
 					$mirror++;
 				}
 
-				return $download;
+				$response['basename'] = $download;
 			}
 
 			// Yes, it's there, skip downloading.
-			return $basename;
+			$response['basename'] = $basename;
 		}
+
+		$response['check'] = $this->isChecksumValid($target, $updateInfo['object']);
+
+		return $response;
+	}
+
+	/**
+	 * Return the result of the checksum of a package with the SHA256/SHA384/SHA512 tags in the update server manifest
+	 *
+	 * @param   string  $packagefile   Location of the package to be installed
+	 * @param   Update  $updateObject  The Update Object
+	 *
+	 * @return  boolean  False in case the validation did not work; true in any other case.
+	 *
+	 * @note    This method has been forked from (JInstallerHelper::isChecksumValid) so it
+	 *          does not depend on an up-to-date InstallerHelper at the update time
+	 *
+	 * @since   3.9.0
+	 */
+	private function isChecksumValid($packagefile, $updateObject)
+	{
+		$hashes = array('sha256', 'sha384', 'sha512');
+		foreach ($hashes as $hash)
+		{
+			if ($updateObject->get($hash, false))
+			{
+				$hashPackage = hash_file($hash, $packagefile);
+				$hashRemote  = $updateObject->$hash->_data;
+				if ($hashPackage !== $hashRemote)
+				{
+					// Return false in case the hash did not match
+					return false;
+				}
+			}
+		}
+		// Well nothing was provided or all worked
+		return true;
 	}
 
 	/**
diff --git a/administrator/components/com_joomlaupdate/View/Joomlaupdate/HtmlView.php b/administrator/components/com_joomlaupdate/View/Joomlaupdate/HtmlView.php
index 30b633a1ee612..c695c36c5e389 100644
--- a/administrator/components/com_joomlaupdate/View/Joomlaupdate/HtmlView.php
+++ b/administrator/components/com_joomlaupdate/View/Joomlaupdate/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/View/Update/HtmlView.php b/administrator/components/com_joomlaupdate/View/Update/HtmlView.php
index e19d8ed5b5045..9c7a11397c681 100644
--- a/administrator/components/com_joomlaupdate/View/Update/HtmlView.php
+++ b/administrator/components/com_joomlaupdate/View/Update/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/View/Upload/HtmlView.php b/administrator/components/com_joomlaupdate/View/Upload/HtmlView.php
index d980b709753c0..d43bb96f3950c 100644
--- a/administrator/components/com_joomlaupdate/View/Upload/HtmlView.php
+++ b/administrator/components/com_joomlaupdate/View/Upload/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/joomlaupdate.xml b/administrator/components/com_joomlaupdate/joomlaupdate.xml
index a35accbd79c10..50e968a6c90a1 100644
--- a/administrator/components/com_joomlaupdate/joomlaupdate.xml
+++ b/administrator/components/com_joomlaupdate/joomlaupdate.xml
@@ -3,7 +3,7 @@
 	<name>com_joomlaupdate</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2012</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_joomlaupdate/restore_finalisation.php b/administrator/components/com_joomlaupdate/restore_finalisation.php
index 929671fda816f..d822ecdf29428 100644
--- a/administrator/components/com_joomlaupdate/restore_finalisation.php
+++ b/administrator/components/com_joomlaupdate/restore_finalisation.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
  * Important Notes:
diff --git a/administrator/components/com_joomlaupdate/services/provider.php b/administrator/components/com_joomlaupdate/services/provider.php
index c9e34bd5a0e67..7507de9b26d69 100644
--- a/administrator/components/com_joomlaupdate/services/provider.php
+++ b/administrator/components/com_joomlaupdate/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/complete.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/complete.php
index 306df1e7827b0..cef581f9a7564 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/complete.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/complete.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default.php
index 819797bfd2d7e..0211840f31e12 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_nodownload.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_nodownload.php
index 05be6a6fab7c2..5e8cce4e40a2c 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_nodownload.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_nodownload.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php
index 54ed79ad163d3..a70db094201eb 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php
index b654a96073cdd..7b7940003c03b 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php
index 706cb7f3343c8..967c4d08ba8ef 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_updatemefirst.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_updatemefirst.php
index dba036fbd0dad..dc1af201ce75f 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_updatemefirst.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_updatemefirst.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php
index 4b43e7f35deea..4a42b89dce34f 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/tmpl/update/default.php b/administrator/components/com_joomlaupdate/tmpl/update/default.php
index e6bb2c7d056df..e85c98ec70eec 100644
--- a/administrator/components/com_joomlaupdate/tmpl/update/default.php
+++ b/administrator/components/com_joomlaupdate/tmpl/update/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/tmpl/update/finaliseconfirm.php b/administrator/components/com_joomlaupdate/tmpl/update/finaliseconfirm.php
index c3459b2a98ede..65a20f29f2eef 100644
--- a/administrator/components/com_joomlaupdate/tmpl/update/finaliseconfirm.php
+++ b/administrator/components/com_joomlaupdate/tmpl/update/finaliseconfirm.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/tmpl/upload/captive.php b/administrator/components/com_joomlaupdate/tmpl/upload/captive.php
index 690cc22bb206e..ffc4af45894a7 100644
--- a/administrator/components/com_joomlaupdate/tmpl/upload/captive.php
+++ b/administrator/components/com_joomlaupdate/tmpl/upload/captive.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/Controller/DisplayController.php b/administrator/components/com_languages/Controller/DisplayController.php
index ae09fb05a5c1f..7858dfe81d613 100644
--- a/administrator/components/com_languages/Controller/DisplayController.php
+++ b/administrator/components/com_languages/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/Controller/InstalledController.php b/administrator/components/com_languages/Controller/InstalledController.php
index 7d25e43619fec..1ba5b01dbb5e6 100644
--- a/administrator/components/com_languages/Controller/InstalledController.php
+++ b/administrator/components/com_languages/Controller/InstalledController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,9 +14,9 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Language\Language;
+use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Session\Session;
 
 /**
  * Languages Controller.
@@ -33,7 +33,7 @@ class InstalledController extends BaseController
 	public function setDefault()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$cid = $this->input->get('cid', '');
 		$model = $this->getModel('installed');
@@ -50,8 +50,16 @@ public function setDefault()
 				$newLang->load('com_languages', JPATH_ADMINISTRATOR);
 			}
 
-			$msg = Text::_('COM_LANGUAGES_MSG_DEFAULT_LANGUAGE_SAVED');
-			$type = 'message';
+			if (Multilanguage::isEnabled() && $model->getState('client_id') == 0)
+			{
+				$msg = Text::_('COM_LANGUAGES_MSG_DEFAULT_MULTILANG_SAVED');
+				$type = 'message';
+			}
+			else
+			{
+				$msg = Text::_('COM_LANGUAGES_MSG_DEFAULT_LANGUAGE_SAVED');
+				$type = 'message';
+			}
 		}
 		else
 		{
@@ -71,7 +79,7 @@ public function setDefault()
 	public function switchAdminLanguage()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$cid   = $this->input->get('cid', '');
 		$model = $this->getModel('installed');
diff --git a/administrator/components/com_languages/Controller/LanguageController.php b/administrator/components/com_languages/Controller/LanguageController.php
index 7beb036496fa1..698222db41e1a 100644
--- a/administrator/components/com_languages/Controller/LanguageController.php
+++ b/administrator/components/com_languages/Controller/LanguageController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/Controller/LanguagesController.php b/administrator/components/com_languages/Controller/LanguagesController.php
index bed0b954f2735..e7900cb072c5f 100644
--- a/administrator/components/com_languages/Controller/LanguagesController.php
+++ b/administrator/components/com_languages/Controller/LanguagesController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/Controller/OverrideController.php b/administrator/components/com_languages/Controller/OverrideController.php
index a8b84f8379e9d..88cdbd4478585 100644
--- a/administrator/components/com_languages/Controller/OverrideController.php
+++ b/administrator/components/com_languages/Controller/OverrideController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 
 /**
  * Languages Override Controller
@@ -72,7 +71,7 @@ public function edit($key = null, $urlVar = null)
 	public function save($key = null, $urlVar = null)
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$app     = $this->app;
 		$model   = $this->getModel();
@@ -197,7 +196,7 @@ public function save($key = null, $urlVar = null)
 	 */
 	public function cancel($key = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$context = "$this->option.edit.$this->context";
 
diff --git a/administrator/components/com_languages/Controller/OverridesController.php b/administrator/components/com_languages/Controller/OverridesController.php
index 0db6957023946..2440130438f99 100644
--- a/administrator/components/com_languages/Controller/OverridesController.php
+++ b/administrator/components/com_languages/Controller/OverridesController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,7 +14,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 
 /**
  * Languages Overrides Controller.
@@ -41,7 +40,7 @@ class OverridesController extends AdminController
 	public function delete()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Get items to dlete from the request.
 		$cid = $this->input->get('cid', array(), 'array');
diff --git a/administrator/components/com_languages/Controller/StringsController.php b/administrator/components/com_languages/Controller/StringsController.php
index 6831d90736045..28c0c9b7ed8e6 100644
--- a/administrator/components/com_languages/Controller/StringsController.php
+++ b/administrator/components/com_languages/Controller/StringsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/Extension/LanguagesComponent.php b/administrator/components/com_languages/Extension/LanguagesComponent.php
index 993fa91d115f3..038afa68c7621 100644
--- a/administrator/components/com_languages/Extension/LanguagesComponent.php
+++ b/administrator/components/com_languages/Extension/LanguagesComponent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/Field/LanguageclientField.php b/administrator/components/com_languages/Field/LanguageclientField.php
new file mode 100644
index 0000000000000..e66c7de45f4f5
--- /dev/null
+++ b/administrator/components/com_languages/Field/LanguageclientField.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Languages\Administrator\Field;
+
+defined('JPATH_BASE') or die;
+
+use Joomla\CMS\Form\Field\ListField;
+use Joomla\CMS\Language\LanguageHelper;
+use Joomla\CMS\Language\Text;
+
+/**
+ * Client Language List field.
+ *
+ * @since  3.9.0
+ */
+class LanguageclientField extends ListField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var		string
+	 * @since   3.9.0
+	 */
+	protected $type = 'Languageclient';
+
+	/**
+	 * Cached form field options.
+	 *
+	 * @var		array
+	 * @since   3.9.0
+	 */
+	protected $cache = array();
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.9.0
+	 */
+	protected function getOptions()
+	{
+		// Try to load the data from our mini-cache.
+		if (!empty($this->cache))
+		{
+			return $this->cache;
+		}
+
+		// Get all languages of frontend and backend.
+		$languages       = array();
+		$site_languages  = LanguageHelper::getKnownLanguages(JPATH_SITE);
+		$admin_languages = LanguageHelper::getKnownLanguages(JPATH_ADMINISTRATOR);
+
+		// Create a single array of them.
+		foreach ($site_languages as $tag => $language)
+		{
+			$languages[$tag . '0'] = Text::sprintf('COM_LANGUAGES_VIEW_OVERRIDES_LANGUAGES_BOX_ITEM', $language['name'], Text::_('JSITE'));
+		}
+
+		foreach ($admin_languages as $tag => $language)
+		{
+			$languages[$tag . '1'] = Text::sprintf('COM_LANGUAGES_VIEW_OVERRIDES_LANGUAGES_BOX_ITEM', $language['name'], Text::_('JADMINISTRATOR'));
+		}
+
+		// Sort it by language tag and by client after that.
+		ksort($languages);
+
+		// Add the languages to the internal cache.
+		$this->cache = array_merge(parent::getOptions(), $languages);
+
+		return $this->cache;
+	}
+}
diff --git a/administrator/components/com_languages/Helper/LanguagesHelper.php b/administrator/components/com_languages/Helper/LanguagesHelper.php
index 3eefcde432395..2a1b42b4c999d 100644
--- a/administrator/components/com_languages/Helper/LanguagesHelper.php
+++ b/administrator/components/com_languages/Helper/LanguagesHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,6 +11,7 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 
 /**
@@ -49,29 +50,16 @@ public static function addSubmenu($vName)
 	/**
 	 * Method for parsing ini files.
 	 *
-	 * @param   string  $filename  Path and name of the ini file to parse.
+	 * @param   string  $fileName  Path and name of the ini file to parse.
 	 *
 	 * @return  array   Array of strings found in the file, the array indices will be the keys. On failure an empty array will be returned.
 	 *
 	 * @since   2.5
+	 * @deprecated   3.9.0 Use \Joomla\CMS\Language\LanguageHelper::parseIniFile() instead.
 	 */
-	public static function parseFile($filename)
+	public static function parseFile($fileName)
 	{
-		if (!is_file($filename))
-		{
-			return array();
-		}
-
-		$contents = file_get_contents($filename);
-		$contents = str_replace('"_QQ_"', '\\"', $contents);
-		$strings  = @parse_ini_string($contents, INI_SCANNER_RAW);
-
-		if ($strings === false)
-		{
-			return array();
-		}
-
-		return $strings;
+		return LanguageHelper::parseIniFile($fileName);
 	}
 
 	/**
diff --git a/administrator/components/com_languages/Helper/MultilangstatusHelper.php b/administrator/components/com_languages/Helper/MultilangstatusHelper.php
index 18f3345cab364..bb5335f6326d0 100644
--- a/administrator/components/com_languages/Helper/MultilangstatusHelper.php
+++ b/administrator/components/com_languages/Helper/MultilangstatusHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/Model/InstalledModel.php b/administrator/components/com_languages/Model/InstalledModel.php
index 5da55a4f34c76..aca6e6a913992 100644
--- a/administrator/components/com_languages/Model/InstalledModel.php
+++ b/administrator/components/com_languages/Model/InstalledModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -51,7 +51,7 @@ class InstalledModel extends ListModel
 	protected $data = null;
 
 	/**
-	 * @var int total number pf languages
+	 * @var int total number of languages
 	 */
 	protected $total = null;
 
diff --git a/administrator/components/com_languages/Model/LanguageModel.php b/administrator/components/com_languages/Model/LanguageModel.php
index 0db27b84c1fad..341eb09081089 100644
--- a/administrator/components/com_languages/Model/LanguageModel.php
+++ b/administrator/components/com_languages/Model/LanguageModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/Model/LanguagesModel.php b/administrator/components/com_languages/Model/LanguagesModel.php
index 0ad7bc212a981..33777c0d6c063 100644
--- a/administrator/components/com_languages/Model/LanguagesModel.php
+++ b/administrator/components/com_languages/Model/LanguagesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/Model/OverrideModel.php b/administrator/components/com_languages/Model/OverrideModel.php
index 6f78f2efd67f2..029459d292dee 100644
--- a/administrator/components/com_languages/Model/OverrideModel.php
+++ b/administrator/components/com_languages/Model/OverrideModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,7 +17,6 @@
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\AdminModel;
-use Joomla\Component\Languages\Administrator\Helper\LanguagesHelper;
 
 /**
  * Languages Override Model
@@ -98,10 +97,10 @@ protected function loadFormData()
 	public function getItem($pk = null)
 	{
 		$input    = Factory::getApplication()->input;
-		$pk       = (!empty($pk)) ? $pk : $input->get('id');
-		$filename = constant('JPATH_' . strtoupper($this->getState('filter.client')))
+		$pk       = !empty($pk) ? $pk : $input->get('id');
+		$fileName = constant('JPATH_' . strtoupper($this->getState('filter.client')))
 			. '/language/overrides/' . $this->getState('filter.language', 'en-GB') . '.override.ini';
-		$strings = LanguagesHelper::parseFile($filename);
+		$strings  = LanguageHelper::parseIniFile($fileName);
 
 		$result = new \stdClass;
 		$result->key      = '';
@@ -113,10 +112,10 @@ public function getItem($pk = null)
 			$result->override = $strings[$pk];
 		}
 
-		$opposite_filename = constant('JPATH_' . strtoupper($this->getState('filter.client') == 'site' ? 'administrator' : 'site'))
+		$oppositeFileName = constant('JPATH_' . strtoupper($this->getState('filter.client') == 'site' ? 'administrator' : 'site')) 
 			. '/language/overrides/' . $this->getState('filter.language', 'en-GB') . '.override.ini';
-		$opposite_strings = LanguagesHelper::parseFile($opposite_filename);
-		$result->both = isset($opposite_strings[$pk]) && ($opposite_strings[$pk] == $strings[$pk]);
+		$oppositeStrings  = LanguageHelper::parseIniFile($oppositeFileName);
+		$result->both = isset($oppositeStrings[$pk]) && ($oppositeStrings[$pk] == $strings[$pk]);
 
 		return $result;
 	}
@@ -157,8 +156,8 @@ public function save($data, $opposite_client = false)
 		$client = $client ? 'administrator' : 'site';
 
 		// Parse the override.ini file in oder to get the keys and strings.
-		$filename = constant('JPATH_' . strtoupper($client)) . '/language/overrides/' . $language . '.override.ini';
-		$strings  = LanguagesHelper::parseFile($filename);
+		$fileName = constant('JPATH_' . strtoupper($client)) . '/language/overrides/' . $language . '.override.ini';
+		$strings  = LanguageHelper::parseIniFile($fileName);
 
 		if (isset($strings[$data['id']]))
 		{
@@ -183,7 +182,7 @@ public function save($data, $opposite_client = false)
 		}
 
 		// Write override.ini file with the strings.
-		if (LanguageHelper::saveToIniFile($filename, $strings) === false)
+		if (LanguageHelper::saveToIniFile($fileName, $strings) === false)
 		{
 			return false;
 		}
diff --git a/administrator/components/com_languages/Model/OverridesModel.php b/administrator/components/com_languages/Model/OverridesModel.php
index a6df1e110c5b2..43b5c3942ca4b 100644
--- a/administrator/components/com_languages/Model/OverridesModel.php
+++ b/administrator/components/com_languages/Model/OverridesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,14 +11,12 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
-use Joomla\Component\Languages\Administrator\Helper\LanguagesHelper;
 
 /**
  * Languages Overrides Model
@@ -38,9 +36,15 @@ class OverridesModel extends ListModel
 	 */
 	public function __construct($config = array(), MVCFactoryInterface $factory = null)
 	{
-		parent::__construct($config, $factory);
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'key',
+				'text',
+			);
+		}
 
-		$this->filter_fields = array('key', 'text');
+		parent::__construct($config, $factory);
 	}
 
 	/**
@@ -63,16 +67,16 @@ public function getOverrides($all = false)
 			return $this->cache[$store];
 		}
 
-		$client = in_array($this->state->get('filter.client'), array(0, 'site')) ? 'SITE' : 'ADMINISTRATOR';
+		$client = strtoupper($this->getState('filter.client'));
 
 		// Parse the override.ini file in order to get the keys and strings.
-		$filename = constant('JPATH_' . $client) . '/language/overrides/' . $this->getState('filter.language') . '.override.ini';
-		$strings = LanguagesHelper::parseFile($filename);
+		$fileName = constant('JPATH_' . $client) . '/language/overrides/' . $this->getState('filter.language') . '.override.ini';
+		$strings  = LanguageHelper::parseIniFile($fileName);
 
 		// Delete the override.ini file if empty.
-		if (file_exists($filename) && empty($strings))
+		if (file_exists($fileName) && $strings === array())
 		{
-			File::delete($filename);
+			File::delete($fileName);
 		}
 
 		// Filter the loaded strings according to the search box.
@@ -160,82 +164,29 @@ public function getTotal()
 	 */
 	protected function populateState($ordering = 'key', $direction = 'asc')
 	{
-		$app = Factory::getApplication();
+		// We call populate state first so that we can then set the filter.client and filter.language properties in afterwards
+		parent::populateState($ordering, $direction);
 
-		// Use default language of frontend for default filter.
-		$default = ComponentHelper::getParams('com_languages')->get('site') . '0';
+		$app = Factory::getApplication();
 
-		$old_language_client = $app->getUserState('com_languages.overrides.filter.language_client', '');
-		$language_client     = $this->getUserStateFromRequest('com_languages.overrides.filter.language_client', 'filter_language_client', $default, 'cmd');
-
-		if ($old_language_client != $language_client)
-		{
-			$client   = substr($language_client, -1);
-			$language = substr($language_client, 0, -1);
-		}
-		else
-		{
-			$client   = $app->getUserState('com_languages.overrides.filter.client', 0);
-			$language = $app->getUserState('com_languages.overrides.filter.language', 'en-GB');
-		}
+		$language_client = $this->getUserStateFromRequest('com_languages.overrides.language_client', 'language_client', '', 'cmd');
+		$client          = substr($language_client, -1);
+		$language        = substr($language_client, 0, -1);
 
 		// Sets the search filter.
 		$search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
 		$this->setState('filter.search', $search);
 
-		$this->setState('filter.language_client', $language . $client);
+		$this->setState('language_client', $language . $client);
 		$this->setState('filter.client', $client ? 'administrator' : 'site');
 		$this->setState('filter.language', $language);
 
+		// Add the 'language_client' value to the session to display a message if none selected
+		$app->setUserState('com_languages.overrides.language_client', $language . $client);
+
 		// Add filters to the session because they won't be stored there by 'getUserStateFromRequest' if they aren't in the current request.
 		$app->setUserState('com_languages.overrides.filter.client', $client);
 		$app->setUserState('com_languages.overrides.filter.language', $language);
-
-		// List state information
-		parent::populateState($ordering, $direction);
-	}
-
-	/**
-	 * Method to get all found languages of frontend and backend.
-	 *
-	 * The resulting array has entries of the following style:
-	 * <Language Tag>0|1 => <Language Name> - <Client Name>
-	 *
-	 * @return  array  Sorted associative array of languages.
-	 *
-	 * @since   2.5
-	 */
-	public function getLanguages()
-	{
-		// Try to load the data from internal storage.
-		if (!empty($this->cache['languages']))
-		{
-			return $this->cache['languages'];
-		}
-
-		// Get all languages of frontend and backend.
-		$languages       = array();
-		$site_languages  = LanguageHelper::getKnownLanguages(JPATH_SITE);
-		$admin_languages = LanguageHelper::getKnownLanguages(JPATH_ADMINISTRATOR);
-
-		// Create a single array of them.
-		foreach ($site_languages as $tag => $language)
-		{
-			$languages[$tag . '0'] = Text::sprintf('COM_LANGUAGES_VIEW_OVERRIDES_LANGUAGES_BOX_ITEM', $language['name'], Text::_('JSITE'));
-		}
-
-		foreach ($admin_languages as $tag => $language)
-		{
-			$languages[$tag . '1'] = Text::sprintf('COM_LANGUAGES_VIEW_OVERRIDES_LANGUAGES_BOX_ITEM', $language['name'], Text::_('JADMINISTRATOR'));
-		}
-
-		// Sort it by language tag and by client after that.
-		ksort($languages);
-
-		// Add the languages to the internal cache.
-		$this->cache['languages'] = $languages;
-
-		return $this->cache['languages'];
 	}
 
 	/**
@@ -261,8 +212,8 @@ public function delete($cids)
 		$client = $filterclient == 0 ? 'SITE' : 'ADMINISTRATOR';
 
 		// Parse the override.ini file in oder to get the keys and strings.
-		$filename = constant('JPATH_' . $client) . '/language/overrides/' . $this->getState('filter.language') . '.override.ini';
-		$strings = LanguagesHelper::parseFile($filename);
+		$fileName = constant('JPATH_' . $client) . '/language/overrides/' . $this->getState('filter.language') . '.override.ini';
+		$strings  = LanguageHelper::parseIniFile($fileName);
 
 		// Unset strings that shall be deleted
 		foreach ($cids as $key)
@@ -274,7 +225,7 @@ public function delete($cids)
 		}
 
 		// Write override.ini file with the strings.
-		if (LanguageHelper::saveToIniFile($filename, $strings) === false)
+		if (LanguageHelper::saveToIniFile($fileName, $strings) === false)
 		{
 			return false;
 		}
diff --git a/administrator/components/com_languages/Model/StringsModel.php b/administrator/components/com_languages/Model/StringsModel.php
index 5d5d83ac0fb87..ed2eb0c710ff5 100644
--- a/administrator/components/com_languages/Model/StringsModel.php
+++ b/administrator/components/com_languages/Model/StringsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/Service/HTML/Languages.php b/administrator/components/com_languages/Service/HTML/Languages.php
index 152157e2df621..f0a7834df91f6 100644
--- a/administrator/components/com_languages/Service/HTML/Languages.php
+++ b/administrator/components/com_languages/Service/HTML/Languages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/View/Installed/HtmlView.php b/administrator/components/com_languages/View/Installed/HtmlView.php
index 1fbbac8383ce7..8a4a5a5d7fa04 100644
--- a/administrator/components/com_languages/View/Installed/HtmlView.php
+++ b/administrator/components/com_languages/View/Installed/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/View/Language/HtmlView.php b/administrator/components/com_languages/View/Language/HtmlView.php
index 1ee6d964fb8a5..b234c8b96ae2c 100644
--- a/administrator/components/com_languages/View/Language/HtmlView.php
+++ b/administrator/components/com_languages/View/Language/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -98,7 +98,8 @@ protected function addToolbar()
 
 		if (($isNew && $canDo->get('core.create')) || (!$isNew && $canDo->get('core.edit')))
 		{
-			$toolbarButtons[] = ['apply', 'language.apply'];
+			ToolbarHelper::apply('language.apply');
+				
 			$toolbarButtons[] = ['save', 'language.save'];
 		}
 
diff --git a/administrator/components/com_languages/View/Languages/HtmlView.php b/administrator/components/com_languages/View/Languages/HtmlView.php
index c6b85a536b4f8..1c25ca7ead6ce 100644
--- a/administrator/components/com_languages/View/Languages/HtmlView.php
+++ b/administrator/components/com_languages/View/Languages/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/View/Multilangstatus/HtmlView.php b/administrator/components/com_languages/View/Multilangstatus/HtmlView.php
index 1563ad374406e..7cee6a2385b33 100644
--- a/administrator/components/com_languages/View/Multilangstatus/HtmlView.php
+++ b/administrator/components/com_languages/View/Multilangstatus/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/View/Override/HtmlView.php b/administrator/components/com_languages/View/Override/HtmlView.php
index 3feaa3e7d04f4..e68ccc0f13852 100644
--- a/administrator/components/com_languages/View/Override/HtmlView.php
+++ b/administrator/components/com_languages/View/Override/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -63,6 +63,17 @@ public function display($tpl = null)
 		$this->item  = $this->get('Item');
 		$this->state = $this->get('State');
 
+		$app = Factory::getApplication();
+
+		$languageClient = $app->getUserStateFromRequest('com_languages.overrides.language_client', 'language_client');
+
+		if ($languageClient == null)
+		{
+			$app->enqueueMessage(Text::_('COM_LANGUAGES_OVERRIDE_FIRST_SELECT_MESSAGE'), 'warning');
+
+			$app->redirect('index.php?option=com_languages&view=overrides');
+		}
+
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
@@ -107,7 +118,8 @@ protected function addToolbar()
 
 		if ($canDo->get('core.edit'))
 		{
-			$toolbarButtons[] = ['apply', 'override.apply'];
+			ToolbarHelper::apply('override.apply');
+
 			$toolbarButtons[] = ['save', 'override.save'];
 		}
 
diff --git a/administrator/components/com_languages/View/Overrides/HtmlView.php b/administrator/components/com_languages/View/Overrides/HtmlView.php
index ae1e697309bf0..34b6822e8de65 100644
--- a/administrator/components/com_languages/View/Overrides/HtmlView.php
+++ b/administrator/components/com_languages/View/Overrides/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,6 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -77,10 +76,12 @@ class HtmlView extends BaseHtmlView
 	 */
 	public function display($tpl = null)
 	{
-		$this->state      = $this->get('State');
-		$this->items      = $this->get('Overrides');
-		$this->languages  = $this->get('Languages');
-		$this->pagination = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->items         = $this->get('Overrides');
+		$this->languages     = $this->get('Languages');
+		$this->pagination    = $this->get('Pagination');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
 
 		LanguagesHelper::addSubmenu('overrides');
 
@@ -133,13 +134,6 @@ protected function addToolbar()
 
 		\JHtmlSidebar::setAction('index.php?option=com_languages&view=overrides');
 
-		\JHtmlSidebar::addFilter(
-			'',
-			'filter_language_client',
-			HTMLHelper::_('select.options', $this->languages, null, 'text', $this->state->get('filter.language_client')),
-			true
-		);
-
 		$this->sidebar = \JHtmlSidebar::render();
 	}
 }
diff --git a/administrator/components/com_languages/forms/filter_overrides.xml b/administrator/components/com_languages/forms/filter_overrides.xml
new file mode 100644
index 0000000000000..b26f410cb0192
--- /dev/null
+++ b/administrator/components/com_languages/forms/filter_overrides.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<field
+		name="language_client"
+		type="languageclient"
+		onchange="this.form.submit();"
+		filtermode="selector"
+		addfieldprefix="Joomla\Component\Languages\Administrator\Field"
+	>
+		<option value="">COM_LANGUAGES_OVERRIDE_SELECT_LANGUAGE</option>
+	</field>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="JSEARCH_FILTER"
+			description="COM_LANGUAGES_SEARCH_IN_TITLE"
+			hint="JSEARCH_FILTER"
+		/>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="key DESC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="constant ASC">COM_LANGUAGES_VIEW_OVERRIDES_CONSTANT_ASC</option>
+			<option value="constant DESC">COM_LANGUAGES_VIEW_OVERRIDES_CONSTANT_DESC</option>
+			<option value="key ASC">COM_LANGUAGES_VIEW_OVERRIDES_KEY_ASC</option>
+			<option value="key DESC">COM_LANGUAGES_VIEW_OVERRIDES_KEY_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/administrator/components/com_languages/languages.xml b/administrator/components/com_languages/languages.xml
index 1e25fdff91774..c42f07ff2d553 100644
--- a/administrator/components/com_languages/languages.xml
+++ b/administrator/components/com_languages/languages.xml
@@ -3,7 +3,7 @@
 	<name>com_languages</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_languages/layouts/joomla/searchtools/default.php b/administrator/components/com_languages/layouts/joomla/searchtools/default.php
new file mode 100644
index 0000000000000..5aba624733477
--- /dev/null
+++ b/administrator/components/com_languages/layouts/joomla/searchtools/default.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Layout\LayoutHelper;
+
+/** @var  array  $displayData */
+$data = $displayData;
+
+// Receive overridable options
+$data['options'] = !empty($data['options']) ? $data['options'] : array();
+
+if ($data['view'] instanceof \Joomla\Component\Languages\Administrator\View\Overrides\HtmlView)
+{
+	// Client selector doesn't have to activate the filter bar.
+	unset($data['view']->activeFilters['language_client']);
+}
+
+// Set some basic options
+$customOptions = array(
+	'filtersHidden'       => $data['options']['filtersHidden'] ?? empty($data['view']->activeFilters),
+	'defaultLimit'        => $data['options']['defaultLimit'] ?? Factory::getApplication()->get('list_limit', 20),
+	'searchFieldSelector' => '#filter_search',
+	'orderFieldSelector'  => '#list_fullordering',
+);
+
+$data['options'] = array_merge($customOptions, $data['options']);
+
+$formSelector = !empty($data['options']['formSelector']) ? $data['options']['formSelector'] : '#adminForm';
+
+// Load search tools
+HTMLHelper::_('searchtools.form', $formSelector, $data['options']);
+
+$filtersClass = isset($data['view']->activeFilters) && $data['view']->activeFilters ? ' js-stools-container-filters-visible' : '';
+?>
+<div class="js-stools" role="search">
+	<?php if ($data['view'] instanceof \Joomla\Component\Languages\Administrator\View\Overrides\HtmlView) : ?>
+		<?php $langClient = $data['view']->filterForm->getField('language_client'); ?>
+		<div class="js-stools-container-selector">
+			<div class="js-stools-field-selector js-stools-langClient">
+				<?php echo $langClient->input; ?>
+			</div>
+		</div>
+	<?php endif; ?>
+	<div class="js-stools-container-bar">
+		<?php echo LayoutHelper::render('joomla.searchtools.default.bar', $data); ?>
+	</div>
+	<!-- Filters div -->
+	<div class="js-stools-container-filters clearfix<?php echo $filtersClass; ?>">
+		<?php echo LayoutHelper::render('joomla.searchtools.default.list', $data); ?>
+		<?php echo LayoutHelper::render('joomla.searchtools.default.filters', $data); ?>
+	</div>
+</div>
diff --git a/administrator/components/com_languages/services/provider.php b/administrator/components/com_languages/services/provider.php
index 11bed945f7fd4..b8ccddbcacb68 100644
--- a/administrator/components/com_languages/services/provider.php
+++ b/administrator/components/com_languages/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/tmpl/installed/default.php b/administrator/components/com_languages/tmpl/installed/default.php
index 7d74178f9a80f..937b6e1573cba 100644
--- a/administrator/components/com_languages/tmpl/installed/default.php
+++ b/administrator/components/com_languages/tmpl/installed/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/tmpl/language/edit.php b/administrator/components/com_languages/tmpl/language/edit.php
index 34a896d9bffb6..050513ee4be60 100644
--- a/administrator/components/com_languages/tmpl/language/edit.php
+++ b/administrator/components/com_languages/tmpl/language/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/tmpl/languages/default.php b/administrator/components/com_languages/tmpl/languages/default.php
index 6e070ff3f4d5c..2952c0b01efad 100644
--- a/administrator/components/com_languages/tmpl/languages/default.php
+++ b/administrator/components/com_languages/tmpl/languages/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/tmpl/multilangstatus/default.php b/administrator/components/com_languages/tmpl/multilangstatus/default.php
index 1060a03e1efe8..5775de60d7eb9 100644
--- a/administrator/components/com_languages/tmpl/multilangstatus/default.php
+++ b/administrator/components/com_languages/tmpl/multilangstatus/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/tmpl/override/edit.php b/administrator/components/com_languages/tmpl/override/edit.php
index aa4bf37a50a20..c263318aa9da1 100644
--- a/administrator/components/com_languages/tmpl/override/edit.php
+++ b/administrator/components/com_languages/tmpl/override/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/tmpl/overrides/default.php b/administrator/components/com_languages/tmpl/overrides/default.php
index e3cda21c33cf5..17e1817e15627 100644
--- a/administrator/components/com_languages/tmpl/overrides/default.php
+++ b/administrator/components/com_languages/tmpl/overrides/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,19 +11,19 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
-use Joomla\Component\Languages\Administrator\Helper\LanguagesHelper;
 
-$client    = $this->state->get('filter.client') == '0' ? Text::_('JSITE') : Text::_('JADMINISTRATOR');
+$client    = $this->state->get('filter.client') == 'site' ? Text::_('JSITE') : Text::_('JADMINISTRATOR');
 $language  = $this->state->get('filter.language');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 
-$opposite_client   = $this->state->get('filter.client') == '1' ? Text::_('JSITE') : Text::_('JADMINISTRATOR');
-$opposite_filename = constant('JPATH_' . strtoupper(1 - $this->state->get('filter.client')? 'administrator' : 'site'))
+$oppositeClient   = $this->state->get('filter.client') == 'administrator' ? Text::_('JSITE') : Text::_('JADMINISTRATOR');
+$oppositeFilename = constant('JPATH_' . strtoupper($this->state->get('filter.client') === 'site' ? 'administrator' : 'site'))
 	. '/language/overrides/' . $this->state->get('filter.language', 'en-GB') . '.override.ini';
-$opposite_strings  = LanguagesHelper::parseFile($opposite_filename);
+$oppositeStrings  = LanguageHelper::parseIniFile($oppositeFilename);
 ?>
 
 <form action="<?php echo Route::_('index.php?option=com_languages&view=overrides'); ?>" method="post" name="adminForm" id="adminForm">
@@ -33,21 +33,8 @@
 		</div>
 		<div class="col-md-10">
 			<div id="j-main-container" class="j-main-container">
-				<div id="filter-bar" class="btn-toolbar clearfix">
-					<div class="filter-search btn-group float-left">
-						<div class="input-group">
-							<input type="text" name="filter_search" id="filter_search" placeholder="<?php echo Text::_('JSEARCH_FILTER'); ?>" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" class="form-control hasTooltip" title="<?php echo HTMLHelper::tooltipText('COM_LANGUAGES_VIEW_OVERRIDES_FILTER_SEARCH_DESC'); ?>">
-							<div class="input-group-append">
-								<button type="submit" class="btn btn-secondary hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'JSEARCH_FILTER_SUBMIT'); ?>"><span class="icon-search" aria-hidden="true"></span></button>
-								<button type="button" class="btn btn-secondary hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'JSEARCH_FILTER_CLEAR'); ?>" onclick="document.getElementById('filter_search').value='';this.form.submit();"><span class="icon-remove" aria-hidden="true"></span></button>
-							</div>
-						</div>
-					</div>
-					<div class="btn-group float-right d-none d-md-block">
-						<label for="limit" class="sr-only"><?php echo Text::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?></label>
-						<?php echo $this->pagination->getLimitBox(); ?>
-					</div>
-				</div>
+				<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+				<div class="clearfix"></div>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-warning">
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
@@ -63,10 +50,10 @@
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
 								<th scope="col" style="width:30%">
-									<?php echo HTMLHelper::_('grid.sort', 'COM_LANGUAGES_VIEW_OVERRIDES_KEY', 'key', $listDirn, $listOrder); ?>
+									<?php echo HTMLHelper::_('searchtools.sort', 'COM_LANGUAGES_VIEW_OVERRIDES_KEY', 'key', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col" class="d-none d-md-table-cell">
-									<?php echo HTMLHelper::_('grid.sort', 'COM_LANGUAGES_VIEW_OVERRIDES_TEXT', 'text', $listDirn, $listOrder); ?>
+									<?php echo HTMLHelper::_('searchtools.sort', 'COM_LANGUAGES_VIEW_OVERRIDES_TEXT', 'text', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col" class="d-none d-md-table-cell">
 									<?php echo Text::_('COM_LANGUAGES_FIELD_LANG_TAG_LABEL'); ?>
@@ -101,9 +88,9 @@
 								<td class="d-none d-md-table-cell">
 									<?php echo $client; ?>
 									<?php
-									if (isset($opposite_strings[$key]) && ($opposite_strings[$key] == $text))
+									if (isset($oppositeStrings[$key]) && ($oppositeStrings[$key] == $text))
 									{
-										echo '/' . $opposite_client;
+										echo '/' . $oppositeClient;
 									}
 									?>
 								</td>
@@ -120,8 +107,6 @@
 
 				<input type="hidden" name="task" value="">
 				<input type="hidden" name="boxchecked" value="0">
-				<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>">
-				<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>">
 				<?php echo HTMLHelper::_('form.token'); ?>
 			</div>
 		</div>
diff --git a/administrator/components/com_login/Controller/DisplayController.php b/administrator/components/com_login/Controller/DisplayController.php
index 58a9756b79d53..51f05e15115f7 100644
--- a/administrator/components/com_login/Controller/DisplayController.php
+++ b/administrator/components/com_login/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_login
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,6 @@
 
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 
 /**
@@ -69,7 +68,7 @@ public function display($cachable = false, $urlparams = false)
 	public function login()
 	{
 		// Check for request forgeries.
-		Session::checkToken('request') or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken('request');
 
 		$app = $this->app;
 
@@ -106,7 +105,7 @@ public function login()
 	 */
 	public function logout()
 	{
-		Session::checkToken('request') or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken('request');
 
 		$app = $this->app;
 
diff --git a/administrator/components/com_login/Dispatcher/Dispatcher.php b/administrator/components/com_login/Dispatcher/Dispatcher.php
index cf260ed8ae3f5..652db39db6ca2 100644
--- a/administrator/components/com_login/Dispatcher/Dispatcher.php
+++ b/administrator/components/com_login/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_login
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_login/Model/LoginModel.php b/administrator/components/com_login/Model/LoginModel.php
index 3cfcf88c20dd6..01924a6d913b9 100644
--- a/administrator/components/com_login/Model/LoginModel.php
+++ b/administrator/components/com_login/Model/LoginModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_login
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_login/View/Login/HtmlView.php b/administrator/components/com_login/View/Login/HtmlView.php
index 3ccb64f63d049..5d809ef734457 100644
--- a/administrator/components/com_login/View/Login/HtmlView.php
+++ b/administrator/components/com_login/View/Login/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_login
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_login/login.xml b/administrator/components/com_login/login.xml
index 6bbcccdd56171..af62cc6368872 100644
--- a/administrator/components/com_login/login.xml
+++ b/administrator/components/com_login/login.xml
@@ -3,7 +3,7 @@
 	<name>com_login</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_login/services/provider.php b/administrator/components/com_login/services/provider.php
index 7ec2625b167ec..d33a92205bcf0 100644
--- a/administrator/components/com_login/services/provider.php
+++ b/administrator/components/com_login/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_login
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_login/tmpl/login/default.php b/administrator/components/com_login/tmpl/login/default.php
index f13423f9ead68..dc71d2c85b6c9 100644
--- a/administrator/components/com_login/tmpl/login/default.php
+++ b/administrator/components/com_login/tmpl/login/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_login
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,7 +17,7 @@
  * in your layout override.
  */
 $loginmodule = \Joomla\Component\Login\Administrator\Model\LoginModel::getLoginModule('mod_login');
-echo ModuleHelper::renderModule($loginmodule, array('style' => 'rounded', 'id' => 'section-box'));
+echo ModuleHelper::renderModule($loginmodule, array('id' => 'section-box'));
 
 
 /**
@@ -30,5 +30,5 @@
 // Render the login modules
 
 if ($module->module != 'mod_login'){
-	echo ModuleHelper::renderModule($module, array('style' => 'rounded', 'id' => 'section-box'));
+	echo ModuleHelper::renderModule($module, array('id' => 'section-box'));
 }
diff --git a/administrator/components/com_mailto/mailto.xml b/administrator/components/com_mailto/mailto.xml
index b121d9cd916ab..60fa5c113661c 100644
--- a/administrator/components/com_mailto/mailto.xml
+++ b/administrator/components/com_mailto/mailto.xml
@@ -3,7 +3,7 @@
 	<name>com_mailto</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.	</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.	</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_mailto/services/provider.php b/administrator/components/com_mailto/services/provider.php
index 1b505913adf0b..3a2cec31aa93f 100644
--- a/administrator/components/com_mailto/services/provider.php
+++ b/administrator/components/com_mailto/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_mailto
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/layouts/toolbar/create-folder.php b/administrator/components/com_media/layouts/toolbar/create-folder.php
index f19753d40a6d1..13731d105e7e8 100644
--- a/administrator/components/com_media/layouts/toolbar/create-folder.php
+++ b/administrator/components/com_media/layouts/toolbar/create-folder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,5 +14,5 @@
 $title = Text::_('COM_MEDIA_CREATE_NEW_FOLDER');
 ?>
 <button class="btn btn-sm btn-info" onclick="MediaManager.Event.fire('onClickCreateFolder');">
-    <span class="icon-folder-close" title="<?php echo $title; ?>"></span> <?php echo $title; ?>
+    <span class="icon-folder-close"></span> <?php echo $title; ?>
 </button>
diff --git a/administrator/components/com_media/layouts/toolbar/delete.php b/administrator/components/com_media/layouts/toolbar/delete.php
index bdf2fc52f5280..c22c92ede8d5a 100644
--- a/administrator/components/com_media/layouts/toolbar/delete.php
+++ b/administrator/components/com_media/layouts/toolbar/delete.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,6 +13,6 @@
 
 $title = Text::_('JTOOLBAR_DELETE');
 ?>
-<button class="btn btn-sm btn-danger" onclick="MediaManager.Event.fire('onClickDelete');">
-    <span class="icon-delete" title="<?php echo $title; ?>"></span> <?php echo $title; ?>
-</button>
\ No newline at end of file
+<button id="mediaDelete" class="btn btn-sm btn-danger" onclick="MediaManager.Event.fire('onClickDelete');">
+    <span class="icon-delete"></span> <?php echo $title; ?>
+</button>
diff --git a/administrator/components/com_media/layouts/toolbar/upload.php b/administrator/components/com_media/layouts/toolbar/upload.php
index 0ccf094e4d5e9..b288b73bbafc4 100644
--- a/administrator/components/com_media/layouts/toolbar/upload.php
+++ b/administrator/components/com_media/layouts/toolbar/upload.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,5 +14,5 @@
 $title = Text::_('JTOOLBAR_UPLOAD');
 ?>
 <button class="btn btn-sm btn-success" onclick="MediaManager.Event.fire('onClickUpload');">
-	<span class="icon-upload" title="<?php echo $title; ?>"></span> <?php echo $title; ?>
-</button>
\ No newline at end of file
+	<span class="icon-upload"></span> <?php echo $title; ?>
+</button>
diff --git a/administrator/components/com_media/media.xml b/administrator/components/com_media/media.xml
index 8aac624eaafed..5f1dcbd7cc86a 100644
--- a/administrator/components/com_media/media.xml
+++ b/administrator/components/com_media/media.xml
@@ -3,7 +3,7 @@
 	<name>com_media</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_media/package-lock.json b/administrator/components/com_media/package-lock.json
index 97d6d34f2f607..36fe04ad2058e 100644
--- a/administrator/components/com_media/package-lock.json
+++ b/administrator/components/com_media/package-lock.json
@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "JSONStream": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.3.tgz",
-      "integrity": "sha512-3Sp6WZZ/lXl+nTDoGpGWHEpTnnC6X5fnkolYZR6nwIfzbxxvA8utPWe1gCt7i0m9uVGsSz2IS8K8mJ7HmlduMg==",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
       "dev": true,
       "requires": {
         "jsonparse": "^1.2.0",
@@ -27,25 +27,37 @@
       "dev": true
     },
     "acorn-dynamic-import": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz",
-      "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==",
-      "dev": true,
-      "requires": {
-        "acorn": "^5.0.0"
-      }
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz",
+      "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==",
+      "dev": true
     },
     "acorn-node": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.5.2.tgz",
-      "integrity": "sha512-krFKvw/d1F17AN3XZbybIUzEY4YEPNiGo05AfP3dBlfVKrMHETKpgjpuZkSF8qDNt9UkQcqj7am8yJLseklCMg==",
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.6.2.tgz",
+      "integrity": "sha512-rIhNEZuNI8ibQcL7ANm/mGyPukIaZsRNX9psFNQURyJW0nu6k8wjSDld20z6v2mDBWqX13pIEnk9gGZJHIlEXg==",
       "dev": true,
       "requires": {
-        "acorn": "^5.7.1",
-        "acorn-dynamic-import": "^3.0.0",
+        "acorn": "^6.0.2",
+        "acorn-dynamic-import": "^4.0.0",
+        "acorn-walk": "^6.1.0",
         "xtend": "^4.0.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.0.tgz",
+          "integrity": "sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw==",
+          "dev": true
+        }
       }
     },
+    "acorn-walk": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz",
+      "integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==",
+      "dev": true
+    },
     "ajv": {
       "version": "5.5.2",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
@@ -1187,36 +1199,37 @@
       }
     },
     "browserify": {
-      "version": "13.3.0",
-      "resolved": "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz",
-      "integrity": "sha1-tanJAgJD8McORnW+yCI7xifkFc4=",
+      "version": "16.2.3",
+      "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.2.3.tgz",
+      "integrity": "sha512-zQt/Gd1+W+IY+h/xX2NYMW4orQWhqSwyV+xsblycTtpOuB27h1fZhhNQuipJ4t79ohw4P4mMem0jp/ZkISQtjQ==",
       "dev": true,
       "requires": {
         "JSONStream": "^1.0.3",
         "assert": "^1.4.0",
         "browser-pack": "^6.0.1",
         "browser-resolve": "^1.11.0",
-        "browserify-zlib": "~0.1.2",
-        "buffer": "^4.1.0",
+        "browserify-zlib": "~0.2.0",
+        "buffer": "^5.0.2",
         "cached-path-relative": "^1.0.0",
-        "concat-stream": "~1.5.1",
+        "concat-stream": "^1.6.0",
         "console-browserify": "^1.1.0",
         "constants-browserify": "~1.0.0",
         "crypto-browserify": "^3.0.0",
         "defined": "^1.0.0",
         "deps-sort": "^2.0.0",
-        "domain-browser": "~1.1.0",
+        "domain-browser": "^1.2.0",
         "duplexer2": "~0.1.2",
-        "events": "~1.1.0",
+        "events": "^2.0.0",
         "glob": "^7.1.0",
         "has": "^1.0.0",
         "htmlescape": "^1.1.0",
-        "https-browserify": "~0.0.0",
+        "https-browserify": "^1.0.0",
         "inherits": "~2.0.1",
         "insert-module-globals": "^7.0.0",
         "labeled-stream-splicer": "^2.0.0",
-        "module-deps": "^4.0.8",
-        "os-browserify": "~0.1.1",
+        "mkdirp": "^0.5.0",
+        "module-deps": "^6.0.0",
+        "os-browserify": "~0.3.0",
         "parents": "^1.0.1",
         "path-browserify": "~0.0.0",
         "process": "~0.11.0",
@@ -1229,16 +1242,46 @@
         "shell-quote": "^1.6.1",
         "stream-browserify": "^2.0.0",
         "stream-http": "^2.0.0",
-        "string_decoder": "~0.10.0",
+        "string_decoder": "^1.1.1",
         "subarg": "^1.0.0",
         "syntax-error": "^1.1.1",
         "through2": "^2.0.0",
         "timers-browserify": "^1.0.1",
-        "tty-browserify": "~0.0.0",
+        "tty-browserify": "0.0.1",
         "url": "~0.11.0",
         "util": "~0.10.1",
-        "vm-browserify": "~0.0.1",
+        "vm-browserify": "^1.0.0",
         "xtend": "^4.0.0"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+          "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
+          "dev": true,
+          "requires": {
+            "base64-js": "^1.0.2",
+            "ieee754": "^1.1.4"
+          }
+        },
+        "domain-browser": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+          "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+          "dev": true
+        },
+        "events": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/events/-/events-2.1.0.tgz",
+          "integrity": "sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg==",
+          "dev": true
+        },
+        "vm-browserify": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
+          "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==",
+          "dev": true
+        }
       }
     },
     "browserify-aes": {
@@ -1304,12 +1347,12 @@
       }
     },
     "browserify-zlib": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-      "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
       "dev": true,
       "requires": {
-        "pako": "~0.2.0"
+        "pako": "~1.0.5"
       }
     },
     "browserslist": {
@@ -1375,9 +1418,9 @@
       }
     },
     "cached-path-relative": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz",
-      "integrity": "sha1-0JxLUoAKpMB44t2BqGmqyQ0uVOc=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.2.tgz",
+      "integrity": "sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg==",
       "dev": true
     },
     "camelcase": {
@@ -1684,36 +1727,15 @@
       "dev": true
     },
     "concat-stream": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz",
-      "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=",
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
       "dev": true,
       "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "~2.0.0",
-        "typedarray": "~0.0.5"
-      },
-      "dependencies": {
-        "process-nextick-args": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~1.0.6",
-            "string_decoder": "~0.10.x",
-            "util-deprecate": "~1.0.1"
-          }
-        }
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
       }
     },
     "config-chain": {
@@ -2148,13 +2170,22 @@
       }
     },
     "detective": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
-      "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz",
+      "integrity": "sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==",
       "dev": true,
       "requires": {
-        "acorn": "^5.2.1",
-        "defined": "^1.0.0"
+        "acorn-node": "^1.6.1",
+        "defined": "^1.0.0",
+        "minimist": "^1.1.1"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
       }
     },
     "diffie-hellman": {
@@ -2735,7 +2766,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -2756,12 +2788,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -2776,17 +2810,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -2903,7 +2940,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -2915,6 +2953,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -2929,6 +2968,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -2936,12 +2976,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -2960,6 +3002,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3040,7 +3083,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3052,6 +3096,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3137,7 +3182,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -3173,6 +3219,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -3192,6 +3239,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -3235,12 +3283,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -3545,9 +3595,9 @@
       }
     },
     "https-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
-      "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
       "dev": true
     },
     "icss-replace-symbols": {
@@ -3636,20 +3686,6 @@
         "through2": "^2.0.0",
         "undeclared-identifiers": "^1.1.2",
         "xtend": "^4.0.0"
-      },
-      "dependencies": {
-        "concat-stream": {
-          "version": "1.6.2",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-          "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-          "dev": true,
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "inherits": "^2.0.3",
-            "readable-stream": "^2.2.2",
-            "typedarray": "^0.0.6"
-          }
-        }
       }
     },
     "interpret": {
@@ -4397,22 +4433,22 @@
       }
     },
     "module-deps": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz",
-      "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.0.tgz",
+      "integrity": "sha512-hKPmO06so6bL/ZvqVNVqdTVO8UAYsi3tQWlCa+z9KuWhoN4KDQtb5hcqQQv58qYiDE21wIvnttZEPiDgEbpwbA==",
       "dev": true,
       "requires": {
         "JSONStream": "^1.0.3",
         "browser-resolve": "^1.7.0",
         "cached-path-relative": "^1.0.0",
-        "concat-stream": "~1.5.0",
+        "concat-stream": "~1.6.0",
         "defined": "^1.0.0",
-        "detective": "^4.0.0",
+        "detective": "^5.0.2",
         "duplexer2": "^0.1.2",
         "inherits": "^2.0.1",
         "parents": "^1.0.0",
         "readable-stream": "^2.0.2",
-        "resolve": "^1.1.3",
+        "resolve": "^1.4.0",
         "stream-combiner2": "^1.1.1",
         "subarg": "^1.0.0",
         "through2": "^2.0.0",
@@ -4770,9 +4806,9 @@
       }
     },
     "os-browserify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz",
-      "integrity": "sha1-ScoCk+CxlZCl9d4Qx/JlphfY/lQ=",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
       "dev": true
     },
     "os-homedir": {
@@ -4837,9 +4873,9 @@
       "dev": true
     },
     "pako": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-      "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.8.tgz",
+      "integrity": "sha512-6i0HVbUfcKaTv+EG8ZTr75az7GFXcLYk9UyLEg7Notv/Ma+z/UG3TCoz6GiNeOrn1E/e63I0X/Hpw18jHOTUnA==",
       "dev": true
     },
     "parents": {
@@ -6572,10 +6608,13 @@
       }
     },
     "string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
+      "integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
     },
     "strip-ansi": {
       "version": "3.0.1",
@@ -6681,12 +6720,12 @@
       "dev": true
     },
     "through2": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.1.5",
+        "readable-stream": "~2.3.6",
         "xtend": "~4.0.1"
       }
     },
diff --git a/administrator/components/com_media/package.json b/administrator/components/com_media/package.json
index dbb0cf971484b..65c35942dd310 100644
--- a/administrator/components/com_media/package.json
+++ b/administrator/components/com_media/package.json
@@ -23,7 +23,7 @@
     "babel-preset-env": "^1.6.1",
     "babel-preset-es2015": "^6.24.0",
     "babelify": "^7.2.0",
-    "browserify": "^13.0.1",
+    "browserify": "^16.2.3",
     "cross-env": "^3.0.0",
     "css-loader": "^0.25.0",
     "extract-text-webpack-plugin": "^3.0.2",
diff --git a/administrator/components/com_media/resources/scripts/app/Api.js b/administrator/components/com_media/resources/scripts/app/Api.js
index 40a078811aa24..e85da3ba1c84d 100644
--- a/administrator/components/com_media/resources/scripts/app/Api.js
+++ b/administrator/components/com_media/resources/scripts/app/Api.js
@@ -124,7 +124,7 @@ class Api {
                 data: JSON.stringify(data),
                 headers: {'Content-Type': 'application/json'},
                 onSuccess: (response) => {
-                    notifications.success('COM_MEDIA_UPDLOAD_SUCCESS');
+                    notifications.success('COM_MEDIA_UPLOAD_SUCCESS');
                     resolve(this._normalizeItem(JSON.parse(response).data))
                 },
                 onError: (xhr) => {
@@ -138,7 +138,7 @@ class Api {
     /**
      * Rename an item
      * @param path
-     * @param newName
+     * @param newPath
      * @return {Promise.<T>}
      */
     rename(path, newPath) {
diff --git a/administrator/components/com_media/resources/scripts/components/app.vue b/administrator/components/com_media/resources/scripts/components/app.vue
index 739cee1d3e0a1..b9c2cc1dfcfd4 100644
--- a/administrator/components/com_media/resources/scripts/components/app.vue
+++ b/administrator/components/com_media/resources/scripts/components/app.vue
@@ -20,7 +20,7 @@
 
 <script>
     import * as types from "./../store/mutation-types";
-    import Api from "./../app/Api";
+    import {notifications} from "./../app/Notifications";
 
     export default {
         name: 'media-app',
@@ -45,7 +45,13 @@
         created() {
             // Listen to the toolbar events
             MediaManager.Event.listen('onClickCreateFolder', () => this.$store.commit(types.SHOW_CREATE_FOLDER_MODAL));
-            MediaManager.Event.listen('onClickDelete', () => this.$store.dispatch('deleteSelectedItems'));
+            MediaManager.Event.listen('onClickDelete', () =>  {
+                if (this.$store.state.selectedItems.length > 0) {
+                    this.$store.commit(types.SHOW_CONFIRM_DELETE_MODAL);
+                } else {
+                    notifications.error('COM_MEDIA_PLEASE_SELECT_ITEM');
+                }
+            });
         },
         mounted() {
             // Set the full height and add event listener when dom is updated
@@ -63,4 +69,4 @@
             window.removeEventListener('resize', this.setFullHeight)
         },
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/administrator/components/com_media/resources/scripts/components/breadcrumb/breadcrumb.vue b/administrator/components/com_media/resources/scripts/components/breadcrumb/breadcrumb.vue
index 5f8fcbd33692b..68c9de6b3a7d1 100644
--- a/administrator/components/com_media/resources/scripts/components/breadcrumb/breadcrumb.vue
+++ b/administrator/components/com_media/resources/scripts/components/breadcrumb/breadcrumb.vue
@@ -1,9 +1,11 @@
 <template>
-    <ol class="media-breadcrumb">
-        <li class="media-breadcrumb-item" v-for="crumb in crumbs">
-            <a @click.stop.prevent="onCrumbClick(crumb)">{{ crumb.name }}</a>
-        </li>
-    </ol>
+    <nav class="media-breadcrumb" role="navigation" :aria-label="translate('COM_MEDIA_BREADCRUMB_LABEL')">
+        <ol>
+            <li class="media-breadcrumb-item" v-for="(val,index) in crumbs">
+                <a href="#" @click.stop.prevent="onCrumbClick(val)" v-bind:aria-current="(index === Object.keys(crumbs).length - 1) ? 'page' : undefined">{{ val.name }}</a>
+            </li>
+        </ol>
+    </nav>
 </template>
 
 <script>
@@ -62,7 +64,7 @@
                 });
 
                 return driveObject;
-            }
+            },
         },
     }
 </script>
\ No newline at end of file
diff --git a/administrator/components/com_media/resources/scripts/components/browser/browser.vue b/administrator/components/com_media/resources/scripts/components/browser/browser.vue
index 0d65c2b3d77fc..8883fa95dbe9b 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/browser.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/browser.vue
@@ -9,7 +9,7 @@
             ref="browserItems">
             <div class="media-dragoutline">
                 <span class="fa fa-cloud-upload upload-icon" aria-hidden="true"></span>
-                <p>Drop file(s) to Upload</p>
+                <p>{{ translate('COM_MEDIA_DROP_FILE') }}</p>
             </div>
             <div v-if="listView === 'table'" class="media-browser-table">
                 <div class="media-browser-table-head">
@@ -18,8 +18,8 @@
                         <li class="name">{{ translate('COM_MEDIA_MEDIA_NAME') }}</li>
                         <li class="size">{{ translate('COM_MEDIA_MEDIA_SIZE') }}</li>
                         <li class="dimension">{{ translate('COM_MEDIA_MEDIA_DIMENSION') }}</li>
-                        <li class="created">{{ translate('COM_MEDIA_MEDIA_CREATED_AT') }}</li>
-                        <li class="modified">{{ translate('COM_MEDIA_MEDIA_MODIFIED_AT') }}</li>
+                        <li class="created">{{ translate('COM_MEDIA_MEDIA_DATE_CREATED') }}</li>
+                        <li class="modified">{{ translate('COM_MEDIA_MEDIA_DATE_MODIFIED') }}</li>
                     </ul>
                 </div>
                 <media-browser-item v-for="item in items" :key="item.path" :item="item"></media-browser-item>
@@ -79,9 +79,10 @@
         methods: {
             /* Unselect all browser items */
             unselectAllBrowserItems(event) {
+                const clickedDelete = (event.target.id !== undefined && event.target.id === 'mediaDelete') ? true : false;
                 const notClickedBrowserItems = (this.$refs.browserItems && !this.$refs.browserItems.contains(event.target)) || event.target === this.$refs.browserItems;
                 const notClickedInfobar = this.$refs.infobar !== undefined && !this.$refs.infobar.$el.contains(event.target);
-                const clickedOutside = notClickedBrowserItems && notClickedInfobar;
+                const clickedOutside = notClickedBrowserItems && notClickedInfobar && !clickedDelete;
                 if (clickedOutside) {
                     this.$store.commit(types.UNSELECT_ALL_BROWSER_ITEMS);
                 }
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue b/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue
index d3902a7c5b2fe..f2bfea4f1a636 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="media-browser-item-directory" @mouseleave="showActions = false">
+    <div class="media-browser-item-directory" @mouseleave="hideActions()">
         <div class="media-browser-item-preview"
              @dblclick.stop.prevent="onPreviewDblClick()">
             <div class="file-background">
@@ -13,24 +13,37 @@
         </div>
         <a href="#" class="media-browser-select"
           @click.stop="toggleSelect()"
-          :aria-label="translate('COM_MEDIA_TOGGLE_SELECT_ITEM')">
+          :aria-label="translate('COM_MEDIA_TOGGLE_SELECT_ITEM')"
+          @focus="focused(true)" @blur="focused(false)">
         </a>
         <div class="media-browser-actions" :class="{'active': showActions}">
-            <a href="#" class="action-toggle"
-              :aria-label="translate('COM_MEDIA_OPEN_ITEM_ACTIONS')">
+            <button class="action-toggle" type="button" ref="actionToggle"
+              :aria-label="translate('COM_MEDIA_OPEN_ITEM_ACTIONS')" @keyup.enter="openActions()"
+               @focus="focused(true)" @blur="focused(false)" @keyup.space="openActions()"
+               @keyup.down="openActions()" @keyup.up="openLastActions()">
                 <span class="image-browser-action fa fa-ellipsis-h" aria-hidden="true"
-                      @click.stop="showActions = true"></span>
-            </a>
-            <div class="media-browser-actions-list">
-                <a href="#" class="action-rename"
-                  :aria-label="translate('COM_MEDIA_ACTIN_RENAME')">
-                    <span class="image-browser-action fa fa-text-width" aria-hidden="true"
-                          @click.stop="openRenameModal()"></span>
-                </a>
-                <a href="#" class="action-delete"
-                  :aria-label="translate('COM_MEDIA_ACTION_DELETE')">
-                    <span class="image-browser-action fa fa-trash" aria-hidden="true" @click.stop="openConfirmDeleteModal()"></span>
-                </a>
+                      @click.stop="openActions()"></span>
+            </button>
+            <div v-if="showActions" class="media-browser-actions-list">
+                <ul>
+                    <li>
+                        <button type="button" class="action-rename" ref="actionRename" @keyup.enter="openRenameModal()"
+                          :aria-label="translate('COM_MEDIA_ACTION_RENAME')" @keyup.space="openRenameModal()"
+                          @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
+                          @keyup.up="$refs.actionDelete.focus()" @keyup.down="$refs.actionDelete.focus()">
+                            <span class="image-browser-action fa fa-text-width" aria-hidden="true"
+                                  @click.stop="openRenameModal()"></span>
+                        </button>
+                    </li>
+                    <li>
+                        <button type="button" class="action-delete" ref="actionDelete" @keyup.enter="openConfirmDeleteModal()"
+                          :aria-label="translate('COM_MEDIA_ACTION_DELETE')" @keyup.space="openConfirmDeleteModal()"
+                           @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
+                           @keyup.up="$refs.actionRename.focus()" @keyup.down="$refs.actionRename.focus()">
+                            <span class="image-browser-action fa fa-trash" aria-hidden="true" @click.stop="openConfirmDeleteModal()"></span>
+                        </button>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>
@@ -46,7 +59,7 @@
                 showActions: false,
             }
         },
-        props: ['item'],
+        props: ['item', 'focused'],
         mixins: [navigable],
         methods: {
             /* Handle the on preview double click event */
@@ -55,6 +68,7 @@
             },
             /* Opening confirm delete modal */
             openConfirmDeleteModal(){
+	            this.$store.commit(types.UNSELECT_ALL_BROWSER_ITEMS);
 	            this.$store.commit(types.SELECT_BROWSER_ITEM, this.item);
 	            this.$store.commit(types.SHOW_CONFIRM_DELETE_MODAL);
             },
@@ -67,6 +81,21 @@
            toggleSelect() {
 	           this.$store.dispatch('toggleBrowserItemSelect', this.item);
            },
+           /* Open actions dropdown */
+           openActions() {
+               this.showActions = true;
+               this.$nextTick(() => this.$refs.actionRename.focus());
+           },
+           /* Open actions dropdown and focus on last element */
+           openLastActions() {
+               this.showActions = true;
+               this.$nextTick(() => this.$refs.actionDelete.focus());
+           },
+           /* Hide actions dropdown */
+           hideActions() {
+               this.showActions = false;
+               this.$nextTick(() => this.$refs.actionToggle.focus());
+           },
         }
     }
 </script>
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/file.vue b/administrator/components/com_media/resources/scripts/components/browser/items/file.vue
index c66979dd35514..85e4a6ba8343d 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/file.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/file.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="media-browser-item-file" @mouseleave="showActions = false">
+    <div class="media-browser-item-file" @mouseleave="hideActions()">
         <div class="media-browser-item-preview">
             <div class="file-background">
                 <div class="file-icon">
@@ -12,33 +12,53 @@
         </div>
         <a href="#" class="media-browser-select"
           @click.stop="toggleSelect()"
-          :aria-label="translate('COM_MEDIA_TOGGLE_SELECT_ITEM')">
+          :aria-label="translate('COM_MEDIA_TOGGLE_SELECT_ITEM')"
+          @focus="focused(true)" @blur="focused(false)">
         </a>
         <div class="media-browser-actions" :class="{'active': showActions}">
-            <a href="#" class="action-toggle"
-              :aria-label="translate('COM_MEDIA_OPEN_ITEM_ACTIONS')">
+            <button href="#" class="action-toggle" type="button" ref="actionToggle"
+              :aria-label="translate('COM_MEDIA_OPEN_ITEM_ACTIONS')" @keyup.enter="openActions()"
+               @focus="focused(true)" @blur="focused(false)" @keyup.space="openActions()"
+               @keyup.down="openActions()" @keyup.up="openLastActions()">
                 <span class="image-browser-action fa fa-ellipsis-h" aria-hidden="true"
-                      @click.stop="showActions = true"></span>
-            </a>
-            <div class="media-browser-actions-list">
-                <a href="#" class="action-download"
-                   :aria-label="translate('COM_MEDIA_ACTION_DOWNLOAD')">
-                    <span class="image-browser-action fa fa-download" aria-hidden="true"
-                          @click.stop="download()"></span>
-                </a>
-                <a href="#" class="action-rename"
-                  :aria-label="translate('COM_MEDIA_ACTIN_RENAME')">
-                    <span class="image-browser-action fa fa-text-width" aria-hidden="true"
-                          @click.stop="openRenameModal()"></span>
-                </a>
-                <a href="#" class="action-url"
-                  :aria-label="translate('COM_MEDIA_ACTION_SHARE')">
-                    <span class="image-browser-action fa fa-link" aria-hidden="true" @click.stop="openShareUrlModal()"></span>
-                </a>
-                <a href="#" class="action-delete"
-                  :aria-label="translate('COM_MEDIA_ACTION_DELETE')">
-                    <span class="image-browser-action fa fa-trash" aria-hidden="true" @click.stop="openConfirmDeleteModal()"></span>
-                </a>
+                      @click.stop="openActions()"></span>
+            </button>
+            <div v-if="showActions" class="media-browser-actions-list">
+                <ul>
+                    <li>
+                        <button type="button" class="action-download" ref="actionDownload" @keyup.enter="download()"
+                           :aria-label="translate('COM_MEDIA_ACTION_DOWNLOAD')" @keyup.space="download()"
+                            @keyup.up="$refs.actionDelete.focus()" @keyup.down="$refs.actionRename.focus()">
+                            <span class="image-browser-action fa fa-download" aria-hidden="true"
+                                  @click.stop="download()"></span>
+                        </button>
+                    </li>
+                    <li>
+                        <button type="button" class="action-rename" ref="actionRename" @keyup.space="openRenameModal()"
+                          :aria-label="translate('COM_MEDIA_ACTION_RENAME')" @keyup.enter="openRenameModal()"
+                          @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
+                          @keyup.up="$refs.actionDownload.focus()" @keyup.down="$refs.actionUrl.focus()">
+                            <span class="image-browser-action fa fa-text-width" aria-hidden="true"
+                                  @click.stop="openRenameModal()"></span>
+                        </button>
+                    </li>
+                    <li>
+                        <button type="button" class="action-url" ref="actionUrl" @keyup.space="openShareUrlModal()"
+                          :aria-label="translate('COM_MEDIA_ACTION_SHARE')" @keyup.enter="openShareUrlModal()"
+                          @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
+                          @keyup.up="$refs.actionRename.focus()" @keyup.down="$refs.actionDelete.focus()">
+                            <span class="image-browser-action fa fa-link" aria-hidden="true" @click.stop="openShareUrlModal()"></span>
+                        </button>
+                    </li>
+                    <li>
+                        <button type="button" class="action-delete" ref="actionDelete" @keyup.space="openConfirmDeleteModal()"
+                          :aria-label="translate('COM_MEDIA_ACTION_DELETE')" @keyup.enter="openConfirmDeleteModal()"
+                          @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
+                          @keyup.up="$refs.actionUrl.focus()" @keyup.down="$refs.actionDownload.focus()">
+                            <span class="image-browser-action fa fa-trash" aria-hidden="true" @click.stop="openConfirmDeleteModal()"></span>
+                        </button>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>
@@ -54,7 +74,7 @@
                 showActions: false,
             }
         },
-        props: ['item'],
+        props: ['item', 'focused'],
         methods: {
 	        /* Preview an item */
 	        download() {
@@ -62,6 +82,7 @@
 	        },
             /* Opening confirm delete modal */
             openConfirmDeleteModal(){
+                    this.$store.commit(types.UNSELECT_ALL_BROWSER_ITEMS);
 	            this.$store.commit(types.SELECT_BROWSER_ITEM, this.item);
 	            this.$store.commit(types.SHOW_CONFIRM_DELETE_MODAL);
             },
@@ -79,6 +100,21 @@
                 this.$store.commit(types.SELECT_BROWSER_ITEM, this.item);
                 this.$store.commit(types.SHOW_SHARE_MODAL);
             },
+            /* Open actions dropdown */
+            openActions() {
+                this.showActions = true;
+                this.$nextTick(() => this.$refs.actionDownload.focus());
+            },
+            /* Open actions dropdown and focus on last element */
+            openLastActions() {
+                this.showActions = true;
+                this.$nextTick(() => this.$refs.actionDelete.focus());
+            },
+            /* Hide actions dropdown */
+            hideActions() {
+                this.showActions = false;
+                this.$nextTick(() => this.$refs.actionToggle.focus());
+            },
         }
     }
 </script>
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/image.vue b/administrator/components/com_media/resources/scripts/components/browser/items/image.vue
index aec1ebb7c8c7f..d5806a35db715 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/image.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/image.vue
@@ -1,7 +1,7 @@
 <template>
-    <div class="media-browser-image" @dblclick="openPreview()" @mouseleave="showActions = false">
+    <div class="media-browser-image" @dblclick="openPreview()" @mouseleave="hideActions()">
         <div class="media-browser-item-preview">
-            <div class="image-brackground">
+            <div class="image-background">
                 <div class="image-cropped" :style="{ backgroundImage: 'url(' + thumbUrl + ')' }"></div>
             </div>
         </div>
@@ -10,43 +10,71 @@
         </div>
         <a href="#" class="media-browser-select"
           @click.stop="toggleSelect()"
-          :aria-label="translate('COM_MEDIA_TOGGLE_SELECT_ITEM')">
+          :aria-label="translate('COM_MEDIA_TOGGLE_SELECT_ITEM')"
+          @focus="focused(true)" @blur="focused(false)">
         </a>
         <div class="media-browser-actions" :class="{'active': showActions}">
-            <a href="#" class="action-toggle"
-              :aria-label="translate('COM_MEDIA_OPEN_ITEM_ACTIONS')">
+            <button type="button" class="action-toggle" ref="actionToggle"
+               :aria-label="translate('COM_MEDIA_OPEN_ITEM_ACTIONS')" @keyup.enter="openActions()"
+               @focus="focused(true)" @blur="focused(false)" @keyup.space="openActions()"
+               @keyup.down="openActions()" @keyup.up="openLastActions()">
                 <span class="image-browser-action fa fa-ellipsis-h" aria-hidden="true"
-                      @click.stop="showActions = true"></span>
-            </a>
-            <div class="media-browser-actions-list">
-                <a href="#" class="action-preview"
-                  :aria-label="translate('COM_MEDIA_ACTION_PREVIEW')">
-                    <span class="image-browser-action fa fa-search-plus" aria-hidden="true"
-                          @click.stop="openPreview()"></span>
-                </a>
-                <a href="#" class="action-download"
-                  :aria-label="translate('COM_MEDIA_ACTION_DOWNLOAD')">
-                    <span class="image-browser-action fa fa-download" aria-hidden="true"
-                          @click.stop="download()"></span>
-                </a>
-                <a href="#" class="action-rename"
-                  :aria-label="translate('COM_MEDIA_ACTIN_RENAME')">
-                    <span class="image-browser-action fa fa-text-width" aria-hidden="true"
-                          @click.stop="openRenameModal()"></span>
-                </a>
-                <a href="#" class="action-edit"
-                  v-if="canEdit"
-                    :aria-label="translate('COM_MEDIA_ACTION_EDIT')">
-                    <span class="image-browser-action fa fa-pencil" aria-hidden="true" @click.stop="editItem()"></span>
-                </a>
-                <a href="#" class="action-url"
-                  :aria-label="translate('COM_MEDIA_ACTION_SHARE')">
-                    <span class="image-browser-action fa fa-link" aria-hidden="true" @click.stop="openShareUrlModal()"></span>
-                </a>
-                <a href="#" class="action-delete"
-                  :aria-label="translate('COM_MEDIA_ACTION_DELETE')">
-                    <span class="image-browser-action fa fa-trash" aria-hidden="true" @click.stop="openConfirmDeleteModal()"></span>
-                </a>
+                      @click.stop="openActions()"></span>
+            </button>
+            <div v-if="showActions" class="media-browser-actions-list">
+                <ul>
+                    <li>
+                        <button type="button" class="action-preview" ref="actionPreview" @keyup.enter="openPreview()"
+                            :aria-label="translate('COM_MEDIA_ACTION_PREVIEW')" @keyup.space="openPreview()"
+                            @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
+                            @keyup.up="$refs.actionDelete.focus()" @keyup.down="$refs.actionDownload.focus()">
+                            <span class="image-browser-action fa fa-search-plus" aria-hidden="true"
+                                  @click.stop="openPreview()"></span>
+                        </button>
+                    </li>
+                    <li>
+                        <button type="button" class="action-download" ref="actionDownload" @keyup.enter="download()"
+                            :aria-label="translate('COM_MEDIA_ACTION_DOWNLOAD')" @keyup.space="download()"
+                            @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
+                            @keyup.up="$refs.actionPreview.focus()" @keyup.down="$refs.actionRename.focus()">
+                            <span class="image-browser-action fa fa-download" aria-hidden="true"
+                                  @click.stop="download()"></span>
+                        </button>
+                    </li>
+                    <li>
+                        <button type="button" class="action-rename" ref="actionRename" @keyup.enter="openRenameModal()"
+                            :aria-label="translate('COM_MEDIA_ACTION_RENAME')" @keyup.space="openRenameModal()"
+                            @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
+                            @keyup.up="$refs.actionDownload.focus()" @keyup.down="canEdit ? $refs.actionEdit.focus() : $refs.actionShare.focus()">
+                            <span class="image-browser-action fa fa-text-width" aria-hidden="true"
+                                  @click.stop="openRenameModal()"></span>
+                        </button>
+                    </li>
+                    <li v-if="canEdit">
+                        <button type="button" class="action-edit" ref="actionEdit"
+                            :aria-label="translate('COM_MEDIA_ACTION_EDIT')" @keyup.enter="editItem()" @keyup.space="editItem()"
+                            @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
+                            @keyup.up="$refs.actionRename.focus()" @keyup.down="$refs.actionShare.focus()">
+                            <span class="image-browser-action fa fa-pencil" aria-hidden="true" @click.stop="editItem()"></span>
+                        </button>
+                    </li>
+                    <li>
+                        <button type="button" class="action-url" ref="actionShare" @keyup.enter="openShareUrlModal()"
+                          :aria-label="translate('COM_MEDIA_ACTION_SHARE')" @keyup.space="openShareUrlModal()"
+                          @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
+                          @keyup.up="canEdit ? $refs.actionEdit.focus() : $refs.actionRename.focus()" @keyup.down="$refs.actionDelete.focus()">
+                            <span class="image-browser-action fa fa-link" aria-hidden="true" @click.stop="openShareUrlModal()"></span>
+                        </button>
+                    </li>
+                    <li>
+                        <button type="button" class="action-delete" ref="actionDelete" @keyup.enter="openConfirmDeleteModal()"
+                          :aria-label="translate('COM_MEDIA_ACTION_DELETE')" @keyup.space="openConfirmDeleteModal()"
+                           @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
+                           @keyup.up="$refs.actionShare.focus()" @keyup.down="$refs.actionPreview.focus()">
+                            <span class="image-browser-action fa fa-trash" aria-hidden="true" @click.stop="openConfirmDeleteModal()"></span>
+                        </button>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>
@@ -62,7 +90,7 @@
                 showActions: false,
             }
         },
-        props: ['item'],
+        props: ['item', 'focused'],
         computed: {
             /* Get the item url */
             thumbUrl() {
@@ -85,7 +113,8 @@
             },
             /* Opening confirm delete modal */
             openConfirmDeleteModal(){
-	            this.$store.commit(types.SELECT_BROWSER_ITEM, this.item);
+                this.$store.commit(types.UNSELECT_ALL_BROWSER_ITEMS);
+	        this.$store.commit(types.SELECT_BROWSER_ITEM, this.item);
                 this.$store.commit(types.SHOW_CONFIRM_DELETE_MODAL);
             },
             /* Rename an item */
@@ -109,6 +138,21 @@
                 this.$store.commit(types.SELECT_BROWSER_ITEM, this.item);
                 this.$store.commit(types.SHOW_SHARE_MODAL);
             },
+            /* Open actions dropdown */
+            openActions() {
+                this.showActions = true;
+                this.$nextTick(() => this.$refs.actionPreview.focus());
+            },
+            /* Open actions dropdown and focus on last element */
+            openLastActions() {
+                this.showActions = true;
+                this.$nextTick(() => this.$refs.actionDelete.focus());
+            },
+            /* Hide actions dropdown */
+            hideActions() {
+                this.showActions = false;
+                this.$nextTick(() => this.$refs.actionToggle.focus());
+            },
         }
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/item.js b/administrator/components/com_media/resources/scripts/components/browser/items/item.js
index 7ed31be0b273a..3ddd1b8cab11e 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/item.js
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/item.js
@@ -6,114 +6,157 @@ import Row from "./row.vue";
 import * as types from "./../../../store/mutation-types";
 
 export default {
-    functional: true,
     props: ['item'],
-    render: function (createElement, context) {
-
-        const store = context.parent.$store;
-        const item = context.props.item;
-
+    data() {
+        return {
+            hoverActive: false,
+        }
+    },
+    methods: {
         /**
          * Return the correct item type component
          */
-        function itemType() {
-            if (store.state.listView == 'table') {
+        itemType() {
+            if (this.$store.state.listView === 'table') {
                 return Row;
             }
 
             let imageExtensions = ['jpg', 'jpeg', 'png', 'gif'];
-	        let videoExtensions = ['mp4'];
+            let videoExtensions = ['mp4'];
 
             // Render directory items
-            if (item.type === 'dir') return Directory;
+            if (this.item.type === 'dir') return Directory;
 
             // Render image items
-            if (item.extension && imageExtensions.indexOf(item.extension.toLowerCase()) !== -1) {
+            if (this.item.extension && imageExtensions.indexOf(this.item.extension.toLowerCase()) !== -1) {
                 return Image;
             }
 
-	        // Render video items
-	        if (item.extension && videoExtensions.indexOf(item.extension.toLowerCase()) !== -1) {
-		        return Video;
-	        }
+            // Render video items
+            if (this.item.extension && videoExtensions.indexOf(this.item.extension.toLowerCase()) !== -1) {
+                return Video;
+            }
 
             // Default to file type
             return File;
-        }
+        },
 
         /**
          * Get the styles for the media browser item
          * @returns {{}}
          */
-        function styles() {
-		if (store.state.listView == 'table') {
-		        return {};
-	        }
-
-	        return {
-			        'width': 'calc(' + store.state.gridSize + '% - 20px)',
-	        };
-        }
+        styles() {
+            if (this.$store.state.listView === 'table') {
+                return {};
+            }
+
+            return {
+                'width': 'calc(' + this.$store.state.gridSize + '% - 20px)',
+            };
+        },
 
         /**
          * Whether or not the item is currently selected
          * @returns {boolean}
          */
-        function isSelected() {
-            return store.state.selectedItems.some(selected => selected.path === item.path);
-        }
+        isSelected() {
+            return this.$store.state.selectedItems.some(selected => selected.path === this.item.path);
+        },
+
+        /**
+         * Whether or not the item is currently active (on hover or via tab)
+         * @returns {boolean}
+         */
+        isHoverActive() {
+            return this.hoverActive;
+        },
+
+        /**
+         * Turns on the hover class
+         */
+        mouseover() {
+            this.hoverActive = true;
+        },
+
+        /**
+         * Turns off the hover class
+         */
+        mouseleave() {
+            this.hoverActive = false;
+        },
 
         /**
          * Handle the click event
          * @param event
          */
-        function handleClick(event) {
-	        let path = false;
-	        const data = {
-		        path: path,
-		        thumb: false,
-		        fileType: item.mime_type ? item.mime_type : false,
-		        extension: item.extension ? item.extension : false,
-	        };
-
-	        if (item.type === 'file') {
-	            data.path = item.path;
-	            data.thumb = item.thumb ? item.thumb : false;
-
-		        const ev = new CustomEvent('onMediaFileSelected', {"bubbles":true, "cancelable":false, "detail": data});
-		        window.parent.document.dispatchEvent(ev);
-	        }
+        handleClick(event) {
+            let path = false;
+            const data = {
+                path: path,
+                thumb: false,
+                fileType: this.item.mime_type ? this.item.mime_type : false,
+                extension: this.item.extension ? this.item.extension : false,
+            };
+
+            if (this.item.type === 'file') {
+                data.path = this.item.path;
+                data.thumb = this.item.thumb ? this.item.thumb : false;
+
+                const ev = new CustomEvent('onMediaFileSelected', {
+                    "bubbles": true,
+                    "cancelable": false,
+                    "detail": data
+                });
+                window.parent.document.dispatchEvent(ev);
+            }
 
             // Handle clicks when the item was not selected
-            if (!isSelected()) {
+            if (!this.isSelected()) {
                 // Unselect all other selected items, if the shift key was not pressed during the click event
                 if (!(event.shiftKey || event.keyCode === 13)) {
-                    store.commit(types.UNSELECT_ALL_BROWSER_ITEMS);
+                    this.$store.commit(types.UNSELECT_ALL_BROWSER_ITEMS);
                 }
-                store.commit(types.SELECT_BROWSER_ITEM, item);
+                this.$store.commit(types.SELECT_BROWSER_ITEM, this.item);
                 return;
             }
 
             // If more than one item was selected and the user clicks again on the selected item,
             // he most probably wants to unselect all other items.
-            if (store.state.selectedItems.length > 1) {
-                store.commit(types.UNSELECT_ALL_BROWSER_ITEMS);
-                store.commit(types.SELECT_BROWSER_ITEM, item);
+            if (this.$store.state.selectedItems.length > 1) {
+                this.$store.commit(types.UNSELECT_ALL_BROWSER_ITEMS);
+                this.$store.commit(types.SELECT_BROWSER_ITEM, this.item);
             }
+        },
+
+        /**
+         * Handle the when an element is focused in the child to display the layover for a11y
+         * @param value
+         */
+        focused(value) {
+            value ? this.mouseover() : this.mouseleave();
         }
+    },
+    render: function (createElement) {
 
         return createElement('div', {
                 'class': {
                     'media-browser-item': true,
-                    selected: isSelected(),
+                    selected: this.isSelected(),
+                    active: this.isHoverActive(),
                 },
                 on: {
-                    click: handleClick,
-                }
+                    click: this.handleClick,
+                    mouseover: this.mouseover,
+                    mouseleave: this.mouseleave,
+                    focused: this.focused,
+                },
             },
             [
-                createElement(itemType(), {
-                    props: context.props,
+                createElement(this.itemType(), {
+                    props: {
+                        item: this.item,
+                        focused: this.focused,
+                    },
                 })
             ]
         );
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/video.vue b/administrator/components/com_media/resources/scripts/components/browser/items/video.vue
index bf18c0e8fe414..fe4a1f22f737f 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/video.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/video.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="media-browser-image" @dblclick="openPreview()" @mouseleave="showActions = false">
+    <div class="media-browser-image" @dblclick="openPreview()" @mouseleave="hideActions()">
         <div class="media-browser-item-preview">
             <div class="file-background">
                 <div class="file-icon">
@@ -15,35 +15,59 @@
           :aria-label="translate('COM_MEDIA_TOGGLE_SELECT_ITEM')">
         </a>
         <div class="media-browser-actions" :class="{'active': showActions}">
-            <a href="#" class="action-toggle"
-              :aria-label="translate('COM_MEDIA_OPEN_ITEM_ACTIONS')">
+            <button type="button" class="action-toggle" ref="actionToggle" @keyup.enter="openActions()"
+              :aria-label="translate('COM_MEDIA_OPEN_ITEM_ACTIONS')"
+               @focus="focused(true)" @blur="focused(false)" @keyup.space="openActions()"
+               @keyup.down="openActions()" @keyup.up="openLastActions()">
                 <span class="image-browser-action fa fa-ellipsis-h" aria-hidden="true"
-                      @click.stop="showActions = true"></span>
-            </a>
-            <div class="media-browser-actions-list">
-                <a href="#" class="action-preview"
-                  :aria-label="translate('COM_MEDIA_ACTION_PREVIEW')">
-                    <span class="image-browser-action fa fa-search-plus" aria-hidden="true"
-                          @click.stop="openPreview()"></span>
-                </a>
-                <a href="#" class="action-download"
-                   :aria-label="translate('COM_MEDIA_ACTION_DOWNLOAD')">
-                    <span class="image-browser-action fa fa-download" aria-hidden="true"
-                          @click.stop="download()"></span>
-                </a>
-                <a href="#" class="action-rename"
-                  :aria-label="translate('COM_MEDIA_ACTIN_RENAME')">
-                    <span class="image-browser-action fa fa-text-width" aria-hidden="true"
-                          @click.stop="openRenameModal()"></span>
-                </a>
-                <a href="#" class="action-url"
-                  :aria-label="translate('COM_MEDIA_ACTION_SHARE')">
-                    <span class="image-browser-action fa fa-link" aria-hidden="true" @click.stop="openShareUrlModal()"></span>
-                </a>
-                <a href="#" class="action-delete"
-                  :aria-label="translate('COM_MEDIA_ACTION_DELETE')">
-                    <span class="image-browser-action fa fa-trash" aria-hidden="true" @click.stop="openConfirmDeleteModal()"></span>
-                </a>
+                      @click.stop="openActions()"></span>
+            </button>
+            <div v-if="showActions" class="media-browser-actions-list">
+                <ul>
+                    <li>
+                        <button type="button" class="action-preview" ref="actionPreview" @keyup.enter="openPreview()"
+                           :aria-label="translate('COM_MEDIA_ACTION_PREVIEW')" @keyup.space="openPreview()"
+                           @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
+                           @keyup.up="$refs.actionDelete.focus()" @keyup.down="$refs.actionDownload.focus()">
+                            <span class="image-browser-action fa fa-search-plus" aria-hidden="true"
+                                  @click.stop="openPreview()"></span>
+                        </button>
+                    </li>
+                    <li>
+                        <button type="button" class="action-download" ref="actionDownload" @keyup.enter="download()"
+                           :aria-label="translate('COM_MEDIA_ACTION_DOWNLOAD')" @keyup.space="download()"
+                           @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
+                           @keyup.up="$refs.actionPreview.focus()" @keyup.down="$refs.actionRename.focus()">
+                            <span class="image-browser-action fa fa-download" aria-hidden="true"
+                                  @click.stop="download()"></span>
+                        </button>
+                    </li>
+                    <li>
+                        <button type="button" class="action-rename" ref="actionRename" @keyup.enter="openRenameModal()"
+                          :aria-label="translate('COM_MEDIA_ACTION_RENAME')" @keyup.space="openRenameModal()"
+                          @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
+                          @keyup.up="$refs.actionDownload.focus()" @keyup.down="$refs.actionShare.focus()">
+                            <span class="image-browser-action fa fa-text-width" aria-hidden="true"
+                                  @click.stop="openRenameModal()"></span>
+                        </button>
+                    </li>
+                    <li>
+                        <button type="button" class="action-url" ref="actionShare" @keyup.enter="openShareUrlModal()"
+                          :aria-label="translate('COM_MEDIA_ACTION_SHARE')" @keyup.space="openShareUrlModal()"
+                          @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
+                          @keyup.up="$refs.actionRename.focus()" @keyup.down="$refs.actionDelete.focus()">
+                            <span class="image-browser-action fa fa-link" aria-hidden="true" @click.stop="openShareUrlModal()"></span>
+                        </button>
+                    </li>
+                    <li>
+                        <button type="button" class="action-delete" ref="actionDelete" @keyup.enter="openConfirmDeleteModal()"
+                          :aria-label="translate('COM_MEDIA_ACTION_DELETE')" @keyup.space="openConfirmDeleteModal()"
+                           @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
+                           @keyup.up="$refs.actionShare.focus()" @keyup.down="$refs.actionPreview.focus()">
+                            <span class="image-browser-action fa fa-trash" aria-hidden="true" @click.stop="openConfirmDeleteModal()"></span>
+                        </button>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>
@@ -59,7 +83,7 @@
                 showActions: false,
             }
         },
-        props: ['item'],
+        props: ['item', 'focused'],
         methods: {
             /* Preview an item */
             openPreview() {
@@ -72,6 +96,7 @@
 	        },
             /* Opening confirm delete modal */
             openConfirmDeleteModal(){
+                    this.$store.commit(types.UNSELECT_ALL_BROWSER_ITEMS);
 	            this.$store.commit(types.SELECT_BROWSER_ITEM, this.item);
 	            this.$store.commit(types.SHOW_CONFIRM_DELETE_MODAL);
             },
@@ -85,6 +110,21 @@
                 this.$store.commit(types.SELECT_BROWSER_ITEM, this.item);
                 this.$store.commit(types.SHOW_SHARE_MODAL);
             },
+            /* Open actions dropdown */
+            openActions() {
+                this.showActions = true;
+                this.$nextTick(() => this.$refs.actionPreview.focus());
+            },
+            /* Open actions dropdown and focus on last element */
+            openLastActions() {
+                this.showActions = true;
+                this.$nextTick(() => this.$refs.actionDelete.focus());
+            },
+            /* Hide actions dropdown */
+            hideActions() {
+                this.showActions = false;
+                this.$nextTick(() => this.$refs.actionToggle.focus());
+            },
         }
     }
 </script>
diff --git a/administrator/components/com_media/resources/scripts/components/infobar/infobar.vue b/administrator/components/com_media/resources/scripts/components/infobar/infobar.vue
index e0af862215f64..4d9959292335d 100644
--- a/administrator/components/com_media/resources/scripts/components/infobar/infobar.vue
+++ b/administrator/components/com_media/resources/scripts/components/infobar/infobar.vue
@@ -14,10 +14,10 @@
                 <dt>{{ translate('COM_MEDIA_MEDIA_TYPE') }}</dt>
                 <dd>{{ item.type || '-' }}</dd>
 
-                <dt>{{ translate('COM_MEDIA_MEDIA_CREATED_AT') }}</dt>
+                <dt>{{ translate('COM_MEDIA_MEDIA_DATE_CREATED') }}</dt>
                 <dd>{{ item.create_date_formatted }}</dd>
 
-                <dt>{{ translate('COM_MEDIA_MEDIA_MODIFIED_AT') }}</dt>
+                <dt>{{ translate('COM_MEDIA_MEDIA_DATE_MODIFIED') }}</dt>
                 <dd>{{ item.modified_date_formatted }}</dd>
 
                 <dt>{{ translate('COM_MEDIA_MEDIA_DIMENSION') }}</dt>
diff --git a/administrator/components/com_media/resources/scripts/components/modals/confirm-delete-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/confirm-delete-modal.vue
index 14f9a1badf92c..4843c6965a174 100644
--- a/administrator/components/com_media/resources/scripts/components/modals/confirm-delete-modal.vue
+++ b/administrator/components/com_media/resources/scripts/components/modals/confirm-delete-modal.vue
@@ -1,39 +1,39 @@
-<template>
-    <media-modal v-if="$store.state.showConfirmDeleteModal" :size="'md'" @close="close()" :show-close="false">
-        <h3 slot="header" class="modal-title">{{ translate('COM_MEDIA_CONFIRM_DELETE_MODEL_HEADING') }}</h3>
-        <div slot="body">
-            <div class="desc">
-                {{ translate('COM_MEDIA_CONFIRM_DELETE_MODEL_DESC') }}
-            </div>
-        </div>
-        <div slot="footer">
-            <button class="btn btn-danger" @click="deleteItem()">{{ translate('COM_MEDIA_CONFIRM_DELETE_MODEL') }}</button>
-            <button class="btn btn-success" @click="close()">{{ translate('JCANCEL') }}</button>
-        </div>
-    </media-modal>
-</template>
-
-<script>
-    import * as types from "./../../store/mutation-types";
-
-    export default {
-        name: 'media-share-modal',
-        computed: {
-            item() {
-                // TODO @DN this is not allowed in vuex strict mode!
-                return this.$store.state.selectedItems[this.$store.state.selectedItems.length - 1];
-            }
-        },
-        methods: {
-            /* Delete Item */
-            deleteItem() {
-                this.$store.dispatch('deleteItem', this.item);
-                this.$store.commit(types.HIDE_CONFIRM_DELETE_MODAL);
-            },
-            /* Close the modal instance */
-            close() {
-                this.$store.commit(types.HIDE_CONFIRM_DELETE_MODAL);
-            },
-        }
-    }
-</script>
+<template>
+    <media-modal v-if="$store.state.showConfirmDeleteModal" :size="'md'" @close="close()" :show-close="false">
+        <h3 slot="header" class="modal-title">{{ translate('COM_MEDIA_CONFIRM_DELETE_MODAL_HEADING') }}</h3>
+        <div slot="body">
+            <div class="desc">
+                {{ translate('JGLOBAL_CONFIRM_DELETE') }}
+            </div>
+        </div>
+        <div slot="footer">
+            <button id="media-delete-item" class="btn btn-danger" @click="deleteItem()">{{ translate('COM_MEDIA_CONFIRM_DELETE_MODAL') }}</button>
+            <button class="btn btn-success" @click="close()">{{ translate('JCANCEL') }}</button>
+        </div>
+    </media-modal>
+</template>
+
+<script>
+    import * as types from "./../../store/mutation-types";
+
+    export default {
+        name: 'media-share-modal',
+        computed: {
+            item() {
+                // TODO @DN this is not allowed in vuex strict mode!
+                return this.$store.state.selectedItems[this.$store.state.selectedItems.length - 1];
+            }
+        },
+        methods: {
+            /* Delete Item */
+            deleteItem() {
+                this.$store.dispatch('deleteSelectedItems');
+                this.$store.commit(types.HIDE_CONFIRM_DELETE_MODAL);
+            },
+            /* Close the modal instance */
+            close() {
+                this.$store.commit(types.HIDE_CONFIRM_DELETE_MODAL);
+            },
+        }
+    }
+</script>
diff --git a/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue
index fbaad34e93015..8e9a9d083dc82 100644
--- a/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue
+++ b/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue
@@ -1,19 +1,19 @@
 <template>
-    <media-modal v-if="$store.state.showCreateFolderModal" :size="'sm'" @close="close()">
+    <media-modal v-if="$store.state.showCreateFolderModal" :size="'md'" @close="close()">
         <h3 slot="header" class="modal-title">{{ translate('COM_MEDIA_CREATE_NEW_FOLDER') }}</h3>
         <div slot="body">
             <form class="form" @submit.prevent="save" novalidate>
                 <div class="form-group">
-                    <label for="folder">{{ translate('COM_MEDIA_FOLDER') }}</label>
-                    <input id="folder" class="form-control" placeholder="Folder"
+                    <label for="folder">{{ translate('COM_MEDIA_FOLDER_NAME') }}</label>
+                    <input id="folder" class="form-control"
                            v-focus="true" v-model.trim="folder" @input="folder = $event.target.value"
                            required autocomplete="off">
                 </div>
             </form>
         </div>
         <div slot="footer">
-            <button class="btn btn-link" @click="close()">{{ translate('JCANCEL') }}</button>
-            <button class="btn btn-success" @click="save()" :disabled="!isValid()">{{ translate('JAPPLY') }}
+            <button class="btn btn-secondary" @click="close()">{{ translate('JCANCEL') }}</button>
+            <button class="btn btn-success" @click="save()" :disabled="!isValid()">{{ translate('JACTION_CREATE') }}
             </button>
         </div>
     </media-modal>
diff --git a/administrator/components/com_media/resources/scripts/components/modals/modal.vue b/administrator/components/com_media/resources/scripts/components/modals/modal.vue
index 2a25ea8fe347f..e1e57fbb8f98a 100644
--- a/administrator/components/com_media/resources/scripts/components/modals/modal.vue
+++ b/administrator/components/com_media/resources/scripts/components/modals/modal.vue
@@ -2,7 +2,7 @@
     <div class="media-modal-backdrop" @click="close()">
         <div class="modal" @click.stop style="display: flex">
             <slot name="backdrop-close"></slot>
-            <div class="modal-dialog" :class="modalClass" role="document">
+            <div class="modal-dialog" :class="modalClass" role="alertdialog">
                 <div class="modal-content">
                     <div class="modal-header">
                         <slot name="header"></slot>
diff --git a/administrator/components/com_media/resources/scripts/components/modals/preview-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/preview-modal.vue
index c6e7d1a0ab8cd..2d918ec2d6eba 100644
--- a/administrator/components/com_media/resources/scripts/components/modals/preview-modal.vue
+++ b/administrator/components/com_media/resources/scripts/components/modals/preview-modal.vue
@@ -15,7 +15,6 @@
 
 <script>
     import * as types from "../../store/mutation-types";
-    import * as item from "../../components/browser/items/item";
 
     export default {
         name: 'media-preview-modal',
diff --git a/administrator/components/com_media/resources/scripts/components/modals/rename-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/rename-modal.vue
index a475275497f28..a61e0d3f092a1 100644
--- a/administrator/components/com_media/resources/scripts/components/modals/rename-modal.vue
+++ b/administrator/components/com_media/resources/scripts/components/modals/rename-modal.vue
@@ -15,8 +15,8 @@
             </form>
         </div>
         <div slot="footer">
-            <button class="btn btn-link" @click="close()">{{ translate('JCANCEL') }}</button>
-            <button class="btn btn-success" @click="save()" :disabled="!isValid()">{{ translate('JAPPLY') }}
+            <button type="button" class="btn btn-secondary" @click="close()" @keyup.enter="close()">{{ translate('JCANCEL') }}</button>
+            <button type="button" class="btn btn-success" @click="save()" @keyup.enter="save()" :disabled="!isValid()">{{ translate('JAPPLY') }}
             </button>
         </div>
     </media-modal>
diff --git a/administrator/components/com_media/resources/scripts/components/modals/share-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/share-modal.vue
index 17e2a4a559abf..b55042abae44f 100644
--- a/administrator/components/com_media/resources/scripts/components/modals/share-modal.vue
+++ b/administrator/components/com_media/resources/scripts/components/modals/share-modal.vue
@@ -15,7 +15,7 @@
                         <span class="input-group">
                             <input id="url" ref="urlText" readonly v-model="url" class="form-control input-xxlarge" placeholder="URL" autocomplete="off">
                             <span class="input-group-append">
-                                <a class="btn btn-secondary" role="button" @click="copyToClipboard" title="Copy to clipboard">
+                                <a class="btn btn-secondary" role="button" @click="copyToClipboard" title="{{ translate('COM_MEDIA_SHARE_COPY') }}>
                                     <span class="fa fa-clipboard" aria-hidden="true"></span>
                                 </a>
                             </span>
@@ -25,7 +25,7 @@
             </div>
         </div>
         <div slot="footer">
-            <button class="btn btn-link" @click="close()">{{ translate('JCANCEL') }}</button>
+            <button class="btn btn-secondary" @click="close()">{{ translate('JCANCEL') }}</button>
         </div>
     </media-modal>
 </template>
diff --git a/administrator/components/com_media/resources/scripts/components/toolbar/toolbar.vue b/administrator/components/com_media/resources/scripts/components/toolbar/toolbar.vue
index f80f2b2821301..46518cf467dac 100644
--- a/administrator/components/com_media/resources/scripts/components/toolbar/toolbar.vue
+++ b/administrator/components/com_media/resources/scripts/components/toolbar/toolbar.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="media-toolbar">
+    <div class="media-toolbar"role="toolbar" :aria-label="translate('COM_MEDIA_TOOLBAR_LABEL')">
         <div class="media-loader" v-if="isLoading"></div>
         <div class="media-view-icons">
             <a href="#" class="media-toolbar-icon media-toolbar-select-all"
@@ -9,34 +9,37 @@
             </a>
         </div>
         <media-breadcrumb></media-breadcrumb>
-        <div class="media-view-search-input">
-            <input type="text" @input="changeSearch" :placeholder="translate('COM_MEDIA_SEARCH')"/>
+        <div class="media-view-search-input" role="search">
+            <label for="media_search" class="sr-only">{{ translate('COM_MEDIA_SEARCH') }}</label>
+            <input id="media_search" type="text" @input="changeSearch" :placeholder="translate('COM_MEDIA_SEARCH')"/>
         </div>
         <div class="media-view-icons">
-            <a href="#" class="media-toolbar-icon media-toolbar-decrease-grid-size"
+            <button type="button" class="media-toolbar-icon media-toolbar-decrease-grid-size"
                v-if="isGridView"
                :class="{disabled: isGridSize('xs')}"
                @click.stop.prevent="decreaseGridSize()" 
-               :aria-label="translate('COM_MEDIA_DECREASE_GRID')">
+               :aria-label="translate('COM_MEDIA_DECREASE_GRID')"
+               aria-hidden="true">
                 <span class="fa fa-search-minus" aria-hidden="true"></span>
-            </a>
-            <a href="#" class="media-toolbar-icon media-toolbar-increase-grid-size"
+            </button>
+            <button type="button" class="media-toolbar-icon media-toolbar-increase-grid-size"
                v-if="isGridView"
                :class="{disabled: isGridSize('xl')}"
                @click.stop.prevent="increaseGridSize()" 
-               :aria-label="translate('COM_MEDIA_INCREASE_GRID')">
+               :aria-label="translate('COM_MEDIA_INCREASE_GRID')"
+               aria-hidden="true">
                 <span class="fa fa-search-plus" aria-hidden="true"></span>
-            </a>
-            <a href="#" class="media-toolbar-icon media-toolbar-list-view"
+            </button>
+            <button type="button" href="#" class="media-toolbar-icon media-toolbar-list-view"
                @click.stop.prevent="changeListView()"
                :aria-label="translate('COM_MEDIA_TOGGLE_LIST_VIEW')">
                 <span :class="toggleListViewBtnIcon" aria-hidden="true"></span>
-            </a>
-            <a href="#" class="media-toolbar-icon media-toolbar-info"
+            </button>
+            <button type="button" href="#" class="media-toolbar-icon media-toolbar-info"
                @click.stop.prevent="toggleInfoBar"
                :aria-label="translate('COM_MEDIA_TOGGLE_INFO')">
                 <span class="fa fa-info" aria-hidden="true"></span>
-            </a>
+            </button>
         </div>
     </div>
 </template>
diff --git a/administrator/components/com_media/resources/scripts/plugins/translate.js b/administrator/components/com_media/resources/scripts/plugins/translate.js
index e122b7adc5a91..c5fdc27f558a5 100644
--- a/administrator/components/com_media/resources/scripts/plugins/translate.js
+++ b/administrator/components/com_media/resources/scripts/plugins/translate.js
@@ -16,7 +16,7 @@ Translate.sprintf = function (string, ...args) {
 	return string.replace(/%((%)|s|d)/g, function (m) {
 		var val = args[i];
 
-		if (m == '%d') {
+		if (m === '%d') {
 			val = parseFloat(val);
 			if (isNaN(val)) {
 				val = 0;
diff --git a/administrator/components/com_media/resources/scripts/store/actions.js b/administrator/components/com_media/resources/scripts/store/actions.js
index a693f327880dd..49f31ba1056ee 100644
--- a/administrator/components/com_media/resources/scripts/store/actions.js
+++ b/administrator/components/com_media/resources/scripts/store/actions.js
@@ -25,7 +25,7 @@ function updateUrlPath(path) {
 
 /**
  * Get contents of a directory from the api
- * @param commit
+ * @param context
  * @param payload
  */
 export const getContents = (context, payload) => {
@@ -104,7 +104,7 @@ export const download = (context, payload) => {
 
 /**
  * Toggle the selection state of an item
- * @param commit
+ * @param context
  * @param payload
  */
 export const toggleBrowserItemSelect = (context, payload) => {
@@ -115,11 +115,11 @@ export const toggleBrowserItemSelect = (context, payload) => {
     } else {
         context.commit(types.UNSELECT_BROWSER_ITEM, item);
     }
-}
+};
 
 /**
  * Create a new folder
- * @param commit
+ * @param context
  * @param payload object with the new folder name and its parent directory
  */
 export const createDirectory = (context, payload) => {
@@ -139,7 +139,7 @@ export const createDirectory = (context, payload) => {
 
 /**
  * Create a new folder
- * @param commit
+ * @param context
  * @param payload object with the new folder name and its parent directory
  */
 export const uploadFile = (context, payload) => {
@@ -162,27 +162,6 @@ export const uploadFile = (context, payload) => {
         })
 }
 
-/**
- * Delete a single item
- * @param context
- * @param payload object: the item to delete
- */
-export const deleteItem = (context, payload) => {
-    context.commit(types.SET_IS_LOADING, true);
-    const item = payload;
-    api.delete(item.path)
-        .then(() => {
-            context.commit(types.DELETE_SUCCESS, item);
-            context.commit(types.UNSELECT_ALL_BROWSER_ITEMS);
-            context.commit(types.SET_IS_LOADING, false);
-        })
-        .catch(error => {
-            // TODO error handling
-            context.commit(types.SET_IS_LOADING, false);
-            console.log("error", error);
-        })
-}
-
 /**
  * Rename an item
  * @param context
@@ -209,9 +188,8 @@ export const renameItem = (context, payload) => {
 /**
  * Delete the selected items
  * @param context
- * @param payload object
  */
-export const deleteSelectedItems = (context, payload) => {
+export const deleteSelectedItems = (context) => {
     context.commit(types.SET_IS_LOADING, true);
     // Get the selected items from the store
     const selectedItems = context.state.selectedItems;
@@ -232,4 +210,4 @@ export const deleteSelectedItems = (context, payload) => {
     } else {
         // TODO notify the user that he has to select at least one item
     }
-}
+};
diff --git a/administrator/components/com_media/resources/styles/components/_media-breadcrumb.scss b/administrator/components/com_media/resources/styles/components/_media-breadcrumb.scss
index c9271c9bf1496..07b4389f02971 100644
--- a/administrator/components/com_media/resources/styles/components/_media-breadcrumb.scss
+++ b/administrator/components/com_media/resources/styles/components/_media-breadcrumb.scss
@@ -4,11 +4,18 @@
   margin: 0 auto 0 0;
   font-size: .9rem;
   line-height: $toolbar-height;
-  list-style: outside none none;
   background: transparent;
   border-left: 1px solid $border-color;
-  & > li > a {
-    cursor: pointer;
+
+  ol {
+    display: flex;
+    margin: 0;
+    padding: 0;
+    list-style: outside none none;
+
+    & > li > a {
+      cursor: pointer;
+    }
   }
 }
 
@@ -57,3 +64,32 @@
 .breadcrumb-item + .breadcrumb-item::before {
   display: none;
 }
+
+/* RTL override */
+
+html[dir=rtl] .media-breadcrumb {
+  margin: 0 0 0 auto;
+}
+
+html[dir=rtl] .media-breadcrumb-item::after, .media-breadcrumb-item::before {
+  right: 100%;
+  border-right: 10px solid transparent;
+  border-left: 0;
+}
+
+html[dir=rtl] .media-breadcrumb-item {
+  padding: 0 22px 0 8px;
+}
+
+html[dir=rtl] .media-breadcrumb-item::before {
+  border-right-color: #fafafa;
+}
+
+html[dir=rtl] .media-breadcrumb-item:first-of-type {
+  padding-right: 16px;
+  padding-left: 0;
+}
+
+html[dir=rtl] .media-breadcrumb-item:last-of-type::after {
+  border-right: 10px solid #fff;
+}
diff --git a/administrator/components/com_media/resources/styles/components/_media-browser.scss b/administrator/components/com_media/resources/styles/components/_media-browser.scss
index 5e286470a692e..71ff41b5885aa 100644
--- a/administrator/components/com_media/resources/styles/components/_media-browser.scss
+++ b/administrator/components/com_media/resources/styles/components/_media-browser.scss
@@ -58,7 +58,7 @@
     border-radius: $grid-item-border-radius;
     opacity: 0;
     transition: opacity .2s cubic-bezier(.4, .0, .2, 1);
-    .media-browser-item:hover &, .selected & {
+    .media-browser-item.active &, .selected & {
       opacity: 1;
     }
   }
@@ -86,7 +86,7 @@
   box-shadow: inset 0 0 0 0 $grid-item-icon-color;
   opacity: 0;
   transition: all .3s cubic-bezier(.4, .0, .2, 1);
-  .media-browser-item:hover & {
+  .media-browser-item.active & {
     opacity: 1;
   }
   &::after {
@@ -122,25 +122,33 @@
   right: 0;
   padding: 2px;
   overflow: hidden;
-  > a {
+  > button {
     opacity: 0;
-    .media-browser-item:hover & {
+    .media-browser-item.active & {
       opacity: 1;
     }
   }
   &.active {
-    > a {
+    > button {
       display: none;
     }
   }
+  ul {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+  }
 }
 
 .media-browser-actions-list {
   display: flex;
   flex-direction: column;
-  a {
+  button, a {
+    background-color: transparent;
     position: relative;
     top: 0;
+    padding: 0;
+    border: 0;
     margin-bottom: 3px;
     visibility: hidden;
     opacity: 0;
@@ -190,7 +198,7 @@
   }
 }
 
-.image-brackground {
+.image-background {
   background-color: #fff;
   background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee 100%), linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee 100%);
   background-position: 0 0, 10px 10px;
@@ -361,6 +369,12 @@
   }
 }
 
+.action-toggle {
+  background: transparent;
+  padding: 0;
+  border: 0;
+}
+
 .selected {
   .type {
     &::before {
diff --git a/administrator/components/com_media/resources/styles/components/_media-infobar.scss b/administrator/components/com_media/resources/styles/components/_media-infobar.scss
index 1323e33010510..444d3f7dd8712 100644
--- a/administrator/components/com_media/resources/styles/components/_media-infobar.scss
+++ b/administrator/components/com_media/resources/styles/components/_media-infobar.scss
@@ -11,7 +11,7 @@
   background-color: $info-bg;
   border-left: 1px solid $border-color;
   h2 {
-    padding: 10px ($gutter-width + 30px) 10px $gutter-width;
+    padding: 20px ($gutter-width + 15px) 10px ($gutter-width - 5px);
     margin: (-$gutter-width) (-$gutter-width) $gutter-width;
     font-weight: normal;
     line-height: $info-title-height;
@@ -33,15 +33,9 @@
     padding-left: ($col-gutter-width / 2);
   }
   dt {
-    flex: 0 0 $info-dt-width;
-    max-width: $info-dt-width;
     font-weight: normal;
     color: rgba(0, 0, 0, .54);
   }
-  dd {
-    flex: 0 0 $info-dd-width;
-    max-width: $info-dd-width;
-  }
 }
 
 .infobar-close {
@@ -72,3 +66,24 @@
   border: 2px solid #ccc;
   border-radius: 50%;
 }
+
+/* RTL override */
+
+html[dir=rtl] .media-infobar {
+    left: 0;
+    right: auto;
+}
+
+html[dir=rtl] .infobar-close {
+  left: 0;
+  right: auto;
+}
+
+html[dir=rtl] .media-infobar dd {
+  margin-right: 0;
+  margin-left: auto;
+  direction: ltr;
+}
+html[dir=rtl] .media-infobar h2 {
+  padding: 20px $gutter-width 10px 0;
+}
diff --git a/administrator/components/com_media/resources/styles/components/_media-toolbar.scss b/administrator/components/com_media/resources/styles/components/_media-toolbar.scss
index 876ad2cfd5c8e..16ca03d9b6526 100644
--- a/administrator/components/com_media/resources/styles/components/_media-toolbar.scss
+++ b/administrator/components/com_media/resources/styles/components/_media-toolbar.scss
@@ -19,6 +19,8 @@
   line-height: $toolbar-height;
   color: #464a4c;
   text-align: center;
+  background-color: transparent;
+  border: 0;
   border-left: 1px solid $border-color;
   box-shadow: 1px 0 #fefefe inset;
   &:hover {
diff --git a/administrator/components/com_media/resources/styles/components/_media-tree.scss b/administrator/components/com_media/resources/styles/components/_media-tree.scss
index 29011e90cecb8..ecef74311c2e5 100644
--- a/administrator/components/com_media/resources/styles/components/_media-tree.scss
+++ b/administrator/components/com_media/resources/styles/components/_media-tree.scss
@@ -127,6 +127,35 @@ ul.media-tree {
   vertical-align: middle;
 }
 
+/* RTL override */
+
 .media-tree-item.active > a .item-name {
   font-weight: bold;
 }
+
+html[dir=rtl] .media-tree-item::after, .media-tree-item::before {
+  left: 0;
+  right: 15px;
+}
+
+html[dir=rtl] .media-tree-item::before {
+  margin: 0;
+}
+
+html[dir=rtl] .media-browser-table .dimension, .media-browser-table .size {
+  direction: ltr;
+}
+
+html[dir=rtl] .media-browser-table .created, .media-browser-table .modified {
+  direction: ltr;
+}
+
+html[dir=rtl] .media-tree-item .item-icon {
+  padding-left: 2px;
+  padding-right: 24px;
+}
+
+html[dir=rtl] ul.media-tree ul {
+  margin-right: 24px;
+}
+
diff --git a/administrator/components/com_media/services/provider.php b/administrator/components/com_media/services/provider.php
index d0f5fe96e2196..677f22473c851 100644
--- a/administrator/components/com_media/services/provider.php
+++ b/administrator/components/com_media/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/src/Adapter/AdapterInterface.php b/administrator/components/com_media/src/Adapter/AdapterInterface.php
index 1a3a05041d024..6bbfc000804fa 100644
--- a/administrator/components/com_media/src/Adapter/AdapterInterface.php
+++ b/administrator/components/com_media/src/Adapter/AdapterInterface.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/src/Controller/ApiController.php b/administrator/components/com_media/src/Controller/ApiController.php
index dd086cb54e007..8a13cf6083cfc 100644
--- a/administrator/components/com_media/src/Controller/ApiController.php
+++ b/administrator/components/com_media/src/Controller/ApiController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -53,7 +53,7 @@ public function execute($task)
 			// Check token for requests which do modify files (all except get requests)
 			if ($method !== 'GET' && !Session::checkToken('json'))
 			{
-				throw new \InvalidArgumentException(Text::_('JINVALID_TOKEN'), 403);
+				throw new \InvalidArgumentException(Text::_('JINVALID_TOKEN_NOTICE'), 403);
 			}
 
 			$doTask = strtolower($method) . ucfirst($task);
diff --git a/administrator/components/com_media/src/Controller/DisplayController.php b/administrator/components/com_media/src/Controller/DisplayController.php
index 32fe3f636d024..478996be00155 100644
--- a/administrator/components/com_media/src/Controller/DisplayController.php
+++ b/administrator/components/com_media/src/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/src/Controller/PluginController.php b/administrator/components/com_media/src/Controller/PluginController.php
index 778168e6c5977..e4ea6dd324ec2 100644
--- a/administrator/components/com_media/src/Controller/PluginController.php
+++ b/administrator/components/com_media/src/Controller/PluginController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/src/Dispatcher/Dispatcher.php b/administrator/components/com_media/src/Dispatcher/Dispatcher.php
index f2f53b14a5504..e9dd24a58c032 100644
--- a/administrator/components/com_media/src/Dispatcher/Dispatcher.php
+++ b/administrator/components/com_media/src/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/src/Event/MediaProviderEvent.php b/administrator/components/com_media/src/Event/MediaProviderEvent.php
index 9ca3aba30e276..26f752804fac8 100644
--- a/administrator/components/com_media/src/Event/MediaProviderEvent.php
+++ b/administrator/components/com_media/src/Event/MediaProviderEvent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/src/Event/OAuthCallbackEvent.php b/administrator/components/com_media/src/Event/OAuthCallbackEvent.php
index fb2b464784186..4e8f95c1a6226 100644
--- a/administrator/components/com_media/src/Event/OAuthCallbackEvent.php
+++ b/administrator/components/com_media/src/Event/OAuthCallbackEvent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/src/Exception/FileExistsException.php b/administrator/components/com_media/src/Exception/FileExistsException.php
index 5d9735affc213..48402c5077e58 100644
--- a/administrator/components/com_media/src/Exception/FileExistsException.php
+++ b/administrator/components/com_media/src/Exception/FileExistsException.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/src/Exception/FileNotFoundException.php b/administrator/components/com_media/src/Exception/FileNotFoundException.php
index ba3933691858d..a47ed359f14d2 100644
--- a/administrator/components/com_media/src/Exception/FileNotFoundException.php
+++ b/administrator/components/com_media/src/Exception/FileNotFoundException.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/src/Exception/InvalidPathException.php b/administrator/components/com_media/src/Exception/InvalidPathException.php
index 9eddda2312097..8bfcb9d586456 100644
--- a/administrator/components/com_media/src/Exception/InvalidPathException.php
+++ b/administrator/components/com_media/src/Exception/InvalidPathException.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/src/Model/ApiModel.php b/administrator/components/com_media/src/Model/ApiModel.php
index 08eee7223c303..d249cdd6d610d 100644
--- a/administrator/components/com_media/src/Model/ApiModel.php
+++ b/administrator/components/com_media/src/Model/ApiModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/src/Model/FileModel.php b/administrator/components/com_media/src/Model/FileModel.php
index 9261e4dc90667..dd8233c72dc57 100644
--- a/administrator/components/com_media/src/Model/FileModel.php
+++ b/administrator/components/com_media/src/Model/FileModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/src/Model/MediaModel.php b/administrator/components/com_media/src/Model/MediaModel.php
index 088f3a3ade27f..8f715f56986b6 100644
--- a/administrator/components/com_media/src/Model/MediaModel.php
+++ b/administrator/components/com_media/src/Model/MediaModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/src/Plugin/MediaActionPlugin.php b/administrator/components/com_media/src/Plugin/MediaActionPlugin.php
index 332b3a72778c4..779e527e75d46 100644
--- a/administrator/components/com_media/src/Plugin/MediaActionPlugin.php
+++ b/administrator/components/com_media/src/Plugin/MediaActionPlugin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/src/Provider/ProviderInterface.php b/administrator/components/com_media/src/Provider/ProviderInterface.php
index ef0f71c44c275..5511fb7648d37 100644
--- a/administrator/components/com_media/src/Provider/ProviderInterface.php
+++ b/administrator/components/com_media/src/Provider/ProviderInterface.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/src/Provider/ProviderManager.php b/administrator/components/com_media/src/Provider/ProviderManager.php
index 6014c7b7f6f4b..a6aab229e02a1 100644
--- a/administrator/components/com_media/src/Provider/ProviderManager.php
+++ b/administrator/components/com_media/src/Provider/ProviderManager.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/src/View/File/HtmlView.php b/administrator/components/com_media/src/View/File/HtmlView.php
index 7fb46143cd2f1..9183963634a89 100644
--- a/administrator/components/com_media/src/View/File/HtmlView.php
+++ b/administrator/components/com_media/src/View/File/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/src/View/Media/HtmlView.php b/administrator/components/com_media/src/View/Media/HtmlView.php
index 8ce35b231badd..5a0bca719e751 100644
--- a/administrator/components/com_media/src/View/Media/HtmlView.php
+++ b/administrator/components/com_media/src/View/Media/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/tmpl/file/default.php b/administrator/components/com_media/tmpl/file/default.php
index 134e8bed9abf7..62a3bcf8598ca 100644
--- a/administrator/components/com_media/tmpl/file/default.php
+++ b/administrator/components/com_media/tmpl/file/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/tmpl/media/default.php b/administrator/components/com_media/tmpl/media/default.php
index c69ec1a6a8e1d..abbc9a6be6345 100644
--- a/administrator/components/com_media/tmpl/media/default.php
+++ b/administrator/components/com_media/tmpl/media/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_media/tmpl/media/default_texts.php b/administrator/components/com_media/tmpl/media/default_texts.php
index b9b1e776546a9..6994c5d87d786 100644
--- a/administrator/components/com_media/tmpl/media/default_texts.php
+++ b/administrator/components/com_media/tmpl/media/default_texts.php
@@ -3,57 +3,65 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
-Text::script('COM_MEDIA_ACTIN_RENAME', true);
 Text::script('COM_MEDIA_ACTION_DELETE', true);
+Text::script('COM_MEDIA_ACTION_DOWNLOAD', true);
 Text::script('COM_MEDIA_ACTION_EDIT', true);
 Text::script('COM_MEDIA_ACTION_PREVIEW', true);
+Text::script('COM_MEDIA_ACTION_RENAME', true);
+Text::script('COM_MEDIA_ACTION_SHARE', true);
+Text::script('COM_MEDIA_BREADCRUMB_LABEL', true);
+Text::script('COM_MEDIA_CONFIRM_DELETE_MODAL', true);
+Text::script('COM_MEDIA_CONFIRM_DELETE_MODAL_HEADING', true);
 Text::script('COM_MEDIA_CREATE_NEW_FOLDER', true);
-Text::script('COM_MEDIA_CREATE_NEW_FOLDER_SUCCESS', true);
 Text::script('COM_MEDIA_CREATE_NEW_FOLDER_ERROR', true);
+Text::script('COM_MEDIA_CREATE_NEW_FOLDER_SUCCESS', true);
 Text::script('COM_MEDIA_DECREASE_GRID', true);
 Text::script('COM_MEDIA_DELETE_ERROR', true);
 Text::script('COM_MEDIA_DELETE_SUCCESS', true);
-Text::script('COM_MEDIA_CONFIRM_DELETE_MODEL_DESC', true);
-Text::script('COM_MEDIA_CONFIRM_DELETE_MODEL_HEADING', true);
-Text::script('COM_MEDIA_CONFIRM_DELETE_MODEL', true);
+Text::script('COM_MEDIA_DROP_FILE', true);
 Text::script('COM_MEDIA_ERROR', true);
 Text::script('COM_MEDIA_ERROR_NOT_AUTHENTICATED', true);
 Text::script('COM_MEDIA_ERROR_NOT_AUTHORIZED', true);
 Text::script('COM_MEDIA_ERROR_NOT_FOUND', true);
+Text::script('COM_MEDIA_FILE_EXISTS_AND_OVERRIDE', true);
 Text::script('COM_MEDIA_FOLDER', true);
+Text::script('COM_MEDIA_FOLDER_NAME', true);
 Text::script('COM_MEDIA_INCREASE_GRID', true);
-Text::script('COM_MEDIA_MEDIA_CREATED_AT', true);
+Text::script('COM_MEDIA_MEDIA_DATE_CREATED', true);
+Text::script('COM_MEDIA_MEDIA_DATE_MODIFIED', true);
 Text::script('COM_MEDIA_MEDIA_DIMENSION', true);
 Text::script('COM_MEDIA_MEDIA_EXTENSION', true);
 Text::script('COM_MEDIA_MEDIA_MIME_TYPE', true);
-Text::script('COM_MEDIA_MEDIA_MODIFIED_AT', true);
 Text::script('COM_MEDIA_MEDIA_NAME', true);
 Text::script('COM_MEDIA_MEDIA_SIZE', true);
 Text::script('COM_MEDIA_MEDIA_TYPE', true);
 Text::script('COM_MEDIA_NAME', true);
 Text::script('COM_MEDIA_OPEN_ITEM_ACTIONS', true);
+Text::script('COM_MEDIA_PLEASE_SELECT_ITEM', true);
 Text::script('COM_MEDIA_RENAME', true);
 Text::script('COM_MEDIA_RENAME_ERROR', true);
 Text::script('COM_MEDIA_RENAME_SUCCESS', true);
 Text::script('COM_MEDIA_SEARCH', true);
 Text::script('COM_MEDIA_SELECT_ALL', true);
 Text::script('COM_MEDIA_SERVER_ERROR', true);
+Text::script('COM_MEDIA_SHARE', true);
+Text::script('COM_MEDIA_SHARE_COPY', true);
+Text::script('COM_MEDIA_SHARE_COPY_FAILED_ERROR', true);
+Text::script('COM_MEDIA_SHARE_DESC', true);
 Text::script('COM_MEDIA_TOGGLE_INFO', true);
 Text::script('COM_MEDIA_TOGGLE_LIST_VIEW', true);
 Text::script('COM_MEDIA_TOGGLE_SELECT_ITEM', true);
-Text::script('COM_MEDIA_UPDLOAD_SUCCESS', true);
-Text::script('JCANCEL', true);
+Text::script('COM_MEDIA_TOOLBAR_LABEL', true);
+Text::script('COM_MEDIA_UPLOAD_SUCCESS', true);
+Text::script('JACTION_CREATE', true);
 Text::script('JAPPLY', true);
+Text::script('JCANCEL', true);
+Text::script('JGLOBAL_CONFIRM_DELETE', true);
 Text::script('JLIB_FORM_FIELD_REQUIRED_VALUE', true);
-Text::script('COM_MEDIA_FILE_EXISTS_AND_OVERRIDE', true);
-Text::script('COM_MEDIA_SHARE', true);
-Text::script('COM_MEDIA_SHARE_DESC', true);
-Text::script('COM_MEDIA_ACTION_SHARE', true);
-Text::script('COM_MEDIA_SHARE_COPY_FAILED_ERROR', true);
diff --git a/administrator/components/com_menus/Controller/AjaxController.php b/administrator/components/com_menus/Controller/AjaxController.php
new file mode 100644
index 0000000000000..f2f37b08bf5fd
--- /dev/null
+++ b/administrator/components/com_menus/Controller/AjaxController.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Menus\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Language\LanguageHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Response\JsonResponse;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Table\Table;
+
+/**
+ * The menu controller for ajax requests
+ *
+ * @since  3.9.0
+ */
+class AjaxController extends BaseController
+{
+	/**
+	 * Method to fetch associations of a menu item
+	 *
+	 * The method assumes that the following http parameters are passed in an Ajax Get request:
+	 * token: the form token
+	 * assocId: the id of the menu item whose associations are to be returned
+	 * excludeLang: the association for this language is to be excluded
+	 *
+	 * @return  null
+	 *
+	 * @since  3.9.0
+	 */
+	public function fetchAssociations()
+	{
+		if (!Session::checkToken('get'))
+		{
+			echo new JsonResponse(null, Text::_('JINVALID_TOKEN'), true);
+		}
+		else
+		{
+			$extension = $this->input->get('extension');
+
+			$assocId   = $this->input->getInt('assocId', 0);
+
+			if ($assocId == 0)
+			{
+				echo new JsonResponse(null, JText::sprintf('JLIB_FORM_VALIDATE_FIELD_INVALID', 'assocId'), true);
+
+				return;
+			}
+
+			$excludeLang = $this->input->get('excludeLang', '', 'STRING');
+
+			$associations = Associations::getAssociations('com_menus', '#__menu', 'com_menus.item', (int) $assocId, 'id', '', '');
+
+			unset($associations[$excludeLang]);
+
+			// Add the title to each of the associated records
+			Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_menus/tables');
+			$menuTable = Table::getInstance('Menu', 'JTable', array());
+
+			foreach ($associations as $lang => $association)
+			{
+				$menuTable->load($association->id);
+				$associations[$lang]->title = $menuTable->title;
+			}
+
+			$countContentLanguages = count(LanguageHelper::getContentLanguages(array(0, 1)));
+
+			if (count($associations) == 0)
+			{
+				$message = Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_NONE');
+			}
+			elseif ($countContentLanguages > count($associations) + 2)
+			{
+				$tags    = implode(', ', array_keys($associations));
+				$message = Text::sprintf('JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_SOME', $tags);
+			}
+			else
+			{
+				$message = Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_ALL');
+			}
+
+			echo new JsonResponse($associations, $message);
+		}
+	}
+}
diff --git a/administrator/components/com_menus/Controller/DisplayController.php b/administrator/components/com_menus/Controller/DisplayController.php
index 05e20c617f26f..d4777b43c0953 100644
--- a/administrator/components/com_menus/Controller/DisplayController.php
+++ b/administrator/components/com_menus/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/Controller/ItemController.php b/administrator/components/com_menus/Controller/ItemController.php
index 532a6088ffc25..d22c12794cd42 100644
--- a/administrator/components/com_menus/Controller/ItemController.php
+++ b/administrator/components/com_menus/Controller/ItemController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,7 +17,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 
 /**
@@ -145,7 +144,7 @@ public function add()
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		/* @var \Joomla\Component\Menus\Administrator\Model\ItemModel $model */
 		$model = $this->getModel('Item', 'Administrator', array());
@@ -167,7 +166,7 @@ public function batch($model = null)
 	 */
 	public function cancel($key = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$result = parent::cancel();
 
@@ -260,9 +259,7 @@ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	public function save($key = null, $urlVar = null)
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		$app      = $this->app;
+		$this->checkToken();
 
 		/* @var \Joomla\Component\Menus\Administrator\Model\ItemModel $model */
 		$model    = $this->getModel('Item', 'Administrator', array());
@@ -270,6 +267,7 @@ public function save($key = null, $urlVar = null)
 		$data     = $this->input->post->get('jform', array(), 'array');
 		$task     = $this->getTask();
 		$context  = 'com_menus.edit.item';
+		$app      = $this->app;
 
 		// Set the menutype should we need it.
 		if ($data['menutype'] !== '')
@@ -519,7 +517,7 @@ public function save($key = null, $urlVar = null)
 	 */
 	public function setType()
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$app = $this->app;
 
diff --git a/administrator/components/com_menus/Controller/ItemsController.php b/administrator/components/com_menus/Controller/ItemsController.php
index 3bc9cebcbf5f8..b3f0b6d2a38c8 100644
--- a/administrator/components/com_menus/Controller/ItemsController.php
+++ b/administrator/components/com_menus/Controller/ItemsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Menus\Administrator\Controller;
@@ -16,7 +16,6 @@
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -69,7 +68,7 @@ public function getModel($name = 'Item', $prefix = 'Administrator', $config = ar
 	 */
 	public function rebuild()
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$this->setRedirect('index.php?option=com_menus&view=items');
 
@@ -102,7 +101,7 @@ public function rebuild()
 	public function setDefault()
 	{
 		// Check for request forgeries
-		Session::checkToken('request') or die(Text::_('JINVALID_TOKEN'));
+		$this->checkToken('request');
 
 		$app = $this->app;
 
@@ -162,7 +161,7 @@ public function setDefault()
 	public function publish()
 	{
 		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Get items to publish from the request.
 		$cid = $this->input->get('cid', array(), 'array');
@@ -244,7 +243,7 @@ public function publish()
 	public function checkin()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$ids = $this->input->post->get('cid', array(), 'array');
 
diff --git a/administrator/components/com_menus/Controller/MenuController.php b/administrator/components/com_menus/Controller/MenuController.php
index 2c45deaba555f..88141c24172e6 100644
--- a/administrator/components/com_menus/Controller/MenuController.php
+++ b/administrator/components/com_menus/Controller/MenuController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,7 +14,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
 
 /**
@@ -52,7 +51,7 @@ public function display($cachable = false, $urlparams = false)
 	public function save($key = null, $urlVar = null)
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$app      = $this->app;
 		$data     = $this->input->post->get('jform', array(), 'array');
@@ -76,7 +75,7 @@ public function save($key = null, $urlVar = null)
 
 		// Get the model and attempt to validate the posted data.
 		/* @var \Joomla\Component\Menus\Administrator\Model\MenuModel $model */
-		$model = $this->getModel('Menu');
+		$model = $this->getModel('Menu', '', ['ignore_request' => false]);
 		$form  = $model->getForm();
 
 		if (!$form)
diff --git a/administrator/components/com_menus/Controller/MenusController.php b/administrator/components/com_menus/Controller/MenusController.php
index f43ade72ad86b..dc1d7759b6dcf 100644
--- a/administrator/components/com_menus/Controller/MenusController.php
+++ b/administrator/components/com_menus/Controller/MenusController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,7 +14,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -64,7 +63,7 @@ public function getModel($name = 'Menu', $prefix = 'Administrator', $config = ar
 	public function delete()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$user = Factory::getUser();
 		$app  = Factory::getApplication();
@@ -120,7 +119,7 @@ public function delete()
 	 */
 	public function rebuild()
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$this->setRedirect('index.php?option=com_menus&view=menus');
 
diff --git a/administrator/components/com_menus/Extension/MenusComponent.php b/administrator/components/com_menus/Extension/MenusComponent.php
index 47d78e1fbf2d7..8f89c6a6cbef5 100644
--- a/administrator/components/com_menus/Extension/MenusComponent.php
+++ b/administrator/components/com_menus/Extension/MenusComponent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/Field/ComponentscategoryField.php b/administrator/components/com_menus/Field/ComponentscategoryField.php
index 750e493c5efd6..ea68854ae82bd 100644
--- a/administrator/components/com_menus/Field/ComponentscategoryField.php
+++ b/administrator/components/com_menus/Field/ComponentscategoryField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,18 +12,16 @@
 defined('JPATH_BASE') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\Utilities\ArrayHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Components Category field.
  *
  * @since  1.6
  */
-class ComponentsCategoryField extends \JFormFieldList
+class ComponentsCategoryField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/administrator/components/com_menus/Field/MenuItemByTypeField.php b/administrator/components/com_menus/Field/MenuItemByTypeField.php
index 547848d09ea5c..40dd238a09dbe 100644
--- a/administrator/components/com_menus/Field/MenuItemByTypeField.php
+++ b/administrator/components/com_menus/Field/MenuItemByTypeField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/Field/MenuParentField.php b/administrator/components/com_menus/Field/MenuParentField.php
index f8c8e3f2f87f3..5314af1bf79d4 100644
--- a/administrator/components/com_menus/Field/MenuParentField.php
+++ b/administrator/components/com_menus/Field/MenuParentField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,17 +12,15 @@
 defined('JPATH_BASE') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Menu Parent field.
  *
  * @since  1.6
  */
-class MenuParentField extends \JFormFieldList
+class MenuParentField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/administrator/components/com_menus/Field/MenuPresetField.php b/administrator/components/com_menus/Field/MenuPresetField.php
index 22310a786d6a0..bb97edac612ed 100644
--- a/administrator/components/com_menus/Field/MenuPresetField.php
+++ b/administrator/components/com_menus/Field/MenuPresetField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,7 +14,7 @@
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Menu\MenuHelper;
+use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
 
 /**
  * Administrator Menu Presets list field.
@@ -42,7 +42,7 @@ class MenuPresetField extends ListField
 	protected function getOptions()
 	{
 		$options = array();
-		$presets = MenuHelper::getPresets();
+		$presets = MenusHelper::getPresets();
 
 		foreach ($presets as $preset)
 		{
diff --git a/administrator/components/com_menus/Field/MenuorderingField.php b/administrator/components/com_menus/Field/MenuorderingField.php
index b4eeaf3521a99..ab2dbbd3f0738 100644
--- a/administrator/components/com_menus/Field/MenuorderingField.php
+++ b/administrator/components/com_menus/Field/MenuorderingField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,17 +12,15 @@
 defined('JPATH_BASE') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Menu Ordering field.
  *
  * @since  1.6
  */
-class MenuOrderingField extends \JFormFieldList
+class MenuOrderingField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/administrator/components/com_menus/Field/MenutypeField.php b/administrator/components/com_menus/Field/MenutypeField.php
index 28c4a79609249..b80c15151748c 100644
--- a/administrator/components/com_menus/Field/MenutypeField.php
+++ b/administrator/components/com_menus/Field/MenutypeField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -90,8 +90,8 @@ protected function getInput()
 		$link = Route::_('index.php?option=com_menus&view=menutypes&tmpl=component&client_id=' . $clientId . '&recordId=' . $recordId);
 		$html[] = '<span class="input-group"><input type="text" ' . $required . ' readonly="readonly" id="' . $this->id
 			. '" value="' . $value . '"' . $size . $class . '>';
-		$html[] = '<span class="input-group-append"><button type="button" data-target="#menuTypeModal" class="btn btn-primary" data-toggle="modal" title="'
-			. Text::_('JSELECT') . '">' . '<span class="icon-list icon-white" aria-hidden="true"></span> '
+		$html[] = '<span class="input-group-append"><button type="button" data-target="#menuTypeModal" class="btn btn-primary" data-toggle="modal" '
+			. '<span class="icon-list icon-white" aria-hidden="true"></span> '
 			. Text::_('JSELECT') . '</button></span></span>';
 		$html[] = HTMLHelper::_(
 			'bootstrap.renderModal',
diff --git a/administrator/components/com_menus/Field/Modal/MenuField.php b/administrator/components/com_menus/Field/Modal/MenuField.php
index c3e58feec9551..57fee19b4d6c4 100644
--- a/administrator/components/com_menus/Field/Modal/MenuField.php
+++ b/administrator/components/com_menus/Field/Modal/MenuField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,6 +14,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Session\Session;
 
@@ -64,6 +65,14 @@ class MenuField extends FormField
 	 */
 	protected $allowEdit = false;
 
+	/**
+	 * Determinate, if the propagate button is shown
+	 *
+	 * @var     boolean
+	 * @since   3.9.0
+	 */
+	protected $allowPropagate = false;
+
 	/**
 	 * Method to get certain otherwise inaccessible properties from the form field object.
 	 *
@@ -81,6 +90,7 @@ public function __get($name)
 			case 'allowClear':
 			case 'allowNew':
 			case 'allowEdit':
+			case 'allowPropagate':
 				return $this->$name;
 		}
 
@@ -105,6 +115,7 @@ public function __set($name, $value)
 			case 'allowClear':
 			case 'allowNew':
 			case 'allowEdit':
+			case 'allowPropagate':
 				$value = (string) $value;
 				$this->$name = !($value === 'false' || $value === 'off' || $value === '0');
 				break;
@@ -138,6 +149,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
 			$this->allowClear = ((string) $this->element['clear']) !== 'false';
 			$this->allowNew = ((string) $this->element['new']) === 'true';
 			$this->allowEdit = ((string) $this->element['edit']) === 'true';
+			$this->allowPropagate = ((string) $this->element['propagate']) === 'true';
 		}
 
 		return $return;
@@ -153,6 +165,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
 	protected function getInput()
 	{
 		$clientId    = (int) $this->element['clientid'];
+		$languages   = LanguageHelper::getContentLanguages(array(0, 1));
 
 		// Load language
 		Factory::getLanguage()->load('com_menus', JPATH_ADMINISTRATOR);
@@ -185,6 +198,8 @@ function jSelectMenu_" . $this->id . "(id, title, object) {
 				"
 				);
 
+				Text::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED');
+
 				$scriptSelect[$this->id] = true;
 			}
 		}
@@ -258,55 +273,72 @@ function jSelectMenu_" . $this->id . "(id, title, object) {
 		// Select menu item button
 		if ($this->allowSelect)
 		{
-			$html .= '<a'
-				. ' class="btn btn-primary hasTooltip' . ($value ? ' sr-only' : '') . '"'
+			$html .= '<button'
+				. ' class="btn btn-primary hasTooltip' . ($value ? ' hidden' : '') . '"'
 				. ' id="' . $this->id . '_select"'
 				. ' data-toggle="modal"'
-				. ' role="button"'
-				. ' href="#ModalSelect' . $modalId . '"'
+				. ' type="button"'
+				. ' data-target="#ModalSelect' . $modalId . '"'
 				. ' title="' . HTMLHelper::tooltipText('COM_MENUS_CHANGE_MENUITEM') . '">'
 				. '<span class="icon-file" aria-hidden="true"></span> ' . Text::_('JSELECT')
-				. '</a>';
+				. '</button>';
 		}
 
 		// New menu item button
 		if ($this->allowNew)
 		{
-			$html .= '<a'
-				. ' class="btn btn-secondary hasTooltip' . ($value ? ' sr-only' : '') . '"'
+			$html .= '<button'
+				. ' class="btn btn-secondary hasTooltip' . ($value ? ' hidden' : '') . '"'
 				. ' id="' . $this->id . '_new"'
 				. ' data-toggle="modal"'
-				. ' role="button"'
-				. ' href="#ModalNew' . $modalId . '"'
+				. ' type="button"'
+				. ' data-target="#ModalNew' . $modalId . '"'
 				. ' title="' . HTMLHelper::tooltipText('COM_MENUS_NEW_MENUITEM') . '">'
 				. '<span class="icon-new" aria-hidden="true"></span> ' . Text::_('JACTION_CREATE')
-				. '</a>';
+				. '</button>';
 		}
 
 		// Edit menu item button
 		if ($this->allowEdit)
 		{
-			$html .= '<a'
-				. ' class="btn btn-secondary hasTooltip' . ($value ? '' : ' sr-only') . '"'
+			$html .= '<button'
+				. ' class="btn btn-secondary hasTooltip' . ($value ? '' : ' hidden') . '"'
 				. ' id="' . $this->id . '_edit"'
 				. ' data-toggle="modal"'
-				. ' role="button"'
-				. ' href="#ModalEdit' . $modalId . '"'
+				. ' type="button"'
+				. ' data-target="#ModalEdit' . $modalId . '"'
 				. ' title="' . HTMLHelper::tooltipText('COM_MENUS_EDIT_MENUITEM') . '">'
 				. '<span class="icon-edit" aria-hidden="true"></span> ' . Text::_('JACTION_EDIT')
-				. '</a>';
+				. '</button>';
 		}
 
 		// Clear menu item button
 		if ($this->allowClear)
 		{
-			$html .= '<a'
-				. ' class="btn btn-secondary' . ($value ? '' : ' sr-only') . '"'
+			$html .= '<button'
+				. ' class="btn btn-secondary' . ($value ? '' : ' hidden') . '"'
 				. ' id="' . $this->id . '_clear"'
-				. ' href="#"'
+				. ' type="button"'
 				. ' onclick="window.processModalParent(\'' . $this->id . '\'); return false;">'
 				. '<span class="icon-remove" aria-hidden="true"></span>' . Text::_('JCLEAR')
-				. '</a>';
+				. '</button>';
+		}
+
+		// Propagate menu item button
+		if ($this->allowPropagate && count($languages) > 2)
+		{
+			// Strip off language tag at the end
+			$tagLength = (int) strlen($this->element['language']);
+			$callbackFunctionStem = substr("jSelectMenu_" . $this->id, 0, -$tagLength);
+
+			$html .= '<a'
+			. ' class="btn hasTooltip' . ($value ? '' : ' hidden') . '"'
+			. ' id="' . $this->id . '_propagate"'
+			. ' href="#"'
+			. ' title="' . HtmlHelper::tooltipText('JGLOBAL_ASSOCIATIONS_PROPAGATE_TIP') . '"'
+			. ' onclick="Joomla.propagateAssociation(\'' . $this->id . '\', \'' . $callbackFunctionStem . '\');">'
+			. '<span class="icon-refresh" aria-hidden="true"></span>' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON')
+			. '</a>';
 		}
 
 		if ($this->allowSelect || $this->allowNew || $this->allowEdit || $this->allowClear)
diff --git a/administrator/components/com_menus/Helper/AssociationsHelper.php b/administrator/components/com_menus/Helper/AssociationsHelper.php
index e42ea08e3ee18..1bb7e0a510699 100644
--- a/administrator/components/com_menus/Helper/AssociationsHelper.php
+++ b/administrator/components/com_menus/Helper/AssociationsHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/Helper/MenusHelper.php b/administrator/components/com_menus/Helper/MenusHelper.php
index 07427b3b8bd5b..2a9eaa8172fab 100644
--- a/administrator/components/com_menus/Helper/MenusHelper.php
+++ b/administrator/components/com_menus/Helper/MenusHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,11 +12,12 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Menu\MenuHelper;
+use Joomla\CMS\Menu\MenuItem;
 use Joomla\CMS\Table\Table;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Registry\Registry;
@@ -34,6 +35,15 @@ class MenusHelper extends ContentHelper
 	 */
 	protected static $_filter = array('option', 'view', 'layout');
 
+	/**
+	 * List of preset include paths
+	 *
+	 * @var  array
+	 *
+	 * @since   4.0.0
+	 */
+	protected static $presets = null;
+
 	/**
 	 * Gets a standard form of a link for lookups.
 	 *
@@ -290,12 +300,13 @@ public static function getAssociations($pk)
 	 * @param   boolean  $enabledOnly  Whether to load only enabled/published menu items.
 	 * @param   int[]    $exclude      The menu items to exclude from the list
 	 *
-	 * @return  array
+	 * @return  MenuItem  A root node with the menu items as children
 	 *
-	 * @since   3.8.0
+	 * @since   4.0.0
 	 */
 	public static function getMenuItems($menutype, $enabledOnly = false, $exclude = array())
 	{
+		$root = new MenuItem;
 		$db    = Factory::getContainer()->get(DatabaseInterface::class);
 		$query = $db->getQuery(true);
 
@@ -340,21 +351,45 @@ public static function getMenuItems($menutype, $enabledOnly = false, $exclude =
 
 		try
 		{
-			$menuItems = $db->loadObjectList();
+			$menuItems = $db->loadObjectList('id', '\Joomla\CMS\Menu\MenuItem');
 
-			foreach ($menuItems as &$menuitem)
+			foreach ($menuItems as $menuitem)
 			{
 				$menuitem->params = new Registry($menuitem->params);
+
+				// Resolve the alias item to get the original item
+				if ($menuitem->type == 'alias')
+				{
+					static::resolveAlias($menuitem);
+				}
+
+				if ($menuitem->link = in_array($menuitem->type, array('separator', 'heading', 'container')) ? '#' : trim($menuitem->link))
+				{
+					$menuitem->submenu    = array();
+					$menuitem->class      = $menuitem->img ?? '';
+					$menuitem->scope      = $menuitem->scope ?? null;
+					$menuitem->browserNav = $menuitem->browserNav ? '_blank' : '';
+				}
+
+				if ($menuitem->parent_id > 1)
+				{
+					if (isset($menuItems[$menuitem->parent_id]))
+					{
+						$menuItems[$menuitem->parent_id]->addChild($menuitem);
+					}
+				}
+				else
+				{
+					$root->addChild($menuitem);
+				}
 			}
 		}
 		catch (\RuntimeException $e)
 		{
-			$menuItems = array();
-
 			Factory::getApplication()->enqueueMessage(Text::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
 		}
 
-		return $menuItems;
+		return $root;
 	}
 
 	/**
@@ -367,37 +402,37 @@ public static function getMenuItems($menutype, $enabledOnly = false, $exclude =
 	 *
 	 * @throws  \Exception
 	 *
-	 * @since   3.8.0
+	 * @since   4.0.0
 	 */
 	public static function installPreset($preset, $menutype)
 	{
-		$items = MenuHelper::loadPreset($preset, false);
+		$root = static::loadPreset($preset, false);
 
-		if (count($items) == 0)
+		if (count($root->getChildren()) == 0)
 		{
 			throw new \Exception(Text::_('COM_MENUS_PRESET_LOAD_FAILED'));
 		}
 
-		static::installPresetItems($items, $menutype, 1);
+		static::installPresetItems($root, $menutype, 1);
 	}
 
 	/**
 	 * Method to install a preset menu item into database and link it to the given menutype
 	 *
-	 * @param   \stdClass[]  $items     The single menuitem instance with a list of its descendants
-	 * @param   string       $menutype  The target menutype
-	 * @param   int          $parent    The parent id or object
+	 * @param   MenuItem  $node      The parent node of the items to process
+	 * @param   string    $menutype  The target menutype
 	 *
 	 * @return  void
 	 *
 	 * @throws  \Exception
 	 *
-	 * @since   3.8.0
+	 * @since   4.0.0
 	 */
-	protected static function installPresetItems(&$items, $menutype, $parent = 1)
+	protected static function installPresetItems($node, $menutype)
 	{
 		$db    = Factory::getDbo();
 		$query = $db->getQuery(true);
+		$items = $node->getChildren();
 
 		static $components = array();
 
@@ -410,7 +445,7 @@ protected static function installPresetItems(&$items, $menutype, $parent = 1)
 
 		Factory::getApplication()->triggerEvent('onPreprocessMenuItems', array('com_menus.administrator.import', &$items, null, true));
 
-		foreach ($items as &$item)
+		foreach ($items as $item)
 		{
 			/** @var  \JTableMenu  $table */
 			$table = Table::getInstance('Menu');
@@ -430,7 +465,7 @@ protected static function installPresetItems(&$items, $menutype, $parent = 1)
 					'menutype'  => $menutype,
 					'type'      => $item->type,
 					'title'     => $item->title,
-					'parent_id' => $parent,
+					'parent_id' => $item->getParent()->id,
 					'client_id' => 1,
 				);
 				$table->load($keys);
@@ -456,7 +491,7 @@ protected static function installPresetItems(&$items, $menutype, $parent = 1)
 					'menutype'  => $menutype,
 					'type'      => $item->type,
 					'link'      => $item->link,
-					'parent_id' => $parent,
+					'parent_id' => $item->getParent()->id,
 					'client_id' => 1,
 				);
 				$table->load($keys);
@@ -489,7 +524,7 @@ protected static function installPresetItems(&$items, $menutype, $parent = 1)
 				'img'          => $item->class,
 				'access'       => $item->access,
 				'component_id' => array_search($item->element, $components) ?: 0,
-				'parent_id'    => $parent,
+				'parent_id'    => $item->getParent()->id,
 				'client_id'    => 1,
 				'published'    => 1,
 				'language'     => '*',
@@ -502,7 +537,7 @@ protected static function installPresetItems(&$items, $menutype, $parent = 1)
 				throw new \Exception('Bind failed: ' . $table->getError());
 			}
 
-			$table->setLocation($parent, 'last-child');
+			$table->setLocation($item->getParent()->id, 'last-child');
 
 			if (!$table->check())
 			{
@@ -516,10 +551,351 @@ protected static function installPresetItems(&$items, $menutype, $parent = 1)
 
 			$item->id = $table->get('id');
 
-			if (!empty($item->submenu))
+			if ($item->hasChildren())
 			{
-				static::installPresetItems($item->submenu, $menutype, $item->id);
+				static::installPresetItems($item, $menutype);
 			}
 		}
 	}
+
+	/**
+	 * Add a custom preset externally via plugin or any other means.
+	 * WARNING: Presets with same name will replace previously added preset *except* Joomla's default preset (joomla)
+	 *
+	 * @param   string  $name     The unique identifier for the preset.
+	 * @param   string  $title    The display label for the preset.
+	 * @param   string  $path     The path to the preset file.
+	 * @param   bool    $replace  Whether to replace the preset with the same name if any (except 'joomla').
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public static function addPreset($name, $title, $path, $replace = true)
+	{
+		if (static::$presets === null)
+		{
+			static::getPresets();
+		}
+
+		if ($name == 'joomla')
+		{
+			$replace = false;
+		}
+
+		if (($replace || !array_key_exists($name, static::$presets)) && is_file($path))
+		{
+			$preset = new \stdClass;
+
+			$preset->name  = $name;
+			$preset->title = $title;
+			$preset->path  = $path;
+
+			static::$presets[$name] = $preset;
+		}
+	}
+
+	/**
+	 * Get a list of available presets.
+	 *
+	 * @return  \stdClass[]
+	 *
+	 * @since   4.0.0
+	 */
+	public static function getPresets()
+	{
+		if (static::$presets === null)
+		{
+			// Important: 'null' will cause infinite recursion.
+			static::$presets = array();
+
+			static::addPreset('joomla', 'JLIB_MENUS_PRESET_JOOMLA', JPATH_ADMINISTRATOR . '/components/com_menus/presets/joomla.xml');
+			static::addPreset('modern', 'JLIB_MENUS_PRESET_MODERN', JPATH_ADMINISTRATOR . '/components/com_menus/presets/modern.xml');
+
+			// Load from template folder automatically
+			$app = Factory::getApplication();
+			$tpl = JPATH_THEMES . '/' . $app->getTemplate() . '/html/com_menus/presets';
+
+			if (is_dir($tpl))
+			{
+				$files = Folder::files($tpl, '\.xml$');
+
+				foreach ($files as $file)
+				{
+					$name  = substr($file, 0, -4);
+					$title = str_replace('-', ' ', $name);
+
+					static::addPreset(strtolower($name), ucwords($title), $tpl . '/' . $file);
+				}
+			}
+		}
+
+		return static::$presets;
+	}
+
+	/**
+	 * Load the menu items from a preset file into a hierarchical list of objects
+	 *
+	 * @param   string    $name      The preset name
+	 * @param   bool      $fallback  Fallback to default (joomla) preset if the specified one could not be loaded?
+	 * @param   MenuItem  $parent    Root node of the menu
+	 *
+	 * @return  MenuItem
+	 *
+	 * @since   4.0.0
+	 */
+	public static function loadPreset($name, $fallback = true, $parent = null)
+	{
+		$presets = static::getPresets();
+
+		if (!$parent)
+		{
+			$parent = new MenuItem;
+		}
+
+		if (isset($presets[$name]) && ($xml = simplexml_load_file($presets[$name]->path, null, LIBXML_NOCDATA)) && $xml instanceof \SimpleXMLElement)
+		{
+			static::loadXml($xml, $parent);
+		}
+		elseif ($fallback && isset($presets['joomla']))
+		{
+			if (($xml = simplexml_load_file($presets['joomla']->path, null, LIBXML_NOCDATA)) && $xml instanceof \SimpleXMLElement)
+			{
+				static::loadXml($xml, $parent);
+			}
+		}
+
+		return $parent;
+	}
+
+	/**
+	 * Method to resolve the menu item alias type menu item
+	 *
+	 * @param   \stdClass  &$item  The alias object
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public static function resolveAlias(&$item)
+	{
+		$obj = $item;
+
+		while ($obj->type == 'alias')
+		{
+			$params  = new Registry($obj->params);
+			$aliasTo = $params->get('aliasoptions');
+
+			$db = Factory::getDbo();
+			$query = $db->getQuery(true);
+			$query->select('a.id, a.link, a.type, e.element')
+				->from('#__menu a')
+				->where('a.id = ' . (int) $aliasTo)
+				->join('left', '#__extensions e ON e.id = a.component_id = e.id');
+
+			try
+			{
+				$obj = $db->setQuery($query)->loadObject();
+
+				if (!$obj)
+				{
+					$item->link = '';
+
+					return;
+				}
+			}
+			catch (\Exception $e)
+			{
+				$item->link = '';
+
+				return;
+			}
+		}
+
+		$item->id      = $obj->id;
+		$item->link    = $obj->link;
+		$item->type    = $obj->type;
+		$item->element = $obj->element;
+	}
+
+	/**
+	 * Parse the flat list of menu items and prepare the hierarchy of them using parent-child relationship.
+	 *
+	 * @param   MenuItem  $item  Menu item to preprocess
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public static function preprocess($item)
+	{
+		// Resolve the alias item to get the original item
+		if ($item->type == 'alias')
+		{
+			static::resolveAlias($item);
+		}
+
+		if ($item->link = in_array($item->type, array('separator', 'heading', 'container')) ? '#' : trim($item->link))
+		{
+			$item->submenu    = array();
+			$item->class      = $item->img ?? '';
+			$item->scope      = $item->scope ?? null;
+			$item->browserNav = $item->browserNav ? '_blank' : '';
+		}
+	}
+
+	/**
+	 * Load a menu tree from an XML file
+	 *
+	 * @param   \SimpleXMLElement[]  $elements  The xml menuitem nodes
+	 * @param   MenuItem             $parent    The menu hierarchy list to be populated
+	 * @param   string[]             $replace   The substring replacements for iterator type items
+	 *
+	 * @return  void
+	 *
+	 * @since  4.0.0
+	 */
+	protected static function loadXml($elements, $parent, $replace = array())
+	{
+		foreach ($elements as $element)
+		{
+			if ($element->getName() != 'menuitem')
+			{
+				continue;
+			}
+
+			$select = (string) $element['sql_select'];
+			$from   = (string) $element['sql_from'];
+
+			/**
+			 * Following is a repeatable group based on simple database query. This requires sql_* attributes (sql_select and sql_from are required)
+			 * The values can be used like - "{sql:columnName}" in any attribute of repeated elements.
+			 * The repeated elements are place inside this xml node but they will be populated in the same level in the rendered menu
+			 */
+			if ($select && $from)
+			{
+				$hidden = $element['hidden'] == 'true';
+				$where  = (string) $element['sql_where'];
+				$order  = (string) $element['sql_order'];
+				$group  = (string) $element['sql_group'];
+				$lJoin  = (string) $element['sql_leftjoin'];
+				$iJoin  = (string) $element['sql_innerjoin'];
+
+				$db    = Factory::getDbo();
+				$query = $db->getQuery(true);
+				$query->select($select)->from($from);
+
+				if ($where)
+				{
+					$query->where($where);
+				}
+
+				if ($order)
+				{
+					$query->order($order);
+				}
+
+				if ($group)
+				{
+					$query->group($group);
+				}
+
+				if ($lJoin)
+				{
+					$query->leftJoin($lJoin);
+				}
+
+				if ($iJoin)
+				{
+					$query->innerJoin($iJoin);
+				}
+
+				$results = $db->setQuery($query)->loadObjectList();
+
+				// Skip the entire group if no items to iterate over.
+				if ($results)
+				{
+					// Show the repeatable group heading node only if not set as hidden.
+					if (!$hidden)
+					{
+						$child = static::parseXmlNode($element, $replace);
+						$parent->addChild($child);
+					}
+
+					// Iterate over the matching records, items goes in the same level (not $item->submenu) as this node.
+					foreach ($results as $result)
+					{
+						static::loadXml($element->menuitem, $parent, $result);
+					}
+				}
+			}
+			else
+			{
+				$item = static::parseXmlNode($element, $replace);
+
+				// Process the child nodes
+				static::loadXml($element->menuitem, $item, $replace);
+
+				$parent->addChild($item);
+			}
+		}
+	}
+
+	/**
+	 * Create a menu item node from an xml element
+	 *
+	 * @param   \SimpleXMLElement  $node     A menuitem element from preset xml
+	 * @param   string[]           $replace  The values to substitute in the title, link and element texts
+	 *
+	 * @return  \stdClass
+	 *
+	 * @since   4.0.0
+	 */
+	protected static function parseXmlNode($node, $replace = array())
+	{
+		$item = new MenuItem;
+
+		$item->id         = null;
+		$item->type       = (string) $node['type'];
+		$item->title      = (string) $node['title'];
+		$item->link       = (string) $node['link'];
+		$item->element    = (string) $node['element'];
+		$item->class      = (string) $node['class'];
+		$item->icon       = (string) $node['icon'];
+		$item->browserNav = (string) $node['target'];
+		$item->access     = (int) $node['access'];
+		$item->scope      = (string) $node['scope'] ?: 'default';
+		$item->setParams(new Registry(trim($node->params)));
+		$item->getParams()->set('menu-permission', (string) $node['permission']);
+
+		if ($item->type == 'separator' && trim($item->title, '- '))
+		{
+			$item->getParams()->set('text_separator', 1);
+		}
+
+		if ($item->type == 'heading' || $item->type == 'container')
+		{
+			$item->link = '#';
+		}
+
+		if ((string) $node['quicktask'])
+		{
+			$item->getParams()->set('menu-quicktask', (string) $node['quicktask']);
+			$item->getParams()->set('menu-quicktask-title', (string) $node['quicktask-title']);
+			$item->getParams()->set('menu-quicktask-icon', (string) $node['quicktask-icon']);
+			$item->getParams()->set('menu-quicktask-permission', (string) $node['quicktask-permission']);
+		}
+
+		// Translate attributes for iterator values
+		foreach ($replace as $var => $val)
+		{
+			$item->title   = str_replace("{sql:$var}", $val, $item->title);
+			$item->element = str_replace("{sql:$var}", $val, $item->element);
+			$item->link    = str_replace("{sql:$var}", $val, $item->link);
+			$item->class   = str_replace("{sql:$var}", $val, $item->class);
+			$item->icon    = str_replace("{sql:$var}", $val, $item->icon);
+		}
+
+		return $item;
+	}
 }
diff --git a/administrator/components/com_menus/Model/ItemModel.php b/administrator/components/com_menus/Model/ItemModel.php
index 4fcd37d0da650..cd2aa437a5718 100644
--- a/administrator/components/com_menus/Model/ItemModel.php
+++ b/administrator/components/com_menus/Model/ItemModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -1255,6 +1255,7 @@ protected function preprocessForm(\JForm $form, $data, $group = 'content')
 					$field->addAttribute('new', 'true');
 					$field->addAttribute('edit', 'true');
 					$field->addAttribute('clear', 'true');
+					$field->addAttribute('propagate', 'true');
 					$option = $field->addChild('option', 'COM_MENUS_ITEM_FIELD_ASSOCIATION_NO_VALUE');
 					$option->addAttribute('value', '');
 				}
diff --git a/administrator/components/com_menus/Model/ItemsModel.php b/administrator/components/com_menus/Model/ItemsModel.php
index e2a29c2ffde3e..0a7a23564960f 100644
--- a/administrator/components/com_menus/Model/ItemsModel.php
+++ b/administrator/components/com_menus/Model/ItemsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -404,7 +404,28 @@ protected function getListQuery()
 
 		if (!empty($parentId))
 		{
-			$query->where('a.parent_id = ' . (int) $parentId);
+			$level = $this->getState('filter.level');
+
+			// Create a subquery for the sub-items list
+			$subQuery = $db->getQuery(true)
+				->select('sub.id')
+				->from('#__menu as sub')
+				->join('INNER', '#__menu as this ON sub.lft > this.lft AND sub.rgt < this.rgt')
+				->where('this.id = ' . (int) $parentId);
+
+			if ($level)
+			{
+				$subQuery->where('sub.level <= this.level + ' . (int) ($level - 1));
+			}
+
+			// Add the subquery to the main query
+			$query->where('(a.parent_id = ' . (int) $parentId . ' OR a.parent_id IN (' . (string) $subQuery . '))');
+		}
+
+		// Filter on the level.
+		elseif ($level = $this->getState('filter.level'))
+		{
+			$query->where('a.level <= ' . (int) $level);
 		}
 
 		// Filter the items over the menu id if set.
@@ -468,12 +489,6 @@ protected function getListQuery()
 			}
 		}
 
-		// Filter on the level.
-		if ($level = $this->getState('filter.level'))
-		{
-			$query->where('a.level <= ' . (int) $level);
-		}
-
 		// Filter on the language.
 		if ($language = $this->getState('filter.language'))
 		{
diff --git a/administrator/components/com_menus/Model/MenuModel.php b/administrator/components/com_menus/Model/MenuModel.php
index 1f0d402f19a3b..6a26a56a08086 100644
--- a/administrator/components/com_menus/Model/MenuModel.php
+++ b/administrator/components/com_menus/Model/MenuModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/Model/MenusModel.php b/administrator/components/com_menus/Model/MenusModel.php
index 9224dee0e1386..13ad03f30abd2 100644
--- a/administrator/components/com_menus/Model/MenusModel.php
+++ b/administrator/components/com_menus/Model/MenusModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/Model/MenutypesModel.php b/administrator/components/com_menus/Model/MenutypesModel.php
index 716047b56aafe..5148e853d16ed 100644
--- a/administrator/components/com_menus/Model/MenutypesModel.php
+++ b/administrator/components/com_menus/Model/MenutypesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/Service/HTML/Menus.php b/administrator/components/com_menus/Service/HTML/Menus.php
index e8e38401d4157..79411d3542bec 100644
--- a/administrator/components/com_menus/Service/HTML/Menus.php
+++ b/administrator/components/com_menus/Service/HTML/Menus.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/Table/MenuTable.php b/administrator/components/com_menus/Table/MenuTable.php
index 01204cfcd42bd..37bb5a7e163da 100644
--- a/administrator/components/com_menus/Table/MenuTable.php
+++ b/administrator/components/com_menus/Table/MenuTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/Table/MenuTypeTable.php b/administrator/components/com_menus/Table/MenuTypeTable.php
index 0a02dc5bf0d92..4cb6e488279fa 100644
--- a/administrator/components/com_menus/Table/MenuTypeTable.php
+++ b/administrator/components/com_menus/Table/MenuTypeTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/View/Item/HtmlView.php b/administrator/components/com_menus/View/Item/HtmlView.php
index 919a9b2539510..c644c17daf86f 100644
--- a/administrator/components/com_menus/View/Item/HtmlView.php
+++ b/administrator/components/com_menus/View/Item/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,8 +11,10 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
+use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -128,6 +130,7 @@ protected function addToolbar()
 		$isNew      = ($this->item->id == 0);
 		$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
 		$canDo      = $this->canDo;
+		$clientId   = $this->state->get('item.client_id', 0);
 
 		ToolbarHelper::title(Text::_($isNew ? 'COM_MENUS_VIEW_NEW_ITEM_TITLE' : 'COM_MENUS_VIEW_EDIT_ITEM_TITLE'), 'list menu-add');
 
@@ -138,7 +141,7 @@ protected function addToolbar()
 		{
 			if ($canDo->get('core.edit'))
 			{
-				$toolbarButtons[] = ['apply', 'item.apply'];
+				ToolbarHelper::apply('item.apply');
 			}
 
 			$toolbarButtons[] = ['save', 'item.save'];
@@ -147,7 +150,8 @@ protected function addToolbar()
 		// If not checked out, can save the item.
 		if (!$isNew && !$checkedOut && $canDo->get('core.edit'))
 		{
-			$toolbarButtons[] = ['apply', 'item.apply'];
+			ToolbarHelper::apply('item.apply');
+
 			$toolbarButtons[] = ['save', 'item.save'];
 		}
 
@@ -168,6 +172,11 @@ protected function addToolbar()
 			'btn-success'
 		);
 
+		if (!$isNew && Associations::isEnabled() && ComponentHelper::isEnabled('com_associations') && $clientId != 1)
+		{
+			ToolbarHelper::custom('item.editAssociations', 'contract', 'contract', 'JTOOLBAR_ASSOCIATIONS', false, false);
+		}
+
 		if ($isNew)
 		{
 			ToolbarHelper::cancel('item.cancel');
diff --git a/administrator/components/com_menus/View/Items/HtmlView.php b/administrator/components/com_menus/View/Items/HtmlView.php
index 9f332c4d84b78..4314fc4093906 100644
--- a/administrator/components/com_menus/View/Items/HtmlView.php
+++ b/administrator/components/com_menus/View/Items/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -395,13 +395,6 @@ protected function addToolbar()
 			}
 		}
 
-		if (Factory::getUser()->authorise('core.admin'))
-		{
-			$toolbar->standardButton('refresh')
-				->text('JTOOLBAR_REBUILD')
-				->task('items.rebuild');
-		}
-
 		// Add a batch button
 		if (!$protected && $user->authorise('core.create', 'com_menus')
 			&& $user->authorise('core.edit', 'com_menus')
@@ -413,6 +406,13 @@ protected function addToolbar()
 				->listCheck(true);
 		}
 
+		if (Factory::getUser()->authorise('core.admin'))
+		{
+			$toolbar->standardButton('refresh')
+				->text('JTOOLBAR_REBUILD')
+				->task('items.rebuild');
+		}
+
 		if (!$protected && $this->state->get('filter.published') == -2 && $canDo->get('core.delete'))
 		{
 			$toolbar->delete('items.delete')
diff --git a/administrator/components/com_menus/View/Menu/HtmlView.php b/administrator/components/com_menus/View/Menu/HtmlView.php
index 9a947fbd294d7..28ec7ac0ee8ce 100644
--- a/administrator/components/com_menus/View/Menu/HtmlView.php
+++ b/administrator/components/com_menus/View/Menu/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -102,7 +102,7 @@ protected function addToolbar()
 		{
 			if ($this->canDo->get('core.edit'))
 			{
-				$toolbarButtons[] = ['apply', 'menu.apply'];
+				ToolbarHelper::apply('menu.apply');
 			}
 
 			$toolbarButtons[] = ['save', 'menu.save'];
@@ -111,7 +111,8 @@ protected function addToolbar()
 		// If user can edit, can save the item.
 		if (!$isNew && $this->canDo->get('core.edit'))
 		{
-			$toolbarButtons[] = ['apply', 'menu.apply'];
+			ToolbarHelper::apply('menu.apply');
+
 			$toolbarButtons[] = ['save', 'menu.save'];
 		}
 
diff --git a/administrator/components/com_menus/View/Menu/XmlView.php b/administrator/components/com_menus/View/Menu/XmlView.php
index 71bb461b2010d..506c40da78f66 100644
--- a/administrator/components/com_menus/View/Menu/XmlView.php
+++ b/administrator/components/com_menus/View/Menu/XmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -56,10 +56,10 @@ public function display($tpl = null)
 
 		if ($menutype)
 		{
-			$items = MenusHelper::getMenuItems($menutype, true);
+			$root = MenusHelper::getMenuItems($menutype, true);
 		}
 
-		if (empty($items))
+		if ($root->hasChildren())
 		{
 			Log::add(Text::_('COM_MENUS_SELECT_MENU_FIRST_EXPORT'), Log::WARNING, 'jerror');
 
@@ -68,7 +68,7 @@ public function display($tpl = null)
 			return;
 		}
 
-		$this->items = MenuHelper::createLevels($items);
+		$this->items = $root->getChildren();
 
 		$xml = new \SimpleXMLElement('<menu ' .
 			'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ' .
diff --git a/administrator/components/com_menus/View/Menus/HtmlView.php b/administrator/components/com_menus/View/Menus/HtmlView.php
index 85069ddf26297..b2c2bb9f9a694 100644
--- a/administrator/components/com_menus/View/Menus/HtmlView.php
+++ b/administrator/components/com_menus/View/Menus/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/View/Menutypes/HtmlView.php b/administrator/components/com_menus/View/Menutypes/HtmlView.php
index 83c19eb77dbc8..4277e4d8b25a7 100644
--- a/administrator/components/com_menus/View/Menutypes/HtmlView.php
+++ b/administrator/components/com_menus/View/Menutypes/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -69,11 +69,11 @@ public function display($tpl = null)
 				$tmp[Text::_($item->title)] = $item;
 			}
 
-			ksort($tmp);
+			uksort($tmp, 'strcasecmp');
 			$sortedTypes[Text::_($name)] = $tmp;
 		}
 
-		ksort($sortedTypes);
+		uksort($sortedTypes, 'strcasecmp');
 
 		$this->types = $sortedTypes;
 
diff --git a/administrator/components/com_menus/forms/item_component.xml b/administrator/components/com_menus/forms/item_component.xml
index 5eb940c5d0032..3e75f97291113 100644
--- a/administrator/components/com_menus/forms/item_component.xml
+++ b/administrator/components/com_menus/forms/item_component.xml
@@ -78,14 +78,12 @@
 				name="page_heading"
 				type="text"
 				label="COM_MENUS_ITEM_FIELD_PAGE_HEADING_LABEL"
-				useglobal="true"
 			/>
 
 			<field
 				name="pageclass_sfx"
 				type="text"
 				label="COM_MENUS_ITEM_FIELD_PAGE_CLASS_LABEL"
-				useglobal="true"
 			/>
 
 		</fieldset>
diff --git a/administrator/components/com_menus/helpers/menus.php b/administrator/components/com_menus/helpers/menus.php
index 8cbadaab6704f..585c1f50b700a 100644
--- a/administrator/components/com_menus/helpers/menus.php
+++ b/administrator/components/com_menus/helpers/menus.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php b/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php
index a00ec8599fc33..f4a2f143b792f 100644
--- a/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php
+++ b/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/layouts/joomla/searchtools/default.php b/administrator/components/com_menus/layouts/joomla/searchtools/default.php
index a061662441a2e..2e8734b7ee51f 100644
--- a/administrator/components/com_menus/layouts/joomla/searchtools/default.php
+++ b/administrator/components/com_menus/layouts/joomla/searchtools/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/menus.xml b/administrator/components/com_menus/menus.xml
index d932b47122376..a58ccd0c95b10 100644
--- a/administrator/components/com_menus/menus.xml
+++ b/administrator/components/com_menus/menus.xml
@@ -3,7 +3,7 @@
 	<name>com_menus</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_menus/presets/joomla.xml b/administrator/components/com_menus/presets/joomla.xml
index f261a5915f29a..d5759a45a9284 100644
--- a/administrator/components/com_menus/presets/joomla.xml
+++ b/administrator/components/com_menus/presets/joomla.xml
@@ -20,13 +20,18 @@
 				title="MOD_MENU_COM_CONTENT_ARTICLE_MANAGER"
 				type="component"
 				element="com_content"
-				link="index.php?option=com_content">
+				link="index.php?option=com_content"
+				quicktask="index.php?option=com_content&amp;task=article.add"
+				quicktask-title="MOD_MENU_COM_CONTENT_ARTICLE_ADD"
+				>
 		</menuitem>
 		<menuitem
 				title="MOD_MENU_COM_CONTENT_CATEGORY_MANAGER"
 				type="component"
 				element="com_categories"
-				link="index.php?option=com_categories&amp;extension=com_content">
+				link="index.php?option=com_categories&amp;extension=com_content"
+				quicktask="index.php?option=com_categories&amp;extension=com_content&amp;task=category.add"
+				>
 		</menuitem>
 		<menuitem
 				title="MOD_MENU_COM_CONTENT_FEATURED"
@@ -138,14 +143,9 @@
 					title="{sql:title}"
 					type="component"
 					element="com_menus"
-					link="index.php?option=com_menus&amp;view=items&amp;menutype={sql:menutype}">
-				<menuitem
-						title="MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM"
-						type="component"
-						element="com_menus"
-						link="index.php?option=com_menus&amp;view=item&amp;layout=edit&amp;menutype={sql:menutype}"
-						scope="edit"
-				/>
+					link="index.php?option=com_menus&amp;view=items&amp;menutype={sql:menutype}"
+					icon="{sql:icon}"
+					class="class:menu">
 			</menuitem>
 		</menuitem>
 	</menuitem>
@@ -213,6 +213,23 @@
 		<menuitem
 				type="separator"
 		/>
+		<menuitem
+				title="MOD_MENU_COM_PRIVACY"
+				type="component"
+				element="com_privacy"
+				link="index.php?option=com_privacy"
+				class="class:privacy"
+		/>
+		<menuitem
+				title="MOD_MENU_COM_ACTIONLOGS"
+				type="component"
+				element="com_actionlogs"
+				link="index.php?option=com_actionlogs"
+				class="class:userlogs"
+		/>
+		<menuitem
+				type="separator"
+		/>
 		<menuitem
 				title="MOD_MENU_MASS_MAIL_USERS"
 				type="component"
diff --git a/administrator/components/com_menus/presets/modern.xml b/administrator/components/com_menus/presets/modern.xml
index c015393f4c4c6..e32d9ca8d8a88 100644
--- a/administrator/components/com_menus/presets/modern.xml
+++ b/administrator/components/com_menus/presets/modern.xml
@@ -101,6 +101,23 @@
 		<menuitem
 			type="separator"
 		/>
+		<menuitem
+			title="MOD_MENU_COM_PRIVACY"
+			type="component"
+			element="com_privacy"
+			link="index.php?option=com_privacy"
+			class="class:privacy"
+		/>
+		<menuitem
+			title="MOD_MENU_COM_ACTIONLOGS"
+			type="component"
+			element="com_actionlogs"
+			link="index.php?option=com_actionlogs"
+			class="class:userlogs"
+		/>		
+		<menuitem
+			type="separator"
+		/>
 		<menuitem
 			title="MOD_MENU_MASS_MAIL_USERS"
 			type="component"
diff --git a/administrator/components/com_menus/services/provider.php b/administrator/components/com_menus/services/provider.php
index 6aef850aef91e..adbf5725910e7 100644
--- a/administrator/components/com_menus/services/provider.php
+++ b/administrator/components/com_menus/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/tmpl/item/edit.php b/administrator/components/com_menus/tmpl/item/edit.php
index a026e8a0046ab..4ff100354963a 100644
--- a/administrator/components/com_menus/tmpl/item/edit.php
+++ b/administrator/components/com_menus/tmpl/item/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/tmpl/item/edit_associations.php b/administrator/components/com_menus/tmpl/item/edit_associations.php
index e50cdc9c210a5..394adc40dfac3 100644
--- a/administrator/components/com_menus/tmpl/item/edit_associations.php
+++ b/administrator/components/com_menus/tmpl/item/edit_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/tmpl/item/edit_container.php b/administrator/components/com_menus/tmpl/item/edit_container.php
index cf220b787baca..93f01c48a8e50 100644
--- a/administrator/components/com_menus/tmpl/item/edit_container.php
+++ b/administrator/components/com_menus/tmpl/item/edit_container.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_menus/tmpl/item/edit_modules.php b/administrator/components/com_menus/tmpl/item/edit_modules.php
index 48de87ddecce1..323c241775491 100644
--- a/administrator/components/com_menus/tmpl/item/edit_modules.php
+++ b/administrator/components/com_menus/tmpl/item/edit_modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/tmpl/item/edit_options.php b/administrator/components/com_menus/tmpl/item/edit_options.php
index fc39c269019dc..c104e697b3c74 100644
--- a/administrator/components/com_menus/tmpl/item/edit_options.php
+++ b/administrator/components/com_menus/tmpl/item/edit_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/tmpl/item/modal.php b/administrator/components/com_menus/tmpl/item/modal.php
index 07427ac4f6e10..9dedc340b3e66 100644
--- a/administrator/components/com_menus/tmpl/item/modal.php
+++ b/administrator/components/com_menus/tmpl/item/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/tmpl/item/modal_associations.php b/administrator/components/com_menus/tmpl/item/modal_associations.php
index e50cdc9c210a5..394adc40dfac3 100644
--- a/administrator/components/com_menus/tmpl/item/modal_associations.php
+++ b/administrator/components/com_menus/tmpl/item/modal_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/tmpl/item/modal_options.php b/administrator/components/com_menus/tmpl/item/modal_options.php
index 250590f1d9e49..8c91bb28fa105 100644
--- a/administrator/components/com_menus/tmpl/item/modal_options.php
+++ b/administrator/components/com_menus/tmpl/item/modal_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/tmpl/items/default.php b/administrator/components/com_menus/tmpl/items/default.php
index bfd3e57fbe1e7..8ff7ccbdbdb43 100644
--- a/administrator/components/com_menus/tmpl/items/default.php
+++ b/administrator/components/com_menus/tmpl/items/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/tmpl/items/default_batch_body.php b/administrator/components/com_menus/tmpl/items/default_batch_body.php
index 33e599d8ff37b..69a981b2b3a9f 100644
--- a/administrator/components/com_menus/tmpl/items/default_batch_body.php
+++ b/administrator/components/com_menus/tmpl/items/default_batch_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_menus/tmpl/items/default_batch_footer.php b/administrator/components/com_menus/tmpl/items/default_batch_footer.php
index 1167722c794db..588ae910a5775 100644
--- a/administrator/components/com_menus/tmpl/items/default_batch_footer.php
+++ b/administrator/components/com_menus/tmpl/items/default_batch_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -15,11 +15,11 @@
 $clientId  = $this->state->get('filter.client_id');
 $menuType = Factory::getApplication()->getUserState('com_menus.items.menutype');
 ?>
-<a class="btn btn-secondary" type="button" onclick="document.getElementById('batch-menu-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
+<button type="button" class="btn btn-secondary" onclick="document.getElementById('batch-menu-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
 	<?php echo Text::_('JCANCEL'); ?>
-</a>
+</button>
 <?php if ((strlen($menuType) && $menuType != '*' && $clientId == 0) || ($published > 0 && $clientId == 1)): ?>
-	<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('item.batch');">
+	<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('item.batch');">
 		<?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?>
 	</button>
 <?php endif; ?>
diff --git a/administrator/components/com_menus/tmpl/items/modal.php b/administrator/components/com_menus/tmpl/items/modal.php
index 7cc6ab6683525..c2277c6cc62a1 100644
--- a/administrator/components/com_menus/tmpl/items/modal.php
+++ b/administrator/components/com_menus/tmpl/items/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/tmpl/menu/edit.php b/administrator/components/com_menus/tmpl/menu/edit.php
index ae42d15fc0ec7..eed82cbfc82fe 100644
--- a/administrator/components/com_menus/tmpl/menu/edit.php
+++ b/administrator/components/com_menus/tmpl/menu/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/tmpl/menus/default.php b/administrator/components/com_menus/tmpl/menus/default.php
index ae64e2ea27532..38719a13a741c 100644
--- a/administrator/components/com_menus/tmpl/menus/default.php
+++ b/administrator/components/com_menus/tmpl/menus/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/tmpl/menutypes/default.php b/administrator/components/com_menus/tmpl/menutypes/default.php
index c2b5a53f6fc5f..cfddb2137c585 100644
--- a/administrator/components/com_menus/tmpl/menutypes/default.php
+++ b/administrator/components/com_menus/tmpl/menutypes/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -30,7 +30,7 @@
 				<?php foreach ($list as $title => $item) : ?>
 					<?php $menutype = array('id' => $this->recordId, 'title' => $item->type ?? $item->title, 'request' => $item->request); ?>
 					<?php $menutype = base64_encode(json_encode($menutype)); ?>
-					<a class="choose_type list-group-item list-group-item-action" href="#" title="<?php echo Text::_($item->description); ?>"
+					<a class="choose_type list-group-item list-group-item-action" href="#" 
 						onclick="Joomla.setMenuType('<?php echo $menutype; ?>', '<?php echo $tmpl; ?>')">
 						<div class="pr-2">
 							<?php echo $title; ?>
diff --git a/administrator/components/com_messages/Controller/ConfigController.php b/administrator/components/com_messages/Controller/ConfigController.php
index 362673c7b954e..1d096ba9d5294 100644
--- a/administrator/components/com_messages/Controller/ConfigController.php
+++ b/administrator/components/com_messages/Controller/ConfigController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 
 /**
  * Messages Component Message Model
@@ -34,7 +33,7 @@ class ConfigController extends BaseController
 	public function save()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$app   = Factory::getApplication();
 		$model = $this->getModel('Config', 'MessagesModel');
diff --git a/administrator/components/com_messages/Controller/DisplayController.php b/administrator/components/com_messages/Controller/DisplayController.php
index 8767186955971..c4d9c7980ea86 100644
--- a/administrator/components/com_messages/Controller/DisplayController.php
+++ b/administrator/components/com_messages/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/Controller/MessageController.php b/administrator/components/com_messages/Controller/MessageController.php
index 3043d70c60da4..2c6f94dca5755 100644
--- a/administrator/components/com_messages/Controller/MessageController.php
+++ b/administrator/components/com_messages/Controller/MessageController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/Controller/MessagesController.php b/administrator/components/com_messages/Controller/MessagesController.php
index d7f7292e69104..bbfa507e0a979 100644
--- a/administrator/components/com_messages/Controller/MessagesController.php
+++ b/administrator/components/com_messages/Controller/MessagesController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/Extension/MessagesComponent.php b/administrator/components/com_messages/Extension/MessagesComponent.php
index 169e00a68597f..d3d6a516e946d 100644
--- a/administrator/components/com_messages/Extension/MessagesComponent.php
+++ b/administrator/components/com_messages/Extension/MessagesComponent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/Field/MessageStatesField.php b/administrator/components/com_messages/Field/MessageStatesField.php
index 7e81300b25e9c..6f3b28ec68451 100644
--- a/administrator/components/com_messages/Field/MessageStatesField.php
+++ b/administrator/components/com_messages/Field/MessageStatesField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,17 +11,15 @@
 
 defined('JPATH_BASE') or die;
 
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\Component\Messages\Administrator\Helper\MessagesHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Message States field.
  *
  * @since  3.6.0
  */
-class MessageStatesField extends \JFormFieldList
+class MessageStatesField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/administrator/components/com_messages/Field/UserMessagesField.php b/administrator/components/com_messages/Field/UserMessagesField.php
index 2d0a28b079c84..b31a7073d78b6 100644
--- a/administrator/components/com_messages/Field/UserMessagesField.php
+++ b/administrator/components/com_messages/Field/UserMessagesField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/Helper/MessagesHelper.php b/administrator/components/com_messages/Helper/MessagesHelper.php
index d8c2a82d170fa..395bda8dc6ea1 100644
--- a/administrator/components/com_messages/Helper/MessagesHelper.php
+++ b/administrator/components/com_messages/Helper/MessagesHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/Model/ConfigModel.php b/administrator/components/com_messages/Model/ConfigModel.php
index 8eef5c5c53d30..a3ee60b80034e 100644
--- a/administrator/components/com_messages/Model/ConfigModel.php
+++ b/administrator/components/com_messages/Model/ConfigModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/Model/MessageModel.php b/administrator/components/com_messages/Model/MessageModel.php
index 0f16d9cb4a38c..535f56b4ef09a 100644
--- a/administrator/components/com_messages/Model/MessageModel.php
+++ b/administrator/components/com_messages/Model/MessageModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,6 +17,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\MVC\Model\AdminModel;
+use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\User;
 
@@ -354,9 +355,11 @@ public function save($data)
 			$lang->load('com_messages', JPATH_ADMINISTRATOR);
 
 			// Build the email subject and message
-			$sitename = Factory::getApplication()->get('sitename');
+			$app      = Factory::getApplication();
+			$linkMode = $app->get('force_ssl', 0) >= 1 ? 1 : -1;
+			$sitename = $app->get('sitename');
 			$fromName = $fromUser->get('name');
-			$siteURL  = Uri::root() . 'administrator/index.php?option=com_messages&view=message&message_id=' . $table->message_id;
+			$siteURL  = Route::link('administrator', 'index.php?option=com_messages&view=message&message_id=' . $table->message_id, false, $linkMode);
 			$subject  = html_entity_decode($table->subject, ENT_COMPAT, 'UTF-8');
 			$message  = strip_tags(html_entity_decode($table->message, ENT_COMPAT, 'UTF-8'));
 
@@ -426,4 +429,95 @@ public function save($data)
 
 		return true;
 	}
+
+	/**
+	 * Sends a message to the site's super users
+	 *
+	 * @param   string  $subject  The message subject
+	 * @param   string  $message  The message
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function notifySuperUsers($subject, $message, $fromUser = null)
+	{
+		$db = $this->getDbo();
+
+		try
+		{
+			/** @var JTableAsset $table */
+			$table  = $this->getTable('Asset', 'JTable');
+			$rootId = $table->getRootId();
+
+			/** @var JAccessRule[] $rules */
+			$rules     = JAccess::getAssetRules($rootId)->getData();
+			$rawGroups = $rules['core.admin']->getData();
+
+			if (empty($rawGroups))
+			{
+				$this->setError(JText::_('COM_MESSAGES_ERROR_MISSING_ROOT_ASSET_GROUPS'));
+
+				return false;
+			}
+
+			$groups = array();
+
+			foreach ($rawGroups as $g => $enabled)
+			{
+				if ($enabled)
+				{
+					$groups[] = $db->quote($g);
+				}
+			}
+
+			if (empty($groups))
+			{
+				$this->setError(JText::_('COM_MESSAGES_ERROR_NO_GROUPS_SET_AS_SUPER_USER'));
+
+				return false;
+			}
+
+			$query = $db->getQuery(true)
+				->select($db->quoteName('user_id'))
+				->from($db->quoteName('#__user_usergroup_map'))
+				->where($db->quoteName('group_id') . ' IN(' . implode(',', $groups) . ')');
+
+			$userIDs = $db->setQuery($query)->loadColumn(0);
+
+			if (empty($userIDs))
+			{
+				$this->setError(JText::_('COM_MESSAGES_ERROR_NO_USERS_SET_AS_SUPER_USER'));
+
+				return false;
+			}
+
+			foreach ($userIDs as $id)
+			{
+				/*
+				 * All messages must have a valid from user, we have use cases where an unauthenticated user may trigger this
+				 * so we will set the from user as the to user
+				 */
+				$data = array(
+					'user_id_from' => $id,
+					'user_id_to'   => $id,
+					'subject'      => $subject,
+					'message'      => $message,
+				);
+
+				if (!$this->save($data))
+				{
+					return false;
+				}
+			}
+
+			return true;
+		}
+		catch (Exception $exception)
+		{
+			$this->setError($exception->getMessage());
+
+			return false;
+		}
+	}
 }
diff --git a/administrator/components/com_messages/Model/MessagesModel.php b/administrator/components/com_messages/Model/MessagesModel.php
index a48ae4b537362..0b378d97fb684 100644
--- a/administrator/components/com_messages/Model/MessagesModel.php
+++ b/administrator/components/com_messages/Model/MessagesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/Service/HTML/Messages.php b/administrator/components/com_messages/Service/HTML/Messages.php
index d1f5f09813efd..3fa37e9911d93 100644
--- a/administrator/components/com_messages/Service/HTML/Messages.php
+++ b/administrator/components/com_messages/Service/HTML/Messages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/Table/MessageTable.php b/administrator/components/com_messages/Table/MessageTable.php
index fc00365400889..84177c02c5f8a 100644
--- a/administrator/components/com_messages/Table/MessageTable.php
+++ b/administrator/components/com_messages/Table/MessageTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/View/Config/HtmlView.php b/administrator/components/com_messages/View/Config/HtmlView.php
index 86370caa15c84..7dc95e1ef7179 100644
--- a/administrator/components/com_messages/View/Config/HtmlView.php
+++ b/administrator/components/com_messages/View/Config/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/View/Message/HtmlView.php b/administrator/components/com_messages/View/Message/HtmlView.php
index 6e097b3f04fe2..11d0281afa541 100644
--- a/administrator/components/com_messages/View/Message/HtmlView.php
+++ b/administrator/components/com_messages/View/Message/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/View/Messages/HtmlView.php b/administrator/components/com_messages/View/Messages/HtmlView.php
index 44465d111212e..8ff14650bbd65 100644
--- a/administrator/components/com_messages/View/Messages/HtmlView.php
+++ b/administrator/components/com_messages/View/Messages/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/messages.xml b/administrator/components/com_messages/messages.xml
index 3d343c6c4c2c0..1aaf9dd183197 100644
--- a/administrator/components/com_messages/messages.xml
+++ b/administrator/components/com_messages/messages.xml
@@ -3,7 +3,7 @@
 	<name>com_messages</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_messages/services/provider.php b/administrator/components/com_messages/services/provider.php
index 016a96baceeed..ccf52ff592cca 100644
--- a/administrator/components/com_messages/services/provider.php
+++ b/administrator/components/com_messages/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/tmpl/config/default.php b/administrator/components/com_messages/tmpl/config/default.php
index e0533716b514a..a88dc80353375 100644
--- a/administrator/components/com_messages/tmpl/config/default.php
+++ b/administrator/components/com_messages/tmpl/config/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/tmpl/message/default.php b/administrator/components/com_messages/tmpl/message/default.php
index 3dc3411a44d1b..1859b6f646046 100644
--- a/administrator/components/com_messages/tmpl/message/default.php
+++ b/administrator/components/com_messages/tmpl/message/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/tmpl/message/edit.php b/administrator/components/com_messages/tmpl/message/edit.php
index c234e2bf27c18..9d991675a5aac 100644
--- a/administrator/components/com_messages/tmpl/message/edit.php
+++ b/administrator/components/com_messages/tmpl/message/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/tmpl/messages/default.php b/administrator/components/com_messages/tmpl/messages/default.php
index ff08fff36a8b9..e1b16c09e8da4 100644
--- a/administrator/components/com_messages/tmpl/messages/default.php
+++ b/administrator/components/com_messages/tmpl/messages/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/Controller/DisplayController.php b/administrator/components/com_modules/Controller/DisplayController.php
index 6341c4fe4210e..3c2ab2495505f 100644
--- a/administrator/components/com_modules/Controller/DisplayController.php
+++ b/administrator/components/com_modules/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/Controller/ModuleController.php b/administrator/components/com_modules/Controller/ModuleController.php
index 49d8f0e82bacc..0ab99a77a4406 100644
--- a/administrator/components/com_modules/Controller/ModuleController.php
+++ b/administrator/components/com_modules/Controller/ModuleController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -81,6 +81,11 @@ public function cancel($key = null)
 		$this->app->setUserState('com_modules.add.module.extension_id', null);
 		$this->app->setUserState('com_modules.add.module.params', null);
 
+		if ($return = $this->input->get('return', '', 'BASE64'))
+		{
+			$this->app->redirect(base64_decode($return));
+		}
+
 		return $result;
 	}
 
@@ -151,7 +156,7 @@ protected function allowEdit($data = array(), $key = 'id')
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Set the model
 		$model = $this->getModel('Module', 'Administrator', array());
@@ -203,10 +208,7 @@ protected function postSaveHook(BaseDatabaseModel $model, $validData = array())
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		if (!Session::checkToken())
-		{
-			Factory::getApplication()->redirect('index.php', Text::_('JINVALID_TOKEN'));
-		}
+		$this->checkToken();
 
 		if (Factory::getDocument()->getType() == 'json')
 		{
@@ -258,8 +260,8 @@ public function orderPosition()
 		// Check if user token is valid.
 		if (!Session::checkToken('get'))
 		{
-			$app->enqueueMessage(Text::_('JINVALID_TOKEN'), 'error');
-			echo new  JsonResponse;
+			$app->enqueueMessage(Text::_('JINVALID_TOKEN_NOTICE'), 'error');
+			echo new JsonResponse;
 			$app->close();
 		}
 
diff --git a/administrator/components/com_modules/Controller/ModulesController.php b/administrator/components/com_modules/Controller/ModulesController.php
index dd8fc0e27f357..309864336f86d 100644
--- a/administrator/components/com_modules/Controller/ModulesController.php
+++ b/administrator/components/com_modules/Controller/ModulesController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,6 @@
 
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -33,7 +32,7 @@ class ModulesController extends AdminController
 	public function duplicate()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$pks = $this->input->post->get('cid', array(), 'array');
 		$pks = ArrayHelper::toInteger($pks);
diff --git a/administrator/components/com_modules/Extension/ModulesComponent.php b/administrator/components/com_modules/Extension/ModulesComponent.php
index a1bdc82ff21ce..9f25974eaa3d9 100644
--- a/administrator/components/com_modules/Extension/ModulesComponent.php
+++ b/administrator/components/com_modules/Extension/ModulesComponent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/Field/ModulesModuleField.php b/administrator/components/com_modules/Field/ModulesModuleField.php
index 95a7d9c54e82a..5e3313d3def16 100644
--- a/administrator/components/com_modules/Field/ModulesModuleField.php
+++ b/administrator/components/com_modules/Field/ModulesModuleField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,17 +12,15 @@
 defined('JPATH_BASE') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\Component\Modules\Administrator\Helper\ModulesHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Modules Module field.
  *
  * @since  3.4.2
  */
-class ModulesModuleField extends \JFormFieldList
+class ModulesModuleField extends ListField
 {
 	/**
 	 * The form field type.
@@ -41,8 +39,7 @@ class ModulesModuleField extends \JFormFieldList
 	 */
 	public function getOptions()
 	{
-		$clientId = Factory::getApplication()->getUserState('com_modules.modules.client_id', 0);
-		$options  = ModulesHelper::getModules($clientId);
+		$options  = ModulesHelper::getModules(Factory::getApplication()->getUserState('com_modules.modules.client_id', 0, 'int'));
 
 		return array_merge(parent::getOptions(), $options);
 	}
diff --git a/administrator/components/com_modules/Field/ModulesPositionField.php b/administrator/components/com_modules/Field/ModulesPositionField.php
index 49e9823011c09..b0fb877cb93c2 100644
--- a/administrator/components/com_modules/Field/ModulesPositionField.php
+++ b/administrator/components/com_modules/Field/ModulesPositionField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -39,8 +39,7 @@ class ModulesPositionField extends ListField
 	 */
 	public function getOptions()
 	{
-		$clientId = Factory::getApplication()->getUserState('com_modules.modules.client_id', 0);
-		$options  = ModulesHelper::getPositions($clientId);
+		$options  = ModulesHelper::getPositions(Factory::getApplication()->getUserState('com_modules.modules.client_id', 0, 'int'));
 
 		return array_merge(parent::getOptions(), $options);
 	}
diff --git a/administrator/components/com_modules/Field/ModulesPositioneditField.php b/administrator/components/com_modules/Field/ModulesPositioneditField.php
index a225d6a59d8e7..381c401f6dda0 100644
--- a/administrator/components/com_modules/Field/ModulesPositioneditField.php
+++ b/administrator/components/com_modules/Field/ModulesPositioneditField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/Helper/ModulesHelper.php b/administrator/components/com_modules/Helper/ModulesHelper.php
index 45b2788c45ce1..05448413ec04b 100644
--- a/administrator/components/com_modules/Helper/ModulesHelper.php
+++ b/administrator/components/com_modules/Helper/ModulesHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/Model/ModuleModel.php b/administrator/components/com_modules/Model/ModuleModel.php
index e40b59646c5f7..751c6a7ee827d 100644
--- a/administrator/components/com_modules/Model/ModuleModel.php
+++ b/administrator/components/com_modules/Model/ModuleModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -1067,10 +1067,14 @@ public function save($data)
 
 		// Compute the extension id of this module in case the controller wants it.
 		$query->clear()
-			->select('extension_id')
-			->from('#__extensions AS e')
-			->join('LEFT', '#__modules AS m ON e.element = m.module')
-			->where('m.id = ' . (int) $table->id);
+			->select($db->quoteName('extension_id'))
+			->from($db->quoteName('#__extensions', 'e'))
+			->join(
+				'LEFT',
+				$db->quoteName('#__modules', 'm') . ' ON ' . $db->quoteName('e.client_id') . ' = ' . (int) $table->client_id .
+				' AND ' . $db->quoteName('e.element') . ' = ' . $db->quoteName('m.module')
+			)
+			->where($db->quoteName('m.id') . ' = ' . (int) $table->id);
 		$db->setQuery($query);
 
 		try
diff --git a/administrator/components/com_modules/Model/ModulesModel.php b/administrator/components/com_modules/Model/ModulesModel.php
index ddff610def0ce..856e382831331 100644
--- a/administrator/components/com_modules/Model/ModulesModel.php
+++ b/administrator/components/com_modules/Model/ModulesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/Model/PositionsModel.php b/administrator/components/com_modules/Model/PositionsModel.php
index 5374415c3e8fe..9938ba3dba6ab 100644
--- a/administrator/components/com_modules/Model/PositionsModel.php
+++ b/administrator/components/com_modules/Model/PositionsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/Model/SelectModel.php b/administrator/components/com_modules/Model/SelectModel.php
index 19317c4516057..c06c3022d7637 100644
--- a/administrator/components/com_modules/Model/SelectModel.php
+++ b/administrator/components/com_modules/Model/SelectModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/Service/HTML/Modules.php b/administrator/components/com_modules/Service/HTML/Modules.php
index 3264eeb62e4ad..42c076bb2d6e7 100644
--- a/administrator/components/com_modules/Service/HTML/Modules.php
+++ b/administrator/components/com_modules/Service/HTML/Modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/View/Module/HtmlView.php b/administrator/components/com_modules/View/Module/HtmlView.php
index c275ae128d226..408032dc6064d 100644
--- a/administrator/components/com_modules/View/Module/HtmlView.php
+++ b/administrator/components/com_modules/View/Module/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -98,9 +98,10 @@ protected function addToolbar()
 		// For new records, check the create permission.
 		if ($isNew && $canDo->get('core.create'))
 		{
+			ToolbarHelper::apply('module.apply');
+
 			ToolbarHelper::saveGroup(
 				[
-					['apply', 'module.apply'],
 					['save', 'module.save'],
 					['save2new', 'module.save2new']
 				],
@@ -119,7 +120,8 @@ protected function addToolbar()
 				// Since it's an existing record, check the edit permission.
 				if ($canDo->get('core.edit'))
 				{
-					$toolbarButtons[] = ['apply', 'module.apply'];
+					ToolbarHelper::apply('module.apply');
+
 					$toolbarButtons[] = ['save', 'module.save'];
 
 					// We can save this record, but check the create permission to see if we can return to make a new one.
diff --git a/administrator/components/com_modules/View/Modules/HtmlView.php b/administrator/components/com_modules/View/Modules/HtmlView.php
index 853af4a1d36d3..d3bc59d3bf892 100644
--- a/administrator/components/com_modules/View/Modules/HtmlView.php
+++ b/administrator/components/com_modules/View/Modules/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -163,11 +163,6 @@ protected function addToolbar()
 		{
 			$toolbar->standardButton('new', 'JTOOLBAR_NEW')
 				->onclick("location.href='index.php?option=com_modules&amp;view=select'");
-
-			$toolbar->standardButton('copy')
-				->text('JTOOLBAR_DUPLICATE')
-				->task('modules.duplicate')
-				->listCheck(true);
 		}
 
 		if ($canDo->get('core.edit.state') || Factory::getUser()->authorise('core.admin'))
@@ -209,6 +204,14 @@ protected function addToolbar()
 				->listCheck(true);
 		}
 
+		if ($canDo->get('core.create'))
+		{
+			$toolbar->standardButton('copy')
+				->text('JTOOLBAR_DUPLICATE')
+				->task('modules.duplicate')
+				->listCheck(true);
+		}
+
 		if ($state->get('filter.state') == -2 && $canDo->get('core.delete'))
 		{
 			$toolbar->delete('modules.delete')
diff --git a/administrator/components/com_modules/View/Select/HtmlView.php b/administrator/components/com_modules/View/Select/HtmlView.php
index 4cb596e9765b3..6e4d3489d2230 100644
--- a/administrator/components/com_modules/View/Select/HtmlView.php
+++ b/administrator/components/com_modules/View/Select/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/forms/advanced.xml b/administrator/components/com_modules/forms/advanced.xml
index 4fe71270646b2..805f4532a6ae5 100644
--- a/administrator/components/com_modules/forms/advanced.xml
+++ b/administrator/components/com_modules/forms/advanced.xml
@@ -4,6 +4,12 @@
 		<fieldset
 			name="advanced">
 
+			<field
+				name="style"
+				type="chromestyle"
+				label="COM_MODULES_FIELD_MODULE_STYLE_LABEL"
+			/>
+
 			<field
 				name="module_tag"
 				type="moduletag"
@@ -32,12 +38,6 @@
 				type="text"
 				label="COM_MODULES_FIELD_HEADER_CLASS_LABEL"
 			/>
-
-			<field
-				name="style"
-				type="chromestyle"
-				label="COM_MODULES_FIELD_MODULE_STYLE_LABEL"
-			/>
 		</fieldset>
 	</fields>
 </form>
diff --git a/administrator/components/com_modules/helpers/modules.php b/administrator/components/com_modules/helpers/modules.php
index f80a5ee3361cf..bd305f1f31d34 100644
--- a/administrator/components/com_modules/helpers/modules.php
+++ b/administrator/components/com_modules/helpers/modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/layouts/joomla/form/field/modulespositionedit.php b/administrator/components/com_modules/layouts/joomla/form/field/modulespositionedit.php
index 551daab6b3ae2..6644c4381b00f 100644
--- a/administrator/components/com_modules/layouts/joomla/form/field/modulespositionedit.php
+++ b/administrator/components/com_modules/layouts/joomla/form/field/modulespositionedit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -73,7 +73,7 @@
 Text::script('JGLOBAL_SELECT_PRESS_TO_SELECT');
 
 Factory::getDocument()->getWebAssetManager()->enableAsset('choicesjs');
-HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);
+HTMLHelper::_('webcomponent', 'system/fields/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);
 
 ?>
 <joomla-field-fancy-select <?php echo implode(' ', $attributes); ?>><?php
diff --git a/administrator/components/com_modules/layouts/toolbar/cancelselect.php b/administrator/components/com_modules/layouts/toolbar/cancelselect.php
index 9c8a4fadaa49d..97fb09546ed44 100644
--- a/administrator/components/com_modules/layouts/toolbar/cancelselect.php
+++ b/administrator/components/com_modules/layouts/toolbar/cancelselect.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,6 +13,6 @@
 
 $text = Text::_('JTOOLBAR_CANCEL');
 ?>
-<button onclick="location.href='index.php?option=com_modules'" class="btn btn-sm btn-danger" title="<?php echo $text; ?>">
+<button onclick="location.href='index.php?option=com_modules'" class="btn btn-sm btn-danger">
 	<span class="icon-cancel" aria-hidden="true"></span> <?php echo $text; ?>
 </button>
diff --git a/administrator/components/com_modules/modules.xml b/administrator/components/com_modules/modules.xml
index dd5ec72301fa3..9ea4fd704fafb 100644
--- a/administrator/components/com_modules/modules.xml
+++ b/administrator/components/com_modules/modules.xml
@@ -3,7 +3,7 @@
 	<name>com_modules</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_modules/services/provider.php b/administrator/components/com_modules/services/provider.php
index f6c48281b44af..4bfc4fdbb35ea 100644
--- a/administrator/components/com_modules/services/provider.php
+++ b/administrator/components/com_modules/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/tmpl/module/edit.php b/administrator/components/com_modules/tmpl/module/edit.php
index 6ed075f077dd0..f5b86dccbc3ef 100644
--- a/administrator/components/com_modules/tmpl/module/edit.php
+++ b/administrator/components/com_modules/tmpl/module/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -194,6 +194,7 @@
 		<?php echo HTMLHelper::_('uitab.endTabSet'); ?>
 
 		<input type="hidden" name="task" value="">
+		<input type="hidden" name="return" value="<?php echo $input->getCmd('return'); ?>">
 		<?php echo HTMLHelper::_('form.token'); ?>
 		<?php echo $this->form->getInput('module'); ?>
 		<?php echo $this->form->getInput('client_id'); ?>
diff --git a/administrator/components/com_modules/tmpl/module/edit_assignment.php b/administrator/components/com_modules/tmpl/module/edit_assignment.php
index bf9c2470c298e..067477c405a2d 100644
--- a/administrator/components/com_modules/tmpl/module/edit_assignment.php
+++ b/administrator/components/com_modules/tmpl/module/edit_assignment.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -22,7 +22,7 @@
 HTMLHelper::_('script', 'com_modules/admin-module-edit_assignment.min.js', array('version' => 'auto', 'relative' => true));
 ?>
 <div class="control-group">
-	<label id="jform_menus-lbl" class="control-label" for="jform_menus"><?php echo Text::_('COM_MODULES_MODULE_ASSIGN'); ?></label>
+	<label id="jform_menus-lbl" class="control-label" for="jform_assignment"><?php echo Text::_('COM_MODULES_MODULE_ASSIGN'); ?></label>
 	<div id="jform_menus" class="controls">
 		<select class="custom-select" name="jform[assignment]" id="jform_assignment">
 			<?php echo HTMLHelper::_('select.options', ModulesHelper::getAssignmentOptions($this->item->client_id), 'value', 'text', $this->item->assignment, true); ?>
diff --git a/administrator/components/com_modules/tmpl/module/edit_options.php b/administrator/components/com_modules/tmpl/module/edit_options.php
index b44725b60522e..f4828c5857815 100644
--- a/administrator/components/com_modules/tmpl/module/edit_options.php
+++ b/administrator/components/com_modules/tmpl/module/edit_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/tmpl/module/modal.php b/administrator/components/com_modules/tmpl/module/modal.php
index 6c72977178d62..e2f1598600f1e 100644
--- a/administrator/components/com_modules/tmpl/module/modal.php
+++ b/administrator/components/com_modules/tmpl/module/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/tmpl/modules/default.php b/administrator/components/com_modules/tmpl/modules/default.php
index 9edfedc147c03..1904e6e3d7ed5 100644
--- a/administrator/components/com_modules/tmpl/modules/default.php
+++ b/administrator/components/com_modules/tmpl/modules/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/tmpl/modules/default_batch_body.php b/administrator/components/com_modules/tmpl/modules/default_batch_body.php
index 2ccf347aefb5c..62b105e5d2828 100644
--- a/administrator/components/com_modules/tmpl/modules/default_batch_body.php
+++ b/administrator/components/com_modules/tmpl/modules/default_batch_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -33,7 +33,7 @@
 Text::script('JGLOBAL_SELECT_PRESS_TO_SELECT');
 
 Factory::getDocument()->getWebAssetManager()->enableAsset('choicesjs');
-HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);
+HTMLHelper::_('webcomponent', 'system/fields/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);
 
 ?>
 
@@ -41,24 +41,18 @@
 <div class="container">
 	<div class="row">
 		<?php if ($clientId != 1) : ?>
-            <div class="form-group col-md-6">
-                <div class="controls">
+			<div class="form-group col-md-6">
+				<div class="controls">
 					<?php echo LayoutHelper::render('joomla.html.batch.language', array()); ?>
-                </div>
-            </div>
+				</div>
+			</div>
 		<?php elseif ($clientId == 1 && ModuleHelper::isAdminMultilang()) : ?>
-            <div class="form-group col-md-6">
-                <div class="controls">
+			<div class="form-group col-md-6">
+				<div class="controls">
 					<?php echo LayoutHelper::render('joomla.html.batch.adminlanguage', array()); ?>
-                </div>
-            </div>
-		<?php endif; ?>
-
-        <div class="form-group col-md-6">
-			<div class="controls">
-				<?php echo LayoutHelper::render('joomla.html.batch.language', []); ?>
+				</div>
 			</div>
-		</div>
+		<?php endif; ?>
 		<div class="form-group col-md-6">
 			<div class="controls">
 				<?php echo LayoutHelper::render('joomla.html.batch.access', []); ?>
diff --git a/administrator/components/com_modules/tmpl/modules/default_batch_footer.php b/administrator/components/com_modules/tmpl/modules/default_batch_footer.php
index e6c7cac46e701..db42ddf3c86b5 100644
--- a/administrator/components/com_modules/tmpl/modules/default_batch_footer.php
+++ b/administrator/components/com_modules/tmpl/modules/default_batch_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -11,9 +11,9 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<a class="btn btn-secondary" type="button" onclick="document.getElementById('batch-position-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
+<button type="button" class="btn btn-secondary" onclick="document.getElementById('batch-position-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
 	<?php echo Text::_('JCANCEL'); ?>
-</a>
-<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('module.batch');">
+</button>
+<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('module.batch');">
 	<?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?>
-</button>
\ No newline at end of file
+</button>
diff --git a/administrator/components/com_modules/tmpl/modules/modal.php b/administrator/components/com_modules/tmpl/modules/modal.php
index d12a8a37f56ee..b46e33c6d1b13 100644
--- a/administrator/components/com_modules/tmpl/modules/modal.php
+++ b/administrator/components/com_modules/tmpl/modules/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -31,7 +31,7 @@
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $editor    = Factory::getApplication()->input->get('editor', '', 'cmd');
-$link      = 'index.php?option=com_modules&view=modules&layout=modal&tmpl=component&' . JSession::getFormToken() . '=1';
+$link      = 'index.php?option=com_modules&view=modules&layout=modal&tmpl=component&' . Session::getFormToken() . '=1';
 
 if (!empty($editor))
 {
@@ -91,8 +91,8 @@
 					<td class="text-center">
 						<span class="<?php echo $iconStates[$this->escape($item->published)]; ?>" aria-hidden="true"></span>
 					</td>
-					<th scope="row" class="has-context">
-						<a class="js-module-insert btn btn-sm btn-block btn-success" href="#" data-module="<?php echo $this->escape($item->module); ?>" data-title="<?php echo $this->escape($item->title); ?>" data-editor="<?php echo $this->escape($editor); ?>">
+					<td scope="row" class="has-context">
+						<a class="js-module-insert btn btn-sm btn-block btn-success" href="#" data-module="<?php echo $item->id; ?>" data-editor="<?php echo $this->escape($editor); ?>">
 							<?php echo $this->escape($item->title); ?>
 						</a>
 					</td>
diff --git a/administrator/components/com_modules/tmpl/select/default.php b/administrator/components/com_modules/tmpl/select/default.php
index ee7ea60c36151..f131de960d817 100644
--- a/administrator/components/com_modules/tmpl/select/default.php
+++ b/administrator/components/com_modules/tmpl/select/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/Controller/AjaxController.php b/administrator/components/com_newsfeeds/Controller/AjaxController.php
new file mode 100644
index 0000000000000..8e96e532a1647
--- /dev/null
+++ b/administrator/components/com_newsfeeds/Controller/AjaxController.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Newsfeeds\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Language\LanguageHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Response\JsonResponse;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Table\Table;
+
+/**
+ * The newsfeed controller for ajax requests
+ *
+ * @since  3.9.0
+ */
+class AjaxController extends BaseController
+{
+	/**
+	 * Method to fetch associations of a newsfeed
+	 *
+	 * The method assumes that the following http parameters are passed in an Ajax Get request:
+	 * token: the form token
+	 * assocId: the id of the newsfeed whose associations are to be returned
+	 * excludeLang: the association for this language is to be excluded
+	 *
+	 * @return  null
+	 *
+	 * @since  3.9.0
+	 */
+	public function fetchAssociations()
+	{
+		if (!Session::checkToken('get'))
+		{
+			echo new JsonResponse(null, Text::_('JINVALID_TOKEN'), true);
+		}
+		else
+		{
+			$assocId = $this->input->getInt('assocId', 0);
+
+			if ($assocId == 0)
+			{
+				echo new JsonResponse(null, Text::sprintf('JLIB_FORM_VALIDATE_FIELD_INVALID', 'assocId'), true);
+
+				return;
+			}
+
+			$excludeLang = $this->input->get('excludeLang', '', 'STRING');
+
+			$associations = Associations::getAssociations('com_newsfeeds', '#__newsfeeds', 'com_newsfeeds.item', (int) $assocId);
+
+			unset($associations[$excludeLang]);
+
+			// Add the title to each of the associated records
+			Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_newsfeeds/tables');
+			$newsfeedsTable = Table::getInstance('Newsfeed', 'NewsfeedsTable');
+
+			foreach ($associations as $lang => $association)
+			{
+				$newsfeedsTable->load($association->id);
+				$associations[$lang]->title = $newsfeedsTable->name;
+			}
+
+			$countContentLanguages = count(LanguageHelper::getContentLanguages(array(0, 1)));
+
+			if (count($associations) == 0)
+			{
+				$message = Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_NONE');
+			}
+			elseif ($countContentLanguages > count($associations) + 2)
+			{
+				$tags    = implode(', ', array_keys($associations));
+				$message = Text::sprintf('JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_SOME', $tags);
+			}
+			else
+			{
+				$message = Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_ALL');
+			}
+
+			echo new JsonResponse($associations, $message);
+		}
+	}
+}
diff --git a/administrator/components/com_newsfeeds/Controller/DisplayController.php b/administrator/components/com_newsfeeds/Controller/DisplayController.php
index c9085d8a9428b..0e8cc965910b2 100644
--- a/administrator/components/com_newsfeeds/Controller/DisplayController.php
+++ b/administrator/components/com_newsfeeds/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/Controller/NewsfeedController.php b/administrator/components/com_newsfeeds/Controller/NewsfeedController.php
index ac626dc29d8c4..2b56cadff42b7 100644
--- a/administrator/components/com_newsfeeds/Controller/NewsfeedController.php
+++ b/administrator/components/com_newsfeeds/Controller/NewsfeedController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,11 +11,8 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -105,7 +102,7 @@ protected function allowEdit($data = array(), $key = 'id')
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Set the model
 		$model = $this->getModel('Newsfeed', '', array());
diff --git a/administrator/components/com_newsfeeds/Controller/NewsfeedsController.php b/administrator/components/com_newsfeeds/Controller/NewsfeedsController.php
index b292b83b4d3d7..5dc2fa4077569 100644
--- a/administrator/components/com_newsfeeds/Controller/NewsfeedsController.php
+++ b/administrator/components/com_newsfeeds/Controller/NewsfeedsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/Extension/NewsfeedsComponent.php b/administrator/components/com_newsfeeds/Extension/NewsfeedsComponent.php
index 22bfef3087b28..8c30c95e38cad 100644
--- a/administrator/components/com_newsfeeds/Extension/NewsfeedsComponent.php
+++ b/administrator/components/com_newsfeeds/Extension/NewsfeedsComponent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/Field/Modal/NewsfeedField.php b/administrator/components/com_newsfeeds/Field/Modal/NewsfeedField.php
index bcd0b01d8c636..936bba72e6101 100644
--- a/administrator/components/com_newsfeeds/Field/Modal/NewsfeedField.php
+++ b/administrator/components/com_newsfeeds/Field/Modal/NewsfeedField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,6 +14,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Session\Session;
 
@@ -41,10 +42,13 @@ class NewsfeedField extends FormField
 	 */
 	protected function getInput()
 	{
-		$allowNew    = ((string) $this->element['new'] == 'true');
-		$allowEdit   = ((string) $this->element['edit'] == 'true');
-		$allowClear  = ((string) $this->element['clear'] != 'false');
-		$allowSelect = ((string) $this->element['select'] != 'false');
+		$allowNew       = ((string) $this->element['new'] == 'true');
+		$allowEdit      = ((string) $this->element['edit'] == 'true');
+		$allowClear     = ((string) $this->element['clear'] != 'false');
+		$allowSelect    = ((string) $this->element['select'] != 'false');
+		$allowPropagate = ((string) $this->element['propagate'] == 'true');
+
+		$languages = LanguageHelper::getContentLanguages(array(0, 1));
 
 		// Load language
 		Factory::getLanguage()->load('com_newsfeeds', JPATH_ADMINISTRATOR);
@@ -77,6 +81,8 @@ function jSelectNewsfeed_" . $this->id . "(id, title, object) {
 				"
 				);
 
+				Text::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED');
+
 				$scriptSelect[$this->id] = true;
 			}
 		}
@@ -135,55 +141,72 @@ function jSelectNewsfeed_" . $this->id . "(id, title, object) {
 		// Select newsfeed button
 		if ($allowSelect)
 		{
-			$html .= '<a'
-				. ' class="btn btn-primary hasTooltip' . ($value ? ' sr-only' : '') . '"'
+			$html .= '<button'
+				. ' class="btn btn-primary hasTooltip' . ($value ? ' hidden' : '') . '"'
 				. ' id="' . $this->id . '_select"'
 				. ' data-toggle="modal"'
-				. ' role="button"'
-				. ' href="#ModalSelect' . $modalId . '"'
+				. ' type="button"'
+				. ' data-target="#ModalSelect' . $modalId . '"'
 				. ' title="' . HTMLHelper::tooltipText('COM_NEWSFEEDS_CHANGE_FEED') . '">'
 				. '<span class="icon-file" aria-hidden="true"></span> ' . Text::_('JSELECT')
-				. '</a>';
+				. '</button>';
 		}
 
 		// New newsfeed button
 		if ($allowNew)
 		{
-			$html .= '<a'
-				. ' class="btn btn-secondary hasTooltip' . ($value ? ' sr-only' : '') . '"'
+			$html .= '<button'
+				. ' class="btn btn-secondary hasTooltip' . ($value ? ' hidden' : '') . '"'
 				. ' id="' . $this->id . '_new"'
 				. ' data-toggle="modal"'
-				. ' role="button"'
-				. ' href="#ModalNew' . $modalId . '"'
+				. ' type="button"'
+				. ' data-target="#ModalNew' . $modalId . '"'
 				. ' title="' . HTMLHelper::tooltipText('COM_NEWSFEEDS_NEW_NEWSFEED') . '">'
 				. '<span class="icon-new" aria-hidden="true"></span> ' . Text::_('JACTION_CREATE')
-				. '</a>';
+				. '</button>';
 		}
 
 		// Edit newsfeed button
 		if ($allowEdit)
 		{
-			$html .= '<a'
-				. ' class="btn btn-secondary hasTooltip' . ($value ? '' : ' sr-only') . '"'
+			$html .= '<button'
+				. ' class="btn btn-secondary hasTooltip' . ($value ? '' : ' hidden') . '"'
 				. ' id="' . $this->id . '_edit"'
 				. ' data-toggle="modal"'
-				. ' role="button"'
-				. ' href="#ModalEdit' . $modalId . '"'
+				. ' type="button"'
+				. ' data-target="#ModalEdit' . $modalId . '"'
 				. ' title="' . HTMLHelper::tooltipText('COM_NEWSFEEDS_EDIT_NEWSFEED') . '">'
 				. '<span class="icon-edit" aria-hidden="true"></span> ' . Text::_('JACTION_EDIT')
-				. '</a>';
+				. '</button>';
 		}
 
 		// Clear newsfeed button
 		if ($allowClear)
 		{
-			$html .= '<a'
-				. ' class="btn btn-secondary' . ($value ? '' : ' sr-only') . '"'
+			$html .= '<button'
+				. ' class="btn btn-secondary' . ($value ? '' : ' hidden') . '"'
 				. ' id="' . $this->id . '_clear"'
-				. ' href="#"'
+				. ' type="button"'
 				. ' onclick="window.processModalParent(\'' . $this->id . '\'); return false;">'
 				. '<span class="icon-remove" aria-hidden="true"></span>' . Text::_('JCLEAR')
-				. '</a>';
+				. '</button>';
+		}
+
+		// Propagate newsfeed button
+		if ($allowPropagate && count($languages) > 2)
+		{
+			// Strip off language tag at the end
+			$tagLength = (int) strlen($this->element['language']);
+			$callbackFunctionStem = substr("jSelectNewsfeed_" . $this->id, 0, -$tagLength);
+
+			$html .= '<a'
+			. ' class="btn hasTooltip' . ($value ? '' : ' hidden') . '"'
+			. ' id="' . $this->id . '_propagate"'
+			. ' href="#"'
+			. ' title="' . HtmlHelper::tooltipText('JGLOBAL_ASSOCIATIONS_PROPAGATE_TIP') . '"'
+			. ' onclick="Joomla.propagateAssociation(\'' . $this->id . '\', \'' . $callbackFunctionStem . '\');">'
+			. '<span class="icon-refresh" aria-hidden="true"></span>' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON')
+			. '</a>';
 		}
 
 		if ($allowSelect || $allowNew || $allowEdit || $allowClear)
diff --git a/administrator/components/com_newsfeeds/Field/NewsfeedsField.php b/administrator/components/com_newsfeeds/Field/NewsfeedsField.php
index d112300b737d0..85ce254b63874 100644
--- a/administrator/components/com_newsfeeds/Field/NewsfeedsField.php
+++ b/administrator/components/com_newsfeeds/Field/NewsfeedsField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,16 +12,14 @@
 defined('JPATH_BASE') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('list');
+use Joomla\CMS\Form\Field\ListField;
 
 /**
  * News Feed List field.
  *
  * @since  1.6
  */
-class NewsfeedsField extends \JFormFieldList
+class NewsfeedsField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/administrator/components/com_newsfeeds/Helper/AssociationsHelper.php b/administrator/components/com_newsfeeds/Helper/AssociationsHelper.php
index 3a2fb1634e05e..c1a450472c3ab 100644
--- a/administrator/components/com_newsfeeds/Helper/AssociationsHelper.php
+++ b/administrator/components/com_newsfeeds/Helper/AssociationsHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/Helper/NewsfeedsHelper.php b/administrator/components/com_newsfeeds/Helper/NewsfeedsHelper.php
index e4048ccccab46..e720d8106be9f 100644
--- a/administrator/components/com_newsfeeds/Helper/NewsfeedsHelper.php
+++ b/administrator/components/com_newsfeeds/Helper/NewsfeedsHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/Model/NewsfeedModel.php b/administrator/components/com_newsfeeds/Model/NewsfeedModel.php
index cc6ee9dce468a..7feb29271b83d 100644
--- a/administrator/components/com_newsfeeds/Model/NewsfeedModel.php
+++ b/administrator/components/com_newsfeeds/Model/NewsfeedModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -51,100 +51,6 @@ class NewsfeedModel extends AdminModel
 	 */
 	protected $text_prefix = 'COM_NEWSFEEDS';
 
-	/**
-	 * Batch copy items to a new category or current.
-	 *
-	 * @param   integer  $value     The new category.
-	 * @param   array    $pks       An array of row IDs.
-	 * @param   array    $contexts  An array of item contexts.
-	 *
-	 * @return  mixed  An array of new IDs on success, boolean false on failure.
-	 *
-	 * @since   1.7.0
-	 */
-	protected function batchCopy($value, $pks, $contexts)
-	{
-		$categoryId = (int) $value;
-
-		$newIds = array();
-
-		if (!parent::checkCategoryId($categoryId))
-		{
-			return false;
-		}
-
-		// Parent exists so we let's proceed
-		while (!empty($pks))
-		{
-			// Pop the first ID off the stack
-			$pk = array_shift($pks);
-
-			$this->table->reset();
-
-			// Check that the row actually exists
-			if (!$this->table->load($pk))
-			{
-				if ($error = $this->table->getError())
-				{
-					// Fatal error
-					$this->setError($error);
-
-					return false;
-				}
-				else
-				{
-					// Not fatal error
-					$this->setError(Text::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
-					continue;
-				}
-			}
-
-			// Alter the title & alias
-			$data = $this->generateNewTitle($categoryId, $this->table->alias, $this->table->name);
-			$this->table->name = $data['0'];
-			$this->table->alias = $data['1'];
-
-			// Reset the ID because we are making a copy
-			$this->table->id = 0;
-
-			// Unpublish because we are making a copy
-			$this->table->published = 0;
-
-			// New category ID
-			$this->table->catid = $categoryId;
-
-			// TODO: Deal with ordering?
-			// $this->table->ordering = 1;
-
-			// Check the row.
-			if (!$this->table->check())
-			{
-				$this->setError($this->table->getError());
-
-				return false;
-			}
-
-			// Store the row.
-			if (!$this->table->store())
-			{
-				$this->setError($this->table->getError());
-
-				return false;
-			}
-
-			// Get the new item ID
-			$newId = $this->table->get('id');
-
-			// Add the new ID to the array
-			$newIds[$pk] = $newId;
-		}
-
-		// Clean the cache
-		$this->cleanCache();
-
-		return $newIds;
-	}
-
 	/**
 	 * Method to test whether a record can be deleted.
 	 *
@@ -520,6 +426,7 @@ protected function preprocessForm(\JForm $form, $data, $group = 'content')
 					$field->addAttribute('new', 'true');
 					$field->addAttribute('edit', 'true');
 					$field->addAttribute('clear', 'true');
+					$field->addAttribute('propagate', 'true');
 				}
 
 				$form->load($addform, false);
diff --git a/administrator/components/com_newsfeeds/Model/NewsfeedsModel.php b/administrator/components/com_newsfeeds/Model/NewsfeedsModel.php
index faa33e2a8295b..53290295bd04d 100644
--- a/administrator/components/com_newsfeeds/Model/NewsfeedsModel.php
+++ b/administrator/components/com_newsfeeds/Model/NewsfeedsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -16,6 +16,7 @@
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\Utilities\ArrayHelper;
 
 /**
  * Methods supporting a list of newsfeed records.
@@ -287,8 +288,7 @@ protected function getListQuery()
 		}
 		elseif (is_array($tagId))
 		{
-			ArrayHelper::toInteger($tagId);
-			$tagId = implode(',', $tagId);
+			$tagId = implode(',', ArrayHelper::toInteger($tagId));
 
 			if (!empty($tagId))
 			{
diff --git a/administrator/components/com_newsfeeds/Service/HTML/AdministratorService.php b/administrator/components/com_newsfeeds/Service/HTML/AdministratorService.php
index 71cc0c0f9f496..34da73acda15f 100644
--- a/administrator/components/com_newsfeeds/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_newsfeeds/Service/HTML/AdministratorService.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/Table/NewsfeedTable.php b/administrator/components/com_newsfeeds/Table/NewsfeedTable.php
index 0192388e55fd9..eb1ea9eb72302 100644
--- a/administrator/components/com_newsfeeds/Table/NewsfeedTable.php
+++ b/administrator/components/com_newsfeeds/Table/NewsfeedTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/View/Newsfeed/HtmlView.php b/administrator/components/com_newsfeeds/View/Newsfeed/HtmlView.php
index b090f0cdb7aa7..e81cc022f5b6b 100644
--- a/administrator/components/com_newsfeeds/View/Newsfeed/HtmlView.php
+++ b/administrator/components/com_newsfeeds/View/Newsfeed/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,6 +14,7 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
+use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -114,7 +115,8 @@ protected function addToolbar()
 		// If not checked out, can save the item.
 		if (!$checkedOut && ($canDo->get('core.edit') || count($user->getAuthorisedCategories('com_newsfeeds', 'core.create')) > 0))
 		{
-			$toolbarButtons[] = ['apply', 'newsfeed.apply'];
+			ToolbarHelper::apply('newsfeed.apply');
+
 			$toolbarButtons[] = ['save', 'newsfeed.save'];
 		}
 
@@ -134,6 +136,11 @@ protected function addToolbar()
 			'btn-success'
 		);
 
+		if (!$isNew && Associations::isEnabled() && ComponentHelper::isEnabled('com_associations'))
+		{
+			ToolbarHelper::custom('newsfeed.editAssociations', 'contract', 'contract', 'JTOOLBAR_ASSOCIATIONS', false, false);
+		}
+
 		if (empty($this->item->id))
 		{
 			ToolbarHelper::cancel('newsfeed.cancel');
diff --git a/administrator/components/com_newsfeeds/View/Newsfeeds/HtmlView.php b/administrator/components/com_newsfeeds/View/Newsfeeds/HtmlView.php
index 39d59fa041324..789d3139be12f 100644
--- a/administrator/components/com_newsfeeds/View/Newsfeeds/HtmlView.php
+++ b/administrator/components/com_newsfeeds/View/Newsfeeds/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/helpers/newsfeeds.php b/administrator/components/com_newsfeeds/helpers/newsfeeds.php
index 307d828ef53f1..42bdd8e7f0ca2 100644
--- a/administrator/components/com_newsfeeds/helpers/newsfeeds.php
+++ b/administrator/components/com_newsfeeds/helpers/newsfeeds.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/newsfeeds.xml b/administrator/components/com_newsfeeds/newsfeeds.xml
index 649d514f4ac31..4b689e1111f80 100644
--- a/administrator/components/com_newsfeeds/newsfeeds.xml
+++ b/administrator/components/com_newsfeeds/newsfeeds.xml
@@ -3,7 +3,7 @@
 	<name>com_newsfeeds</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_newsfeeds/services/provider.php b/administrator/components/com_newsfeeds/services/provider.php
index a9f885bc8441f..e0fac178e5b69 100644
--- a/administrator/components/com_newsfeeds/services/provider.php
+++ b/administrator/components/com_newsfeeds/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php
index a8be9822cfa37..694c002fcc883 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_associations.php b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_associations.php
index cacce741995cb..76c4291e4bd5d 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_associations.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_display.php b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_display.php
index fc8a260fe6d7c..864e999ce270d 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_display.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_display.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_metadata.php b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_metadata.php
index 98fee78a09625..2f706c4de8834 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_metadata.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_params.php b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_params.php
index 1a437ade3e143..0c0e6c9e696e4 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_params.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_params.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeed/modal.php b/administrator/components/com_newsfeeds/tmpl/newsfeed/modal.php
index c90c7c24b5e72..e01dec7cdf052 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeed/modal.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeed/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_associations.php b/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_associations.php
index cacce741995cb..76c4291e4bd5d 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_associations.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_display.php b/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_display.php
index fc8a260fe6d7c..864e999ce270d 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_display.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_display.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_metadata.php b/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_metadata.php
index 98fee78a09625..2f706c4de8834 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_metadata.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_params.php b/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_params.php
index 4f5d69b49171e..6554471195c98 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_params.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_params.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
index f3a5d94eed6ea..23b627d0ad796 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default_batch_body.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default_batch_body.php
index 361e63fb7aaf7..b359cacc7ecd9 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default_batch_body.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default_batch_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default_batch_footer.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default_batch_footer.php
index b3b373753d9a0..4d93245455359 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default_batch_footer.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default_batch_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,9 +12,9 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<a class="btn btn-secondary" type="button" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value='';document.getElementById('batch-tag-id').value=''" data-dismiss="modal">
+<button type="button" class="btn btn-secondary" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value='';document.getElementById('batch-tag-id').value=''" data-dismiss="modal">
 	<?php echo Text::_('JCANCEL'); ?>
-</a>
-<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('newsfeed.batch');">
+</button>
+<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('newsfeed.batch');">
 	<?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?>
-</button>
\ No newline at end of file
+</button>
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
index d416df7be92d9..6331261351222 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/Controller/DisplayController.php b/administrator/components/com_plugins/Controller/DisplayController.php
index b81ddddcd4df2..9534282ee652a 100644
--- a/administrator/components/com_plugins/Controller/DisplayController.php
+++ b/administrator/components/com_plugins/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/Controller/PluginController.php b/administrator/components/com_plugins/Controller/PluginController.php
index 90af99ce4c421..3bce19703495b 100644
--- a/administrator/components/com_plugins/Controller/PluginController.php
+++ b/administrator/components/com_plugins/Controller/PluginController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Plugins\Administrator\Controller;
diff --git a/administrator/components/com_plugins/Controller/PluginsController.php b/administrator/components/com_plugins/Controller/PluginsController.php
index b2e8fcc0dddf9..a99d599e47919 100644
--- a/administrator/components/com_plugins/Controller/PluginsController.php
+++ b/administrator/components/com_plugins/Controller/PluginsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/Field/PluginTypeField.php b/administrator/components/com_plugins/Field/PluginTypeField.php
index bff637aeead76..af410da12e948 100644
--- a/administrator/components/com_plugins/Field/PluginTypeField.php
+++ b/administrator/components/com_plugins/Field/PluginTypeField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,17 +11,15 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\Component\Plugins\Administrator\Helper\PluginsHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Plugin Type field.
  *
  * @since  3.5
  */
-class PluginTypeField extends \JFormFieldList
+class PluginTypeField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/administrator/components/com_plugins/Field/PluginorderingField.php b/administrator/components/com_plugins/Field/PluginorderingField.php
index e6bc727f9e038..53453551b6913 100644
--- a/administrator/components/com_plugins/Field/PluginorderingField.php
+++ b/administrator/components/com_plugins/Field/PluginorderingField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/Field/pluginelement.php b/administrator/components/com_plugins/Field/pluginelement.php
new file mode 100644
index 0000000000000..bb8ccaaaef952
--- /dev/null
+++ b/administrator/components/com_plugins/Field/pluginelement.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_plugins
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('PluginsHelper', JPATH_ADMINISTRATOR . '/components/com_plugins/helpers/plugins.php');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Plugin Element field.
+ *
+ * @since  3.9.0
+ */
+class JFormFieldPluginElement extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	protected $type = 'PluginElement';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.9.0
+	 */
+	public function getOptions()
+	{
+		$options = PluginsHelper::elementOptions();
+
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/administrator/components/com_plugins/Helper/PluginsHelper.php b/administrator/components/com_plugins/Helper/PluginsHelper.php
index 8c3678bbe5da6..f140b6050a68a 100644
--- a/administrator/components/com_plugins/Helper/PluginsHelper.php
+++ b/administrator/components/com_plugins/Helper/PluginsHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -53,7 +53,7 @@ public static function publishedOptions()
 	}
 
 	/**
-	 * Returns an array of standard published state filter options.
+	 * Returns a list of folders filter options.
 	 *
 	 * @return  string    The HTML code for the select tag
 	 */
@@ -80,6 +80,33 @@ public static function folderOptions()
 		return $options;
 	}
 
+	/**
+	 * Returns a list of elements filter options.
+	 *
+	 * @return  string    The HTML code for the select tag
+	 */
+	public static function elementOptions()
+	{
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true)
+			->select('DISTINCT(element) AS value, element AS text')
+			->from('#__extensions')
+			->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
+			->order('element');
+		$db->setQuery($query);
+
+		try
+		{
+			$options = $db->loadObjectList();
+		}
+		catch (\RuntimeException $e)
+		{
+			Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+		}
+
+		return $options;
+	}
+
 	/**
 	 * Parse the template file.
 	 *
diff --git a/administrator/components/com_plugins/Model/PluginModel.php b/administrator/components/com_plugins/Model/PluginModel.php
index 48512b7aa1675..91b256ecedae6 100644
--- a/administrator/components/com_plugins/Model/PluginModel.php
+++ b/administrator/components/com_plugins/Model/PluginModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/Model/PluginsModel.php b/administrator/components/com_plugins/Model/PluginsModel.php
index 3048f39160cf6..15d7575ebf0b5 100644
--- a/administrator/components/com_plugins/Model/PluginsModel.php
+++ b/administrator/components/com_plugins/Model/PluginsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Plugins\Administrator\Model;
@@ -95,6 +95,7 @@ protected function getStoreId($id = '')
 		$id .= ':' . $this->getState('filter.access');
 		$id .= ':' . $this->getState('filter.enabled');
 		$id .= ':' . $this->getState('filter.folder');
+		$id .= ':' . $this->getState('filter.element');
 
 		return parent::getStoreId($id);
 	}
@@ -253,6 +254,12 @@ protected function getListQuery()
 			$query->where('a.folder = ' . $db->quote($folder));
 		}
 
+		// Filter by element.
+		if ($element = $this->getState('filter.element'))
+		{
+			$query->where('a.element = ' . $db->quote($element));
+		}
+
 		// Filter by search in name or id.
 		$search = $this->getState('filter.search');
 
diff --git a/administrator/components/com_plugins/View/Plugin/HtmlView.php b/administrator/components/com_plugins/View/Plugin/HtmlView.php
index 5864683c48296..3d2066085c45d 100644
--- a/administrator/components/com_plugins/View/Plugin/HtmlView.php
+++ b/administrator/components/com_plugins/View/Plugin/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -86,13 +86,10 @@ protected function addToolbar()
 		// If not checked out, can save the item.
 		if ($canDo->get('core.edit'))
 		{
-			ToolbarHelper::saveGroup(
-				[
-					['apply', 'plugin.apply'],
-					['save', 'plugin.save']
-				],
-				'btn-success'
-			);
+			ToolbarHelper::apply('plugin.apply');
+
+			ToolbarHelper::save('plugin.save');
+
 		}
 
 		ToolbarHelper::cancel('plugin.cancel', 'JTOOLBAR_CLOSE');
diff --git a/administrator/components/com_plugins/View/Plugins/HtmlView.php b/administrator/components/com_plugins/View/Plugins/HtmlView.php
index ede2caa235305..081224ed3d610 100644
--- a/administrator/components/com_plugins/View/Plugins/HtmlView.php
+++ b/administrator/components/com_plugins/View/Plugins/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -114,8 +114,8 @@ protected function addToolbar()
 
 		if ($canDo->get('core.edit.state'))
 		{
-			$childBar->publish('plugins.publish')->listCheck(true);
-			$childBar->unpublish('plugins.unpublish')->listCheck(true);
+			$childBar->publish('plugins.publish', 'JTOOLBAR_ENABLE')->listCheck(true);
+			$childBar->unpublish('plugins.unpublish', 'JTOOLBAR_DISABLE')->listCheck(true);
 			$childBar->checkin('plugins.checkin');
 		}
 
diff --git a/administrator/components/com_plugins/forms/filter_plugins.xml b/administrator/components/com_plugins/forms/filter_plugins.xml
index 941b783a8ea12..554a2bf75ae41 100644
--- a/administrator/components/com_plugins/forms/filter_plugins.xml
+++ b/administrator/components/com_plugins/forms/filter_plugins.xml
@@ -27,6 +27,14 @@
 			<option value="">COM_PLUGINS_OPTION_FOLDER</option>
 		</field>
 
+		<field
+			name="element"
+			type="pluginelement"
+			onchange="this.form.submit();"
+		>
+			<option value="">COM_PLUGINS_OPTION_ELEMENT</option>
+		</field>
+
 		<field
 			name="access"
 			type="accesslevel"
diff --git a/administrator/components/com_plugins/forms/plugin.xml b/administrator/components/com_plugins/forms/plugin.xml
index 3e592fa4072f9..3c1d316ba542d 100644
--- a/administrator/components/com_plugins/forms/plugin.xml
+++ b/administrator/components/com_plugins/forms/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<form addfieldprefix="Joomla\Component\Content\Administrator\Field">
+<form addfieldprefix="Joomla\Component\Plugins\Administrator\Field">
 	<fieldset>
 		<field
 			name="extension_id"
diff --git a/administrator/components/com_plugins/helpers/plugins.php b/administrator/components/com_plugins/helpers/plugins.php
index 9674b37609db7..f93a6d73e4e61 100644
--- a/administrator/components/com_plugins/helpers/plugins.php
+++ b/administrator/components/com_plugins/helpers/plugins.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/plugins.xml b/administrator/components/com_plugins/plugins.xml
index f41bbfbe42828..f08585e0605dd 100644
--- a/administrator/components/com_plugins/plugins.xml
+++ b/administrator/components/com_plugins/plugins.xml
@@ -3,7 +3,7 @@
 	<name>com_plugins</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_plugins/services/provider.php b/administrator/components/com_plugins/services/provider.php
index 1cd160b23cbbd..234907ffc3a81 100644
--- a/administrator/components/com_plugins/services/provider.php
+++ b/administrator/components/com_plugins/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/tmpl/plugin/edit.php b/administrator/components/com_plugins/tmpl/plugin/edit.php
index 87f65a299278f..69a387ae9d4f8 100644
--- a/administrator/components/com_plugins/tmpl/plugin/edit.php
+++ b/administrator/components/com_plugins/tmpl/plugin/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -88,7 +88,7 @@
 							<?php if ($long_description) : ?>
 							<?php // @todo Remove jQuery ?>
 								<p class="readmore">
-									<a href="#" onclick="jQuery('.nav-tabs a[href=\'#description\']').tab('show');">
+									<a href="#" onclick="document.querySelector('#tab-description').click();">
 										<?php echo Text::_('JGLOBAL_SHOW_FULL_DESCRIPTION'); ?>
 									</a>
 								</p>
diff --git a/administrator/components/com_plugins/tmpl/plugin/edit_options.php b/administrator/components/com_plugins/tmpl/plugin/edit_options.php
index 78166b2c1e4c3..4a1b8e73b7192 100644
--- a/administrator/components/com_plugins/tmpl/plugin/edit_options.php
+++ b/administrator/components/com_plugins/tmpl/plugin/edit_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/tmpl/plugin/modal.php b/administrator/components/com_plugins/tmpl/plugin/modal.php
index f288727af53c3..14c718f6954ab 100644
--- a/administrator/components/com_plugins/tmpl/plugin/modal.php
+++ b/administrator/components/com_plugins/tmpl/plugin/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/tmpl/plugins/default.php b/administrator/components/com_plugins/tmpl/plugins/default.php
index 8dbc25063a2b1..a96300c9b766b 100644
--- a/administrator/components/com_plugins/tmpl/plugins/default.php
+++ b/administrator/components/com_plugins/tmpl/plugins/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_postinstall/Controller/DisplayController.php b/administrator/components/com_postinstall/Controller/DisplayController.php
index f0e3e2a486a65..6222997a2ba8c 100644
--- a/administrator/components/com_postinstall/Controller/DisplayController.php
+++ b/administrator/components/com_postinstall/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_postinstall
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_postinstall/Controller/MessageController.php b/administrator/components/com_postinstall/Controller/MessageController.php
index 4c47d74633abc..6323a39872636 100644
--- a/administrator/components/com_postinstall/Controller/MessageController.php
+++ b/administrator/components/com_postinstall/Controller/MessageController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_postinstall
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_postinstall/Helper/PostinstallHelper.php b/administrator/components/com_postinstall/Helper/PostinstallHelper.php
index 45eaad8d1b83a..9e1c83b1f8eea 100644
--- a/administrator/components/com_postinstall/Helper/PostinstallHelper.php
+++ b/administrator/components/com_postinstall/Helper/PostinstallHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_postinstall
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_postinstall/Model/MessagesModel.php b/administrator/components/com_postinstall/Model/MessagesModel.php
index b08486114c685..b775e4847d5cd 100644
--- a/administrator/components/com_postinstall/Model/MessagesModel.php
+++ b/administrator/components/com_postinstall/Model/MessagesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_postinstall
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_postinstall/View/Messages/HtmlView.php b/administrator/components/com_postinstall/View/Messages/HtmlView.php
index d506ee014bd65..f8eecb1bd4dba 100644
--- a/administrator/components/com_postinstall/View/Messages/HtmlView.php
+++ b/administrator/components/com_postinstall/View/Messages/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_postinstall
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_postinstall/postinstall.xml b/administrator/components/com_postinstall/postinstall.xml
index 09702fb5b3e6f..87ccb3c7f7c01 100644
--- a/administrator/components/com_postinstall/postinstall.xml
+++ b/administrator/components/com_postinstall/postinstall.xml
@@ -3,7 +3,7 @@
 	<name>com_postinstall</name>
 	<author>Joomla! Project</author>
 	<creationDate>September 2013</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_postinstall/services/provider.php b/administrator/components/com_postinstall/services/provider.php
index 0f392e597b5fb..4b36712fcdf1e 100644
--- a/administrator/components/com_postinstall/services/provider.php
+++ b/administrator/components/com_postinstall/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_postinstall
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_postinstall/tmpl/messages/default.php b/administrator/components/com_postinstall/tmpl/messages/default.php
index d51d0ff0232ce..957e7275790d2 100644
--- a/administrator/components/com_postinstall/tmpl/messages/default.php
+++ b/administrator/components/com_postinstall/tmpl/messages/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_postinstall
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_privacy/config.xml b/administrator/components/com_privacy/config.xml
new file mode 100644
index 0000000000000..833d1a2834a2b
--- /dev/null
+++ b/administrator/components/com_privacy/config.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="privacy"
+		label="COM_PRIVACY_OPTION_LABEL"
+	>
+
+		<field
+			name="notify"
+			type="integer"
+			label="COM_PRIVACY_NOTIFY_LABEL"
+			description="COM_PRIVACY_NOTIFY_DESC"
+			first="1"
+			last="29"
+			step="1"
+			default="14"
+			filter="int"
+			validate="number"
+		/>
+
+    </fieldset>
+</config>
diff --git a/administrator/components/com_privacy/controller.php b/administrator/components/com_privacy/controller.php
new file mode 100644
index 0000000000000..0c902d65b42b0
--- /dev/null
+++ b/administrator/components/com_privacy/controller.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Response\JsonResponse;
+use Joomla\CMS\Session\Session;
+
+/**
+ * Privacy Controller
+ *
+ * @since  3.9.0
+ */
+class PrivacyController extends JControllerLegacy
+{
+	/**
+	 * The default view.
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	protected $default_view = 'dashboard';
+
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  $this
+	 *
+	 * @since   3.9.0
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		JLoader::register('PrivacyHelper', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/privacy.php');
+
+		// Get the document object.
+		$document = JFactory::getDocument();
+
+		// Set the default view name and format from the Request.
+		$vName   = $this->input->get('view', $this->default_view);
+		$vFormat = $document->getType();
+		$lName   = $this->input->get('layout', 'default', 'string');
+
+		// Get and render the view.
+		if ($view = $this->getView($vName, $vFormat))
+		{
+			$model = $this->getModel($vName);
+			$view->setModel($model, true);
+
+			// For the dashboard view, we need to also push the requests model into the view
+			if ($vName === 'dashboard')
+			{
+				$requestsModel = $this->getModel('Requests');
+
+				$view->setModel($requestsModel, false);
+			}
+
+			if ($vName === 'request')
+			{
+				// For the default layout, we need to also push the action logs model into the view
+				if ($lName === 'default')
+				{
+					JLoader::register('ActionlogsHelper', JPATH_ADMINISTRATOR . '/components/com_actionlogs/helpers/actionlogs.php');
+					JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_actionlogs/models', 'ActionlogsModel');
+
+					$logsModel = $this->getModel('Actionlogs', 'ActionlogsModel');
+
+					// Set default ordering for the context
+					$logsModel->setState('list.fullordering', 'a.log_date DESC');
+
+					// And push the model into the view
+					$view->setModel($logsModel, false);
+				}
+
+				// For the edit layout, if mail sending is disabled then redirect back to the list view as the form is unusable in this state
+				if ($lName === 'edit' && !JFactory::getConfig()->get('mailonline', 1))
+				{
+					$this->setRedirect(
+						JRoute::_('index.php?option=com_privacy&view=requests', false),
+						JText::_('COM_PRIVACY_WARNING_CANNOT_CREATE_REQUEST_WHEN_SENDMAIL_DISABLED'),
+						'warning'
+					);
+
+					return $this;
+				}
+			}
+
+			$view->setLayout($lName);
+
+			// Push document object into the view.
+			$view->document = $document;
+
+			// Load the submenu.
+			PrivacyHelper::addSubmenu($this->input->get('view', $this->default_view));
+
+			$view->display();
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Fetch and report number urgent privacy requests in JSON format, for AJAX requests
+	 *
+	 * @return void
+	 *
+	 * @since 3.9.0
+	 */
+	public function getNumberUrgentRequests()
+	{
+		$app = Factory::getApplication();
+
+		// Check for a valid token. If invalid, send a 403 with the error message.
+		if (!Session::checkToken('get'))
+		{
+			$app->setHeader('status', 403, true);
+			$app->sendHeaders();
+			echo new JsonResponse(new \Exception(Text::_('JINVALID_TOKEN'), 403));
+			$app->close();
+		}
+
+		/** @var PrivacyModelRequests $model */
+		$model                = $this->getModel('requests');
+		$numberUrgentRequests = $model->getNumberUrgentRequests();
+
+		echo new JResponseJson(array('number_urgent_requests' => $numberUrgentRequests));
+
+		$app->close();
+	}
+}
diff --git a/administrator/components/com_privacy/controllers/consents.php b/administrator/components/com_privacy/controllers/consents.php
new file mode 100644
index 0000000000000..be31a6579ab50
--- /dev/null
+++ b/administrator/components/com_privacy/controllers/consents.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Consents management controller class.
+ *
+ * @since  3.9.0
+ */
+class PrivacyControllerConsents extends JControllerForm
+{
+	/**
+	 * Method to invalidate specific consents.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function invalidate($key = null, $urlVar = null)
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$ids    = $this->input->get('cid', array(), 'array');
+
+		if (empty($ids))
+		{
+			$this->setError(JText::_('JERROR_NO_ITEMS_SELECTED'));
+		}
+		else
+		{
+			// Get the model.
+			/** @var PrivacyModelConsents $model */
+			$model = $this->getModel();
+
+			// Publish the items.
+			if (!$model->invalidate($ids))
+			{
+				$this->setError($model->getError());
+			}
+
+			$message = JText::plural('COM_PRIVACY_N_CONSENTS_INVALIDATED', count($ids));
+		}
+
+		$this->setRedirect(JRoute::_('index.php?option=com_privacy&view=consents', false), $message);
+	}
+
+	/**
+	 * Method to invalidate all consents of a specific subject.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function invalidateAll()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$filters = $this->input->get('filter', array(), 'array');
+
+		if (isset($filters['subject']) && $filters['subject'] != '')
+		{
+			$subject = $filters['subject'];
+		}
+		else
+		{
+			$this->setError(JText::_('JERROR_NO_ITEMS_SELECTED'));
+		}
+
+		// Get the model.
+		/** @var PrivacyModelConsents $model */
+		$model = $this->getModel();
+
+		// Publish the items.
+		if (!$model->invalidateAll($subject))
+		{
+			$this->setError($model->getError());
+		}
+
+		$message = JText::_('COM_PRIVACY_CONSENTS_INVALIDATED_ALL');
+
+		$this->setRedirect(JRoute::_('index.php?option=com_privacy&view=consents', false), $message);
+	}
+}
diff --git a/administrator/components/com_privacy/controllers/request.php b/administrator/components/com_privacy/controllers/request.php
new file mode 100644
index 0000000000000..2857ed40d2619
--- /dev/null
+++ b/administrator/components/com_privacy/controllers/request.php
@@ -0,0 +1,395 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Request management controller class.
+ *
+ * @since  3.9.0
+ */
+class PrivacyControllerRequest extends JControllerForm
+{
+	/**
+	 * Method to complete a request.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function complete($key = null, $urlVar = null)
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		/** @var PrivacyModelRequest $model */
+		$model = $this->getModel();
+
+		/** @var PrivacyTableRequest $table */
+		$table = $model->getTable();
+
+		// Determine the name of the primary key for the data.
+		if (empty($key))
+		{
+			$key = $table->getKeyName();
+		}
+
+		// To avoid data collisions the urlVar may be different from the primary key.
+		if (empty($urlVar))
+		{
+			$urlVar = $key;
+		}
+
+		$recordId = $this->input->getInt($urlVar);
+
+		$item = $model->getItem($recordId);
+
+		// Ensure this record can transition to the requested state
+		if (!$this->canTransition($item, '2'))
+		{
+			$this->setError(\JText::_('COM_PRIVACY_ERROR_COMPLETE_TRANSITION_NOT_PERMITTED'));
+			$this->setMessage($this->getError(), 'error');
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=com_privacy&view=request&id=' . $recordId, false
+				)
+			);
+
+			return false;
+		}
+
+		// Build the data array for the update
+		$data = array(
+			$key     => $recordId,
+			'status' => '2',
+		);
+
+		// Access check.
+		if (!$this->allowSave($data, $key))
+		{
+			$this->setError(\JText::_('JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED'));
+			$this->setMessage($this->getError(), 'error');
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=com_privacy&view=request&id=' . $recordId, false
+				)
+			);
+
+			return false;
+		}
+
+		// Attempt to save the data.
+		if (!$model->save($data))
+		{
+			// Redirect back to the edit screen.
+			$this->setError(\JText::sprintf('JLIB_APPLICATION_ERROR_SAVE_FAILED', $model->getError()));
+			$this->setMessage($this->getError(), 'error');
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=com_privacy&view=request&id=' . $recordId, false
+				)
+			);
+
+			return false;
+		}
+
+		// Log the request completed
+		$model->logRequestCompleted($recordId);
+
+		$this->setMessage(\JText::_('COM_PRIVACY_REQUEST_COMPLETED'));
+
+		$url = 'index.php?option=com_privacy&view=requests';
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+
+		if (!is_null($return) && \JUri::isInternal(base64_decode($return)))
+		{
+			$url = base64_decode($return);
+		}
+
+		// Redirect to the list screen.
+		$this->setRedirect(\JRoute::_($url, false));
+
+		return true;
+	}
+
+	/**
+	 * Method to email the data export for a request.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function emailexport()
+	{
+		/** @var PrivacyModelExport $model */
+		$model = $this->getModel('Export');
+
+		$recordId = $this->input->getUint('id');
+
+		if (!$model->emailDataExport($recordId))
+		{
+			// Redirect back to the edit screen.
+			$this->setError(\JText::sprintf('COM_PRIVACY_ERROR_EXPORT_EMAIL_FAILED', $model->getError()));
+			$this->setMessage($this->getError(), 'error');
+		}
+		else
+		{
+			$this->setMessage(\JText::_('COM_PRIVACY_EXPORT_EMAILED'));
+		}
+
+		$url = 'index.php?option=com_privacy&view=requests';
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+
+		if (!is_null($return) && \JUri::isInternal(base64_decode($return)))
+		{
+			$url = base64_decode($return);
+		}
+
+		// Redirect to the list screen.
+		$this->setRedirect(\JRoute::_($url, false));
+
+		return true;
+	}
+
+	/**
+	 * Method to invalidate a request.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function invalidate($key = null, $urlVar = null)
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		/** @var PrivacyModelRequest $model */
+		$model = $this->getModel();
+
+		/** @var PrivacyTableRequest $table */
+		$table = $model->getTable();
+
+		// Determine the name of the primary key for the data.
+		if (empty($key))
+		{
+			$key = $table->getKeyName();
+		}
+
+		// To avoid data collisions the urlVar may be different from the primary key.
+		if (empty($urlVar))
+		{
+			$urlVar = $key;
+		}
+
+		$recordId = $this->input->getInt($urlVar);
+
+		$item = $model->getItem($recordId);
+
+		// Ensure this record can transition to the requested state
+		if (!$this->canTransition($item, '-1'))
+		{
+			$this->setError(\JText::_('COM_PRIVACY_ERROR_INVALID_TRANSITION_NOT_PERMITTED'));
+			$this->setMessage($this->getError(), 'error');
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=com_privacy&view=request&id=' . $recordId, false
+				)
+			);
+
+			return false;
+		}
+
+		// Build the data array for the update
+		$data = array(
+			$key     => $recordId,
+			'status' => '-1',
+		);
+
+		// Access check.
+		if (!$this->allowSave($data, $key))
+		{
+			$this->setError(\JText::_('JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED'));
+			$this->setMessage($this->getError(), 'error');
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=com_privacy&view=request&id=' . $recordId, false
+				)
+			);
+
+			return false;
+		}
+
+		// Attempt to save the data.
+		if (!$model->save($data))
+		{
+			// Redirect back to the edit screen.
+			$this->setError(\JText::sprintf('JLIB_APPLICATION_ERROR_SAVE_FAILED', $model->getError()));
+			$this->setMessage($this->getError(), 'error');
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=com_privacy&view=request&id=' . $recordId, false
+				)
+			);
+
+			return false;
+		}
+
+		// Log the request invalidated
+		$model->logRequestInvalidated($recordId);
+
+		$this->setMessage(\JText::_('COM_PRIVACY_REQUEST_INVALIDATED'));
+
+		$url = 'index.php?option=com_privacy&view=requests';
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+
+		if (!is_null($return) && \JUri::isInternal(base64_decode($return)))
+		{
+			$url = base64_decode($return);
+		}
+
+		// Redirect to the list screen.
+		$this->setRedirect(\JRoute::_($url, false));
+
+		return true;
+	}
+
+	/**
+	 * Method to remove the user data for a privacy remove request.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function remove()
+	{
+		/** @var PrivacyModelRemove $model */
+		$model = $this->getModel('Remove');
+
+		$recordId = $this->input->getUint('id');
+
+		if (!$model->removeDataForRequest($recordId))
+		{
+			// Redirect back to the edit screen.
+			$this->setError(\JText::sprintf('COM_PRIVACY_ERROR_REMOVE_DATA_FAILED', $model->getError()));
+			$this->setMessage($this->getError(), 'error');
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=com_privacy&view=request&id=' . $recordId, false
+				)
+			);
+
+			return false;
+		}
+
+		$this->setMessage(\JText::_('COM_PRIVACY_DATA_REMOVED'));
+
+		$url = 'index.php?option=com_privacy&view=requests';
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+
+		if (!is_null($return) && \JUri::isInternal(base64_decode($return)))
+		{
+			$url = base64_decode($return);
+		}
+
+		// Redirect to the list screen.
+		$this->setRedirect(\JRoute::_($url, false));
+
+		return true;
+	}
+
+	/**
+	 * Function that allows child controller access to model data after the data has been saved.
+	 *
+	 * @param   \JModelLegacy  $model      The data model object.
+	 * @param   array          $validData  The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function postSaveHook(\JModelLegacy $model, $validData = array())
+	{
+		// This hook only processes new items
+		if (!$model->getState($model->getName() . '.new', false))
+		{
+			return;
+		}
+
+		if (!$model->logRequestCreated($model->getState($model->getName() . '.id')))
+		{
+			if ($error = $model->getError())
+			{
+				JFactory::getApplication()->enqueueMessage($error, 'warning');
+			}
+		}
+
+		if (!$model->notifyUserAdminCreatedRequest($model->getState($model->getName() . '.id')))
+		{
+			if ($error = $model->getError())
+			{
+				JFactory::getApplication()->enqueueMessage($error, 'warning');
+			}
+		}
+		else
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('COM_PRIVACY_MSG_CONFIRM_EMAIL_SENT_TO_USER'));
+		}
+	}
+
+	/**
+	 * Method to determine if an item can transition to the specified status.
+	 *
+	 * @param   object  $item       The item being updated.
+	 * @param   string  $newStatus  The new status of the item.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	private function canTransition($item, $newStatus)
+	{
+		switch ($item->status)
+		{
+			case '0':
+				// A pending item can only move to invalid through this controller due to the requirement for a user to confirm the request
+				return $newStatus === '-1';
+
+			case '1':
+				// A confirmed item can be marked completed or invalid
+				return in_array($newStatus, array('-1', '2'), true);
+
+			// An item which is already in an invalid or complete state cannot transition, likewise if we don't know the state don't change anything
+			case '-1':
+			case '2':
+			default:
+				return false;
+		}
+	}
+}
diff --git a/administrator/components/com_privacy/controllers/request.xml.php b/administrator/components/com_privacy/controllers/request.xml.php
new file mode 100644
index 0000000000000..ca6da52cb4994
--- /dev/null
+++ b/administrator/components/com_privacy/controllers/request.xml.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Request management controller class.
+ *
+ * @since  3.9.0
+ */
+class PrivacyControllerRequest extends JControllerLegacy
+{
+	/**
+	 * Method to export the data for a request.
+	 *
+	 * @return  $this
+	 *
+	 * @since   3.9.0
+	 */
+	public function export()
+	{
+		$this->input->set('view', 'export');
+
+		return $this->display();
+	}
+}
diff --git a/administrator/components/com_privacy/controllers/requests.php b/administrator/components/com_privacy/controllers/requests.php
new file mode 100644
index 0000000000000..abcc7f38eece0
--- /dev/null
+++ b/administrator/components/com_privacy/controllers/requests.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Requests management controller class.
+ *
+ * @since  3.9.0
+ */
+class PrivacyControllerRequests extends JControllerAdmin
+{
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy|boolean  Model object on success; otherwise false on failure.
+	 *
+	 * @since   3.9.0
+	 */
+	public function getModel($name = 'Request', $prefix = 'PrivacyModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}
diff --git a/administrator/components/com_privacy/helpers/export/domain.php b/administrator/components/com_privacy/helpers/export/domain.php
new file mode 100644
index 0000000000000..198d896611d45
--- /dev/null
+++ b/administrator/components/com_privacy/helpers/export/domain.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('PrivacyExportItem', __DIR__ . '/item.php');
+
+/**
+ * Data object representing all data contained in a domain.
+ *
+ * A domain is typically a single database table and the items within the domain are separate rows from the table.
+ *
+ * @since  3.9.0
+ */
+class PrivacyExportDomain
+{
+	/**
+	 * The name of this domain
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	public $name;
+
+	/**
+	 * A short description of the data in this domain
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	public $description;
+
+	/**
+	 * The items belonging to this domain
+	 *
+	 * @var    PrivacyExportItem[]
+	 * @since  3.9.0
+	 */
+	protected $items = array();
+
+	/**
+	 * Add an item to the domain
+	 *
+	 * @param   PrivacyExportItem  $item  The item to add
+	 *
+	 * @return  void
+	 *
+	 * @since  3.9.0
+	 */
+	public function addItem(PrivacyExportItem $item)
+	{
+		$this->items[] = $item;
+	}
+
+	/**
+	 * Get the domain's items
+	 *
+	 * @return  PrivacyExportItem[]
+	 *
+	 * @since  3.9.0
+	 */
+	public function getItems()
+	{
+		return $this->items;
+	}
+}
diff --git a/administrator/components/com_privacy/helpers/export/field.php b/administrator/components/com_privacy/helpers/export/field.php
new file mode 100644
index 0000000000000..9d020736bf871
--- /dev/null
+++ b/administrator/components/com_privacy/helpers/export/field.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Data object representing a field within an item.
+ *
+ * @since  3.9.0
+ */
+class PrivacyExportField
+{
+	/**
+	 * The name of this field
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	public $name;
+
+	/**
+	 * The field's value
+	 *
+	 * @var    mixed
+	 * @since  3.9.0
+	 */
+	public $value;
+}
diff --git a/administrator/components/com_privacy/helpers/export/item.php b/administrator/components/com_privacy/helpers/export/item.php
new file mode 100644
index 0000000000000..e1f94cf8aba59
--- /dev/null
+++ b/administrator/components/com_privacy/helpers/export/item.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('PrivacyExportField', __DIR__ . '/field.php');
+
+/**
+ * Data object representing a single item within a domain.
+ *
+ * An item is typically a single row from a database table.
+ *
+ * @since  3.9.0
+ */
+class PrivacyExportItem
+{
+	/**
+	 * The primary identifier of this item, typically the primary key for a database row.
+	 *
+	 * @var    integer
+	 * @since  3.9.0
+	 */
+	public $id;
+
+	/**
+	 * The fields belonging to this item
+	 *
+	 * @var    PrivacyExportField[]
+	 * @since  3.9.0
+	 */
+	protected $fields = array();
+
+	/**
+	 * Add a field to the item
+	 *
+	 * @param   PrivacyExportField  $field  The field to add
+	 *
+	 * @return  void
+	 *
+	 * @since  3.9.0
+	 */
+	public function addField(PrivacyExportField $field)
+	{
+		$this->fields[] = $field;
+	}
+
+	/**
+	 * Get the item's fields
+	 *
+	 * @return  PrivacyExportField[]
+	 *
+	 * @since  3.9.0
+	 */
+	public function getFields()
+	{
+		return $this->fields;
+	}
+}
diff --git a/administrator/components/com_privacy/helpers/html/helper.php b/administrator/components/com_privacy/helpers/html/helper.php
new file mode 100644
index 0000000000000..2cac7f9e35c0c
--- /dev/null
+++ b/administrator/components/com_privacy/helpers/html/helper.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Privacy component HTML helper.
+ *
+ * @since  3.9.0
+ */
+class PrivacyHtmlHelper
+{
+	/**
+	 * Render a status label
+	 *
+	 * @param   integer  $status  The item status
+	 *
+	 * @return  string
+	 *
+	 * @since   3.9.0
+	 */
+	public static function statusLabel($status)
+	{
+		switch ($status)
+		{
+			case 2:
+				return '<span class="label label-success">' . JText::_('COM_PRIVACY_STATUS_COMPLETED') . '</span>';
+
+			case 1:
+				return '<span class="label label-info">' . JText::_('COM_PRIVACY_STATUS_CONFIRMED') . '</span>';
+
+			case -1:
+				return '<span class="label label-important">' . JText::_('COM_PRIVACY_STATUS_INVALID') . '</span>';
+
+			default:
+			case 0:
+				return '<span class="label label-warning">' . JText::_('COM_PRIVACY_STATUS_PENDING') . '</span>';
+		}
+	}
+}
diff --git a/administrator/components/com_privacy/helpers/plugin.php b/administrator/components/com_privacy/helpers/plugin.php
new file mode 100644
index 0000000000000..d10f34d216f2b
--- /dev/null
+++ b/administrator/components/com_privacy/helpers/plugin.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('PrivacyExportDomain', __DIR__ . '/export/domain.php');
+JLoader::register('PrivacyExportField', __DIR__ . '/export/field.php');
+JLoader::register('PrivacyExportItem', __DIR__ . '/export/item.php');
+JLoader::register('FieldsHelper', JPATH_ADMINISTRATOR . '/components/com_fields/helpers/fields.php');
+
+/**
+ * Base class for privacy plugins
+ *
+ * @since  3.9.0
+ */
+abstract class PrivacyPlugin extends JPlugin
+{
+	/**
+	 * Database object
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.9.0
+	 */
+	protected $db;
+
+	/**
+	 * Affects constructor behaviour. If true, language files will be loaded automatically.
+	 *
+	 * @var    boolean
+	 * @since  3.9.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Create a new domain object
+	 *
+	 * @param   string  $name         The domain's name
+	 * @param   string  $description  The domain's description
+	 *
+	 * @return  PrivacyExportDomain
+	 *
+	 * @since   3.9.0
+	 */
+	protected function createDomain($name, $description = '')
+	{
+		$domain              = new PrivacyExportDomain;
+		$domain->name        = $name;
+		$domain->description = $description;
+
+		return $domain;
+	}
+
+	/**
+	 * Create an item object for an array
+	 *
+	 * @param   array         $data    The array data to convert
+	 * @param   integer|null  $itemId  The ID of this item
+	 *
+	 * @return  PrivacyExportItem
+	 *
+	 * @since   3.9.0
+	 */
+	protected function createItemFromArray(array $data, $itemId = null)
+	{
+		$item = new PrivacyExportItem;
+		$item->id = $itemId;
+
+		foreach ($data as $key => $value)
+		{
+			if (is_object($value))
+			{
+				$value = (array) $value;
+			}
+
+			if (is_array($value))
+			{
+				$value = print_r($value, true);
+			}
+
+			$field        = new PrivacyExportField;
+			$field->name  = $key;
+			$field->value = $value;
+
+			$item->addField($field);
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Create an item object for a JTable object
+	 *
+	 * @param   JTable  $table  The JTable object to convert
+	 *
+	 * @return  PrivacyExportItem
+	 *
+	 * @since   3.9.0
+	 */
+	protected function createItemForTable($table)
+	{
+		$data = array();
+
+		foreach (array_keys($table->getFields()) as $fieldName)
+		{
+			$data[$fieldName] = $table->$fieldName;
+		}
+
+		return $this->createItemFromArray($data, $table->{$table->getKeyName(false)});
+	}
+
+	/**
+	 * Helper function to create the domain for the items custom fields.
+	 *
+	 * @param   string  $context  The context
+	 * @param   array   $items    The items
+	 *
+	 * @return  PrivacyExportDomain
+	 *
+	 * @since   3.9.0
+	 */
+	protected function createCustomFieldsDomain($context, $items = array())
+	{
+		if (!is_array($items))
+		{
+			$items = array($items);
+		}
+
+		$parts = FieldsHelper::extract($context);
+
+		if (!$parts)
+		{
+			return array();
+		}
+
+		$type = str_replace('com_', '', $parts[0]);
+
+		$domain = $this->createDomain($type . '_' . $parts[1] . '_custom_fields', 'joomla_' . $type . '_' . $parts[1] . '_custom_fields_data');
+
+		foreach ($items as $item)
+		{
+			// Get item's fields, also preparing their value property for manual display
+			$fields = FieldsHelper::getFields($parts[0] . '.' . $parts[1], $item);
+
+			foreach ($fields as $field)
+			{
+				$fieldValue = is_array($field->value) ? implode(', ', $field->value) : $field->value;
+
+				$data = array(
+					$type . '_id' => $item->id,
+					'field_name'  => $field->name,
+					'field_title' => $field->title,
+					'field_value' => $fieldValue,
+				);
+
+				$domain->addItem($this->createItemFromArray($data));
+			}
+		}
+
+		return $domain;
+	}
+}
diff --git a/administrator/components/com_privacy/helpers/privacy.php b/administrator/components/com_privacy/helpers/privacy.php
new file mode 100644
index 0000000000000..806f9b4c318f3
--- /dev/null
+++ b/administrator/components/com_privacy/helpers/privacy.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Privacy component helper.
+ *
+ * @since  3.9.0
+ */
+class PrivacyHelper extends JHelperContent
+{
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public static function addSubmenu($vName)
+	{
+		JHtmlSidebar::addEntry(
+			JText::_('COM_PRIVACY_SUBMENU_DASHBOARD'),
+			'index.php?option=com_privacy&view=dashboard',
+			$vName === 'dashboard'
+		);
+
+		JHtmlSidebar::addEntry(
+			JText::_('COM_PRIVACY_SUBMENU_REQUESTS'),
+			'index.php?option=com_privacy&view=requests',
+			$vName === 'requests'
+		);
+
+		JHtmlSidebar::addEntry(
+			JText::_('COM_PRIVACY_SUBMENU_CAPABILITIES'),
+			'index.php?option=com_privacy&view=capabilities',
+			$vName === 'capabilities'
+		);
+
+		JHtmlSidebar::addEntry(
+			JText::_('COM_PRIVACY_SUBMENU_CONSENTS'),
+			'index.php?option=com_privacy&view=consents',
+			$vName === 'consents'
+		);
+	}
+
+	/**
+	 * Render the data request as a XML document.
+	 *
+	 * @param   PrivacyExportDomain[]  $exportData  The data to be exported.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.9.0
+	 */
+	public static function renderDataAsXml(array $exportData)
+	{
+		$export = new SimpleXMLElement('<?xml version="1.0" encoding="utf-8"?><data-export />');
+
+		foreach ($exportData as $domain)
+		{
+			$xmlDomain = $export->addChild('domain');
+			$xmlDomain->addAttribute('name', $domain->name);
+			$xmlDomain->addAttribute('description', $domain->description);
+
+			foreach ($domain->getItems() as $item)
+			{
+				$xmlItem = $xmlDomain->addChild('item');
+
+				if ($item->id)
+				{
+					$xmlItem->addAttribute('id', $item->id);
+				}
+
+				foreach ($item->getFields() as $field)
+				{
+					$xmlItem->{$field->name} = $field->value;
+				}
+			}
+		}
+
+		$dom = new DOMDocument;
+		$dom->loadXML($export->asXML());
+		$dom->formatOutput = true;
+
+		return $dom->saveXML();
+	}
+}
diff --git a/administrator/components/com_privacy/helpers/removal/status.php b/administrator/components/com_privacy/helpers/removal/status.php
new file mode 100644
index 0000000000000..fef3dbcd2b7d1
--- /dev/null
+++ b/administrator/components/com_privacy/helpers/removal/status.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Data object communicating the status of whether the data for an information request can be removed.
+ *
+ * Typically, this object will only be used to communicate data will be removed.
+ *
+ * @since  3.9.0
+ */
+class PrivacyRemovalStatus
+{
+	/**
+	 * Flag indicating the status reported by the plugin on whether the information can be removed
+	 *
+	 * @var    boolean
+	 * @since  3.9.0
+	 */
+	public $canRemove = true;
+
+	/**
+	 * A status message indicating the reason data can or cannot be removed
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	public $reason;
+}
diff --git a/administrator/components/com_privacy/models/capabilities.php b/administrator/components/com_privacy/models/capabilities.php
new file mode 100644
index 0000000000000..0e7e836f777be
--- /dev/null
+++ b/administrator/components/com_privacy/models/capabilities.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Capabilities model class.
+ *
+ * @since  3.9.0
+ */
+class PrivacyModelCapabilities extends JModelLegacy
+{
+	/**
+	 * Retrieve the extension capabilities.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.9.0
+	 */
+	public function getCapabilities()
+	{
+		$app = JFactory::getApplication();
+
+		/*
+		 * Capabilities will be collected in two parts:
+		 *
+		 * 1) Core capabilities - This will cover the core API, i.e. all library level classes
+		 * 2) Extension capabilities - This will be collected by a plugin hook to select plugin groups
+		 *
+		 * Plugins which report capabilities should return an associative array with a single root level key which is used as the title
+		 * for the reporting section and an array with each value being a separate capability. All capability messages should be translated
+		 * by the extension when building the array. An example of the structure expected to be returned from plugins can be found in the
+		 * $coreCapabilities array below.
+		 */
+
+		$coreCapabilities = array(
+			JText::_('COM_PRIVACY_HEADING_CORE_CAPABILITIES') => array(
+				JText::_('COM_PRIVACY_CORE_CAPABILITY_SESSION_IP_ADDRESS_AND_COOKIE'),
+				JText::sprintf('COM_PRIVACY_CORE_CAPABILITY_LOGGING_IP_ADDRESS', $app->get('log_path', JPATH_ADMINISTRATOR . '/logs')),
+				JText::_('COM_PRIVACY_CORE_CAPABILITY_COMMUNICATION_WITH_JOOMLA_ORG'),
+			)
+		);
+
+		/*
+		 * We will search for capabilities from the following plugin groups:
+		 *
+		 * - Authentication: These plugins by design process user information and may have capabilities such as creating cookies
+		 * - Captcha: These plugins may communicate information to third party systems
+		 * - Installer: These plugins can add additional install capabilities to the Extension Manager, such as the Install from Web service
+		 * - Privacy: These plugins are the primary integration point into this component
+		 * - User: These plugins are intended to extend the user management system
+		 *
+		 * This is in addition to plugin groups which are imported before this method is triggered, generally this is the system group.
+		 */
+
+		JPluginHelper::importPlugin('authentication');
+		JPluginHelper::importPlugin('captcha');
+		JPluginHelper::importPlugin('installer');
+		JPluginHelper::importPlugin('privacy');
+		JPluginHelper::importPlugin('user');
+
+		$pluginResults = $app->triggerEvent('onPrivacyCollectAdminCapabilities');
+
+		// We are going to "cheat" here and include this component's capabilities without using a plugin
+		$extensionCapabilities = array(
+			JText::_('COM_PRIVACY') => array(
+				JText::_('COM_PRIVACY_EXTENSION_CAPABILITY_PERSONAL_INFO'),
+			)
+		);
+
+		foreach ($pluginResults as $pluginResult)
+		{
+			$extensionCapabilities += $pluginResult;
+		}
+
+		// Sort the extension list alphabetically
+		ksort($extensionCapabilities);
+
+		// Always prepend the core capabilities to the array
+		return $coreCapabilities + $extensionCapabilities;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function populateState()
+	{
+		// Load the parameters.
+		$this->setState('params', JComponentHelper::getParams('com_privacy'));
+	}
+}
diff --git a/administrator/components/com_privacy/models/consents.php b/administrator/components/com_privacy/models/consents.php
new file mode 100644
index 0000000000000..1a345e382fa89
--- /dev/null
+++ b/administrator/components/com_privacy/models/consents.php
@@ -0,0 +1,224 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Consents management model class.
+ *
+ * @since  3.9.0
+ */
+class PrivacyModelConsents extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   3.9.0
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id', 'a.user_id',
+				'created', 'a.created',
+				'username', 'u.username',
+				'state', 'a.state'
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to get a JDatabaseQuery object for retrieving the data set from a database.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   3.9.0
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select($this->getState('list.select', 'a.*'));
+		$query->from($db->quoteName('#__privacy_consents', 'a'));
+
+		// Join over the users for the username.
+		$query->select($db->quoteName('u.username', 'username'));
+		$query->join('LEFT', $db->quoteName('#__users', 'u') . ' ON u.id = a.user_id');
+
+		// Filter by search in email
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where($db->quoteName('a.id') . ' = ' . (int) substr($search, 3));
+			}
+			elseif (stripos($search, 'uid:') === 0)
+			{
+				$query->where($db->quoteName('a.user_id') . ' = ' . (int) substr($search, 4));
+			}
+			else
+			{
+				$search = $db->quote('%' . $db->escape($search, true) . '%');
+				$query->where('(' . $db->quoteName('u.username') . ' LIKE ' . $search . ')');
+			}
+		}
+
+		$state = $this->getState('filter.state');
+
+		if ($state != '')
+		{
+			$query->where($db->quoteName('a.state') . ' = ' . (int) $state);
+		}
+
+		// Handle the list ordering.
+		$ordering  = $this->getState('list.ordering');
+		$direction = $this->getState('list.direction');
+
+		if (!empty($ordering))
+		{
+			$query->order($db->escape($ordering) . ' ' . $db->escape($direction));
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.9.0
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function populateState($ordering = 'a.id', $direction = 'desc')
+	{
+		// Load the filter state.
+		$this->setState(
+			'filter.search',
+			$this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search')
+		);
+
+		$this->setState(
+			'filter.subject',
+			$this->getUserStateFromRequest($this->context . '.filter.subject', 'filter_subject')
+		);
+
+		$this->setState(
+			'filter.state',
+			$this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state')
+		);
+
+		// Load the parameters.
+		$this->setState('params', JComponentHelper::getParams('com_privacy'));
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to invalidate specific consents.
+	 *
+	 * @param   array  $pks  The ids of the consents to invalidate.
+	 *
+	 * @return  boolean  True on success.
+	 */
+	public function invalidate($pks)
+	{
+		// Sanitize the ids.
+		$pks = (array) $pks;
+		$pks = ArrayHelper::toInteger($pks);
+
+		try
+		{
+			$db = $this->getDbo();
+			$query = $db->getQuery(true)
+				->update($db->quoteName('#__privacy_consents'))
+				->set($db->quoteName('state') . ' = -1')
+				->where($db->quoteName('id') . ' IN (' . implode(',', $pks) . ')')
+				->where($db->quoteName('state') . ' = 1');
+			$db->setQuery($query);
+			$db->execute();
+		}
+		catch (JDatabaseExceptionExecuting $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to invalidate a group of specific consents.
+	 *
+	 * @param   array  $subject  The subject of the consents to invalidate.
+	 *
+	 * @return  boolean  True on success.
+	 */
+	public function invalidateAll($subject)
+	{
+		try
+		{
+			$db = $this->getDbo();
+			$query = $db->getQuery(true)
+				->update($db->quoteName('#__privacy_consents'))
+				->set($db->quoteName('state') . ' = -1')
+				->where($db->quoteName('subject') . ' = ' . $db->quote($subject))
+				->where($db->quoteName('state') . ' = 1');
+			$db->setQuery($query);
+			$db->execute();
+		}
+		catch (JDatabaseExceptionExecuting $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/administrator/components/com_privacy/models/dashboard.php b/administrator/components/com_privacy/models/dashboard.php
new file mode 100644
index 0000000000000..3ae742f728e65
--- /dev/null
+++ b/administrator/components/com_privacy/models/dashboard.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Dashboard model class.
+ *
+ * @since  3.9.0
+ */
+class PrivacyModelDashboard extends JModelLegacy
+{
+	/**
+	 * Get the information about the published privacy policy
+	 *
+	 * @return  array  Array containing a status of whether a privacy policy is set and a link to the policy document for editing
+	 *
+	 * @since   3.9.0
+	 */
+	public function getPrivacyPolicyInfo()
+	{
+		$policy = array(
+			'published'         => false,
+			'articlePublished'  => false,
+			'editLink'          => '',
+		);
+
+		/*
+		 * Prior to 3.9.0 it was common for a plugin such as the User - Profile plugin to define a privacy policy or
+		 * terms of service article, therefore we will also import the user plugin group to process this event.
+		 */
+		JPluginHelper::importPlugin('privacy');
+		JPluginHelper::importPlugin('user');
+
+		JFactory::getApplication()->triggerEvent('onPrivacyCheckPrivacyPolicyPublished', array(&$policy));
+
+		return $policy;
+	}
+
+	/**
+	 * Get a count of the active information requests grouped by type and status
+	 *
+	 * @return  array  Array containing site privacy requests
+	 *
+	 * @since   3.9.0
+	 */
+	public function getRequestCounts()
+	{
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select(
+				array(
+					'COUNT(*) AS count',
+					$db->quoteName('status'),
+					$db->quoteName('request_type'),
+				)
+			)
+			->from($db->quoteName('#__privacy_requests'))
+			->group($db->quoteName('status'))
+			->group($db->quoteName('request_type'));
+
+		$db->setQuery($query);
+
+		return $db->loadObjectList();
+	}
+
+	/**
+	 * Check whether there is a menu item for the request form
+	 *
+	 * @return  array  Array containing a status of whether a menu is published for the request form and its current link
+	 *
+	 * @since   3.9.0
+	 */
+	public function getRequestFormPublished()
+	{
+		$app  = JFactory::getApplication();
+		$menu = $app->getMenu('site');
+
+		$item = $menu->getItems('link', 'index.php?option=com_privacy&view=request', true);
+
+		$status = array(
+			'exists'    => false,
+			'published' => false,
+			'link'      => '',
+		);
+
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('id'))
+			->from($db->quoteName('#__menu'))
+			->where($db->quoteName('client_id') . ' = 0')
+			->where($db->quoteName('link') . ' = ' . $db->quote('index.php?option=com_privacy&view=request'));
+		$db->setQuery($query);
+
+		// Check if the menu item exists in database
+		if ($db->loadResult())
+		{
+			$status['exists'] = true;
+		}
+
+		$linkMode = $app->get('force_ssl', 0) == 2 ? 1 : -1;
+
+		if (!($item instanceof JMenuItem))
+		{
+			$status['link'] = JRoute::link('site', 'index.php?option=com_privacy&view=request', true, $linkMode);
+		}
+		else
+		{
+			$status['published'] = true;
+			$status['link']      = JRoute::link('site', 'index.php?Itemid=' . $item->id, true, $linkMode);
+		}
+
+		return $status;
+	}
+}
diff --git a/administrator/components/com_privacy/models/export.php b/administrator/components/com_privacy/models/export.php
new file mode 100644
index 0000000000000..c8bd484857e28
--- /dev/null
+++ b/administrator/components/com_privacy/models/export.php
@@ -0,0 +1,340 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('PrivacyHelper', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/privacy.php');
+
+/**
+ * Export model class.
+ *
+ * @since  3.9.0
+ */
+class PrivacyModelExport extends JModelLegacy
+{
+	/**
+	 * Create the export document for an information request.
+	 *
+	 * @param   integer  $id  The request ID to process
+	 *
+	 * @return  PrivacyExportDomain[]|boolean  A SimpleXMLElement object for a successful export or boolean false on an error
+	 *
+	 * @since   3.9.0
+	 */
+	public function collectDataForExportRequest($id = null)
+	{
+		$id = !empty($id) ? $id : (int) $this->getState($this->getName() . '.request_id');
+
+		if (!$id)
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_REQUEST_ID_REQUIRED_FOR_EXPORT'));
+
+			return false;
+		}
+
+		/** @var PrivacyTableRequest $table */
+		$table = $this->getTable();
+
+		if (!$table->load($id))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		if ($table->request_type !== 'export')
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_REQUEST_TYPE_NOT_EXPORT'));
+
+			return false;
+		}
+
+		if ($table->status != 1)
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_CANNOT_EXPORT_UNCONFIRMED_REQUEST'));
+
+			return false;
+		}
+
+		// If there is a user account associated with the email address, load it here for use in the plugins
+		$db = $this->getDbo();
+
+		$userId = (int) $db->setQuery(
+			$db->getQuery(true)
+				->select('id')
+				->from($db->quoteName('#__users'))
+				->where($db->quoteName('email') . ' = ' . $db->quote($table->email)),
+			0,
+			1
+		)->loadResult();
+
+		$user = $userId ? JUser::getInstance($userId) : null;
+
+		// Log the export
+		$this->logExport($table);
+
+		JPluginHelper::importPlugin('privacy');
+
+		$pluginResults = JFactory::getApplication()->triggerEvent('onPrivacyExportRequest', array($table, $user));
+
+		$domains = array();
+
+		foreach ($pluginResults as $pluginDomains)
+		{
+			$domains = array_merge($domains, $pluginDomains);
+		}
+
+		return $domains;
+	}
+
+	/**
+	 * Email the data export to the user.
+	 *
+	 * @param   integer  $id  The request ID to process
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function emailDataExport($id = null)
+	{
+		$id = !empty($id) ? $id : (int) $this->getState($this->getName() . '.request_id');
+
+		if (!$id)
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_REQUEST_ID_REQUIRED_FOR_EXPORT'));
+
+			return false;
+		}
+
+		$exportData = $this->collectDataForExportRequest($id);
+
+		if ($exportData === false)
+		{
+			// Error is already set, we just need to bail
+			return false;
+		}
+
+		/** @var PrivacyTableRequest $table */
+		$table = $this->getTable();
+
+		if (!$table->load($id))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		if ($table->request_type !== 'export')
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_REQUEST_TYPE_NOT_EXPORT'));
+
+			return false;
+		}
+
+		if ($table->status != 1)
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_CANNOT_EXPORT_UNCONFIRMED_REQUEST'));
+
+			return false;
+		}
+
+		// Log the email
+		$this->logExportEmailed($table);
+
+		/*
+		 * If there is an associated user account, we will attempt to send this email in the user's preferred language.
+		 * Because of this, it is expected that Language::_() is directly called and that the Text class is NOT used
+		 * for translating all messages.
+		 *
+		 * Error messages will still be displayed to the administrator, so those messages should continue to use the Text class.
+		 */
+
+		$lang = JFactory::getLanguage();
+
+		$db = $this->getDbo();
+
+		$userId = (int) $db->setQuery(
+			$db->getQuery(true)
+				->select('id')
+				->from($db->quoteName('#__users'))
+				->where($db->quoteName('email') . ' = ' . $db->quote($table->email)),
+			0,
+			1
+		)->loadResult();
+
+		if ($userId)
+		{
+			$receiver = JUser::getInstance($userId);
+
+			/*
+			 * We don't know if the user has admin access, so we will check if they have an admin language in their parameters,
+			 * falling back to the site language, falling back to the currently active language
+			 */
+
+			$langCode = $receiver->getParam('admin_language', '');
+
+			if (!$langCode)
+			{
+				$langCode = $receiver->getParam('language', $lang->getTag());
+			}
+
+			$lang = JLanguage::getInstance($langCode, $lang->getDebug());
+		}
+
+		// Ensure the right language files have been loaded
+		$lang->load('com_privacy', JPATH_ADMINISTRATOR, null, false, true)
+			|| $lang->load('com_privacy', JPATH_ADMINISTRATOR . '/components/com_privacy', null, false, true);
+
+		// The mailer can be set to either throw Exceptions or return boolean false, account for both
+		try
+		{
+			$app = JFactory::getApplication();
+
+			$substitutions = array(
+				'[SITENAME]' => $app->get('sitename'),
+				'[URL]'      => JUri::root(),
+				'\\n'        => "\n",
+			);
+
+			$emailSubject = $lang->_('COM_PRIVACY_EMAIL_DATA_EXPORT_COMPLETED_SUBJECT');
+			$emailBody    = $lang->_('COM_PRIVACY_EMAIL_DATA_EXPORT_COMPLETED_BODY');
+
+			foreach ($substitutions as $k => $v)
+			{
+				$emailSubject = str_replace($k, $v, $emailSubject);
+				$emailBody    = str_replace($k, $v, $emailBody);
+			}
+
+			$mailer = JFactory::getMailer();
+			$mailer->setSubject($emailSubject);
+			$mailer->setBody($emailBody);
+			$mailer->addRecipient($table->email);
+			$mailer->addStringAttachment(
+				PrivacyHelper::renderDataAsXml($exportData),
+				'user-data_' . JUri::getInstance()->toString(array('host')) . '.xml'
+			);
+
+			$mailResult = $mailer->Send();
+
+			if ($mailResult instanceof JException)
+			{
+				// JError was already called so we just need to return now
+				return false;
+			}
+			elseif ($mailResult === false)
+			{
+				$this->setError($mailer->ErrorInfo);
+
+				return false;
+			}
+
+			return true;
+		}
+		catch (phpmailerException $exception)
+		{
+			$this->setError($exception->getMessage());
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to get a table object, load it if necessary.
+	 *
+	 * @param   string  $name     The table name. Optional.
+	 * @param   string  $prefix   The class prefix. Optional.
+	 * @param   array   $options  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A JTable object
+	 *
+	 * @since   3.9.0
+	 * @throws  \Exception
+	 */
+	public function getTable($name = 'Request', $prefix = 'PrivacyTable', $options = array())
+	{
+		return parent::getTable($name, $prefix, $options);
+	}
+
+	/**
+	 * Log the data export to the action log system.
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function logExport(PrivacyTableRequest $request)
+	{
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_actionlogs/models', 'ActionlogsModel');
+
+		$user = JFactory::getUser();
+
+		$message = array(
+			'action'      => 'export',
+			'id'          => $request->id,
+			'itemlink'    => 'index.php?option=com_privacy&view=request&id=' . $request->id,
+			'userid'      => $user->id,
+			'username'    => $user->username,
+			'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $user->id,
+		);
+
+		/** @var ActionlogsModelActionlog $model */
+		$model = JModelLegacy::getInstance('Actionlog', 'ActionlogsModel');
+		$model->addLog(array($message), 'COM_PRIVACY_ACTION_LOG_EXPORT', 'com_privacy.request', $user->id);
+	}
+
+	/**
+	 * Log the data export email to the action log system.
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function logExportEmailed(PrivacyTableRequest $request)
+	{
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_actionlogs/models', 'ActionlogsModel');
+
+		$user = JFactory::getUser();
+
+		$message = array(
+			'action'      => 'export_emailed',
+			'id'          => $request->id,
+			'itemlink'    => 'index.php?option=com_privacy&view=request&id=' . $request->id,
+			'userid'      => $user->id,
+			'username'    => $user->username,
+			'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $user->id,
+		);
+
+		/** @var ActionlogsModelActionlog $model */
+		$model = JModelLegacy::getInstance('Actionlog', 'ActionlogsModel');
+		$model->addLog(array($message), 'COM_PRIVACY_ACTION_LOG_EXPORT_EMAILED', 'com_privacy.request', $user->id);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function populateState()
+	{
+		// Get the pk of the record from the request.
+		$this->setState($this->getName() . '.request_id', JFactory::getApplication()->input->getUint('id'));
+
+		// Load the parameters.
+		$this->setState('params', JComponentHelper::getParams('com_privacy'));
+	}
+}
diff --git a/administrator/components/com_privacy/models/fields/requeststatus.php b/administrator/components/com_privacy/models/fields/requeststatus.php
new file mode 100644
index 0000000000000..16a9b4422dbe6
--- /dev/null
+++ b/administrator/components/com_privacy/models/fields/requeststatus.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JFormHelper::loadFieldClass('predefinedlist');
+
+/**
+ * Form Field to load a list of request statuses
+ *
+ * @since  3.9.0
+ */
+class PrivacyFormFieldRequeststatus extends JFormFieldPredefinedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	public $type = 'RequestStatus';
+
+	/**
+	 * Available statuses
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 */
+	protected $predefinedOptions = array(
+		'-1' => 'COM_PRIVACY_STATUS_INVALID',
+		'0'  => 'COM_PRIVACY_STATUS_PENDING',
+		'1'  => 'COM_PRIVACY_STATUS_CONFIRMED',
+		'2'  => 'COM_PRIVACY_STATUS_COMPLETED',
+	);
+}
diff --git a/administrator/components/com_privacy/models/fields/requesttype.php b/administrator/components/com_privacy/models/fields/requesttype.php
new file mode 100644
index 0000000000000..8ceb10c9784e8
--- /dev/null
+++ b/administrator/components/com_privacy/models/fields/requesttype.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JFormHelper::loadFieldClass('predefinedlist');
+
+/**
+ * Form Field to load a list of request types
+ *
+ * @since  3.9.0
+ */
+class PrivacyFormFieldRequesttype extends JFormFieldPredefinedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	public $type = 'RequestType';
+
+	/**
+	 * Available types
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 */
+	protected $predefinedOptions = array(
+		'export' => 'COM_PRIVACY_HEADING_REQUEST_TYPE_TYPE_EXPORT',
+		'remove' => 'COM_PRIVACY_HEADING_REQUEST_TYPE_TYPE_REMOVE',
+	);
+}
diff --git a/administrator/components/com_privacy/models/forms/filter_consents.xml b/administrator/components/com_privacy/models/forms/filter_consents.xml
new file mode 100644
index 0000000000000..19c9008596aba
--- /dev/null
+++ b/administrator/components/com_privacy/models/forms/filter_consents.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_privacy/models/fields" />
+
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_PRIVACY_FILTER_SEARCH_LABEL"
+			description="COM_PRIVACY_SEARCH_IN_USERNAME"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="state"
+			type="list"
+			label="COM_PRIVACY_CONSENTS_FILTER_STATE"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+			<option value="1">COM_PRIVACY_CONSENTS_STATE_VALID</option>
+			<option value="0">COM_PRIVACY_CONSENTS_STATE_OBSOLETE</option>
+			<option value="-1">COM_PRIVACY_CONSENTS_STATE_INVALIDATED</option>
+		</field>
+
+		<field
+			name="subject"
+			type="sql"
+			label="COM_PRIVACY_CONSENTS_FILTER_SUBJECT"
+			sql_select="subject"
+			sql_from="#__privacy_consents"
+			sql_group="subject"
+			sql_order="subject ASC"
+			key_field="subject"
+			translate="true"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_PRIVACY_CONSENTS_SUBJECT_DEFAULT</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			>
+			<option value="u.username ASC">COM_PRIVACY_HEADING_USERNAME_ASC</option>
+			<option value="u.username DESC">COM_PRIVACY_HEADING_USERNAME_DESC</option>
+			<option value="a.state ASC">COM_PRIVACY_HEADING_STATUS_ASC</option>
+			<option value="a.state DESC">COM_PRIVACY_HEADING_STATUS_DESC</option>
+			<option value="u.user_id ASC">COM_PRIVACY_HEADING_USERID_ASC</option>
+			<option value="u.user_id DESC">COM_PRIVACY_HEADING_USERID_DESC</option>
+			<option value="a.created ASC">COM_PRIVACY_HEADING_CREATED_ASC</option>
+			<option value="a.created DESC">COM_PRIVACY_HEADING_CREATED_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/administrator/components/com_privacy/models/forms/filter_requests.xml b/administrator/components/com_privacy/models/forms/filter_requests.xml
new file mode 100644
index 0000000000000..697ba2188baac
--- /dev/null
+++ b/administrator/components/com_privacy/models/forms/filter_requests.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_privacy/models/fields" />
+
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_PRIVACY_FILTER_SEARCH_LABEL"
+			description="COM_PRIVACY_SEARCH_IN_EMAIL"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="status"
+			type="privacy.requeststatus"
+			label="COM_PRIVACY_FILTER_STATUS"
+			description="COM_PRIVACY_FILTER_STATUS_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="request_type"
+			type="privacy.requesttype"
+			label="COM_PRIVACY_FILTER_REQUEST_TYPE"
+			description="COM_PRIVACY_FILTER_REQUEST_TYPE_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_PRIVACY_SELECT_REQUEST_TYPE</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.email ASC">COM_PRIVACY_HEADING_EMAIL_ASC</option>
+			<option value="a.email DESC">COM_PRIVACY_HEADING_EMAIL_DESC</option>
+			<option value="a.request_type ASC">COM_PRIVACY_HEADING_REQUEST_TYPE_ASC</option>
+			<option value="a.request_type DESC">COM_PRIVACY_HEADING_REQUEST_TYPE_DESC</option>
+			<option value="a.requested_at ASC">COM_PRIVACY_HEADING_REQUESTED_AT_ASC</option>
+			<option value="a.requested_at DESC">COM_PRIVACY_HEADING_REQUESTED_AT_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/administrator/components/com_privacy/models/forms/request.xml b/administrator/components/com_privacy/models/forms/request.xml
new file mode 100644
index 0000000000000..0ee1e6f9fdd01
--- /dev/null
+++ b/administrator/components/com_privacy/models/forms/request.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_privacy/models/fields">
+		<field
+			name="email"
+			type="email"
+			label="JGLOBAL_EMAIL"
+			description="COM_PRIVACY_USER_FIELD_EMAIL_DESC"
+			required="true"
+			size="30"
+			validate="email"
+		/>
+
+		<field
+			name="status"
+			type="list"
+			label="JSTATUS"
+			description="COM_PRIVACY_FIELD_STATUS_DESC"
+			filter="int"
+			default="0"
+			validate="options"
+			readonly="true"
+			>
+			<option value="0">COM_PRIVACY_STATUS_PENDING</option>
+			<option value="-1">COM_PRIVACY_STATUS_INVALID</option>
+			<option value="1">COM_PRIVACY_STATUS_CONFIRMED</option>
+			<option value="2">COM_PRIVACY_STATUS_COMPLETED</option>
+		</field>
+
+		<field
+			name="request_type"
+			type="list"
+			label="COM_PRIVACY_FIELD_REQUEST_TYPE_LABEL"
+			description="COM_PRIVACY_FIELD_REQUEST_TYPE_DESC"
+			filter="string"
+			default="export"
+			validate="options"
+			>
+			<option value="export">COM_PRIVACY_HEADING_REQUEST_TYPE_TYPE_EXPORT</option>
+			<option value="remove">COM_PRIVACY_HEADING_REQUEST_TYPE_TYPE_REMOVE</option>
+		</field>
+
+		<field
+			name="id"
+			type="number"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			class="readonly"
+			default="0"
+			readonly="true"
+		/>
+
+	</fieldset>
+</form>
diff --git a/administrator/components/com_privacy/models/remove.php b/administrator/components/com_privacy/models/remove.php
new file mode 100644
index 0000000000000..a5f6505a46326
--- /dev/null
+++ b/administrator/components/com_privacy/models/remove.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('PrivacyHelper', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/privacy.php');
+JLoader::register('PrivacyRemovalStatus', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/removal/status.php');
+
+/**
+ * Remove model class.
+ *
+ * @since  3.9.0
+ */
+class PrivacyModelRemove extends JModelLegacy
+{
+	/**
+	 * Remove the user data.
+	 *
+	 * @param   integer  $id  The request ID to process
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function removeDataForRequest($id = null)
+	{
+		$id = !empty($id) ? $id : (int) $this->getState($this->getName() . '.request_id');
+
+		if (!$id)
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_REQUEST_ID_REQUIRED_FOR_REMOVE'));
+
+			return false;
+		}
+
+		/** @var PrivacyTableRequest $table */
+		$table = $this->getTable();
+
+		if (!$table->load($id))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		if ($table->request_type !== 'remove')
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_REQUEST_TYPE_NOT_REMOVE'));
+
+			return false;
+		}
+
+		if ($table->status != 1)
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_CANNOT_REMOVE_UNCONFIRMED_REQUEST'));
+
+			return false;
+		}
+
+		// If there is a user account associated with the email address, load it here for use in the plugins
+		$db = $this->getDbo();
+
+		$userId = (int) $db->setQuery(
+			$db->getQuery(true)
+				->select('id')
+				->from($db->quoteName('#__users'))
+				->where($db->quoteName('email') . ' = ' . $db->quote($table->email)),
+			0,
+			1
+		)->loadResult();
+
+		$user = $userId ? JUser::getInstance($userId) : null;
+
+		$canRemove = true;
+
+		JPluginHelper::importPlugin('privacy');
+
+		/** @var PrivacyRemovalStatus[] $pluginResults */
+		$pluginResults = JFactory::getApplication()->triggerEvent('onPrivacyCanRemoveData', array($table, $user));
+
+		foreach ($pluginResults as $status)
+		{
+			if (!$status->canRemove)
+			{
+				$this->setError($status->reason ?: JText::_('COM_PRIVACY_ERROR_CANNOT_REMOVE_DATA'));
+
+				$canRemove = false;
+			}
+		}
+
+		if (!$canRemove)
+		{
+			$this->logRemoveBlocked($table, $this->getErrors());
+
+			return false;
+		}
+
+		// Log the removal
+		$this->logRemove($table);
+
+		JFactory::getApplication()->triggerEvent('onPrivacyRemoveData', array($table, $user));
+
+		return true;
+	}
+
+	/**
+	 * Method to get a table object, load it if necessary.
+	 *
+	 * @param   string  $name     The table name. Optional.
+	 * @param   string  $prefix   The class prefix. Optional.
+	 * @param   array   $options  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A JTable object
+	 *
+	 * @since   3.9.0
+	 * @throws  \Exception
+	 */
+	public function getTable($name = 'Request', $prefix = 'PrivacyTable', $options = array())
+	{
+		return parent::getTable($name, $prefix, $options);
+	}
+
+	/**
+	 * Log the data removal to the action log system.
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function logRemove(PrivacyTableRequest $request)
+	{
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_actionlogs/models', 'ActionlogsModel');
+
+		$user = JFactory::getUser();
+
+		$message = array(
+			'action'      => 'remove',
+			'id'          => $request->id,
+			'itemlink'    => 'index.php?option=com_privacy&view=request&id=' . $request->id,
+			'userid'      => $user->id,
+			'username'    => $user->username,
+			'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $user->id,
+		);
+
+		/** @var ActionlogsModelActionlog $model */
+		$model = JModelLegacy::getInstance('Actionlog', 'ActionlogsModel');
+		$model->addLog(array($message), 'COM_PRIVACY_ACTION_LOG_REMOVE', 'com_privacy.request', $user->id);
+	}
+
+	/**
+	 * Log the data removal being blocked to the action log system.
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 * @param   string[]             $reasons  The reasons given why the record could not be removed.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function logRemoveBlocked(PrivacyTableRequest $request, array $reasons)
+	{
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_actionlogs/models', 'ActionlogsModel');
+
+		$user = JFactory::getUser();
+
+		$message = array(
+			'action'      => 'remove-blocked',
+			'id'          => $request->id,
+			'itemlink'    => 'index.php?option=com_privacy&view=request&id=' . $request->id,
+			'userid'      => $user->id,
+			'username'    => $user->username,
+			'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $user->id,
+			'reasons'     => implode('; ', $reasons),
+		);
+
+		/** @var ActionlogsModelActionlog $model */
+		$model = JModelLegacy::getInstance('Actionlog', 'ActionlogsModel');
+		$model->addLog(array($message), 'COM_PRIVACY_ACTION_LOG_REMOVE_BLOCKED', 'com_privacy.request', $user->id);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function populateState()
+	{
+		// Get the pk of the record from the request.
+		$this->setState($this->getName() . '.request_id', JFactory::getApplication()->input->getUint('id'));
+
+		// Load the parameters.
+		$this->setState('params', JComponentHelper::getParams('com_privacy'));
+	}
+}
diff --git a/administrator/components/com_privacy/models/request.php b/administrator/components/com_privacy/models/request.php
new file mode 100644
index 0000000000000..ceb00f11399e4
--- /dev/null
+++ b/administrator/components/com_privacy/models/request.php
@@ -0,0 +1,457 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Request item model class.
+ *
+ * @since  3.9.0
+ */
+class PrivacyModelRequest extends JModelAdmin
+{
+	/**
+	 * Clean the cache
+	 *
+	 * @param   string   $group      The cache group
+	 * @param   integer  $client_id  The ID of the client
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function cleanCache($group = 'com_privacy', $client_id = 1)
+	{
+		parent::cleanCache('com_privacy', 1);
+	}
+
+	/**
+	 * Method for getting the form from the model.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm|boolean  A JForm object on success, false on failure
+	 *
+	 * @since   3.9.0
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_privacy.request', 'request', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get a table object, load it if necessary.
+	 *
+	 * @param   string  $name     The table name. Optional.
+	 * @param   string  $prefix   The class prefix. Optional.
+	 * @param   array   $options  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A JTable object
+	 *
+	 * @since   3.9.0
+	 * @throws  \Exception
+	 */
+	public function getTable($name = 'Request', $prefix = 'PrivacyTable', $options = array())
+	{
+		return parent::getTable($name, $prefix, $options);
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  array  The default data is an empty array.
+	 *
+	 * @since   3.9.0
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_privacy.edit.request.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Log the completion of a request to the action log system.
+	 *
+	 * @param   integer  $id  The ID of the request to process.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function logRequestCompleted($id)
+	{
+		/** @var PrivacyTableRequest $table */
+		$table = $this->getTable();
+
+		if (!$table->load($id))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_actionlogs/models', 'ActionlogsModel');
+
+		$user = JFactory::getUser();
+
+		$message = array(
+			'action'       => 'request-completed',
+			'requesttype'  => $table->request_type,
+			'subjectemail' => $table->email,
+			'id'           => $table->id,
+			'itemlink'     => 'index.php?option=com_privacy&view=request&id=' . $table->id,
+			'userid'       => $user->id,
+			'username'     => $user->username,
+			'accountlink'  => 'index.php?option=com_users&task=user.edit&id=' . $user->id,
+		);
+
+		/** @var ActionlogsModelActionlog $model */
+		$model = JModelLegacy::getInstance('Actionlog', 'ActionlogsModel');
+		$model->addLog(array($message), 'COM_PRIVACY_ACTION_LOG_ADMIN_COMPLETED_REQUEST', 'com_privacy.request', $user->id);
+
+		return true;
+	}
+
+	/**
+	 * Log the creation of a request to the action log system.
+	 *
+	 * @param   integer  $id  The ID of the request to process.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function logRequestCreated($id)
+	{
+		/** @var PrivacyTableRequest $table */
+		$table = $this->getTable();
+
+		if (!$table->load($id))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_actionlogs/models', 'ActionlogsModel');
+
+		$user = JFactory::getUser();
+
+		$message = array(
+			'action'       => 'request-created',
+			'requesttype'  => $table->request_type,
+			'subjectemail' => $table->email,
+			'id'           => $table->id,
+			'itemlink'     => 'index.php?option=com_privacy&view=request&id=' . $table->id,
+			'userid'       => $user->id,
+			'username'     => $user->username,
+			'accountlink'  => 'index.php?option=com_users&task=user.edit&id=' . $user->id,
+		);
+
+		/** @var ActionlogsModelActionlog $model */
+		$model = JModelLegacy::getInstance('Actionlog', 'ActionlogsModel');
+		$model->addLog(array($message), 'COM_PRIVACY_ACTION_LOG_ADMIN_CREATED_REQUEST', 'com_privacy.request', $user->id);
+
+		return true;
+	}
+
+	/**
+	 * Log the invalidation of a request to the action log system.
+	 *
+	 * @param   integer  $id  The ID of the request to process.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function logRequestInvalidated($id)
+	{
+		/** @var PrivacyTableRequest $table */
+		$table = $this->getTable();
+
+		if (!$table->load($id))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_actionlogs/models', 'ActionlogsModel');
+
+		$user = JFactory::getUser();
+
+		$message = array(
+			'action'       => 'request-invalidated',
+			'requesttype'  => $table->request_type,
+			'subjectemail' => $table->email,
+			'id'           => $table->id,
+			'itemlink'     => 'index.php?option=com_privacy&view=request&id=' . $table->id,
+			'userid'       => $user->id,
+			'username'     => $user->username,
+			'accountlink'  => 'index.php?option=com_users&task=user.edit&id=' . $user->id,
+		);
+
+		/** @var ActionlogsModelActionlog $model */
+		$model = JModelLegacy::getInstance('Actionlog', 'ActionlogsModel');
+		$model->addLog(array($message), 'COM_PRIVACY_ACTION_LOG_ADMIN_INVALIDATED_REQUEST', 'com_privacy.request', $user->id);
+
+		return true;
+	}
+
+	/**
+	 * Notifies the user that an information request has been created by a site administrator.
+	 *
+	 * Because confirmation tokens are stored in the database as a hashed value, this method will generate a new confirmation token
+	 * for the request.
+	 *
+	 * @param   integer  $id  The ID of the request to process.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function notifyUserAdminCreatedRequest($id)
+	{
+		/** @var PrivacyTableRequest $table */
+		$table = $this->getTable();
+
+		if (!$table->load($id))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		/*
+		 * If there is an associated user account, we will attempt to send this email in the user's preferred language.
+		 * Because of this, it is expected that Language::_() is directly called and that the Text class is NOT used
+		 * for translating all messages.
+		 *
+		 * Error messages will still be displayed to the administrator, so those messages should continue to use the Text class.
+		 */
+
+		$lang = JFactory::getLanguage();
+
+		$db = $this->getDbo();
+
+		$userId = (int) $db->setQuery(
+			$db->getQuery(true)
+				->select('id')
+				->from($db->quoteName('#__users'))
+				->where($db->quoteName('email') . ' = ' . $db->quote($table->email)),
+			0,
+			1
+		)->loadResult();
+
+		if ($userId)
+		{
+			$receiver = JUser::getInstance($userId);
+
+			/*
+			 * We don't know if the user has admin access, so we will check if they have an admin language in their parameters,
+			 * falling back to the site language, falling back to the currently active language
+			 */
+
+			$langCode = $receiver->getParam('admin_language', '');
+
+			if (!$langCode)
+			{
+				$langCode = $receiver->getParam('language', $lang->getTag());
+			}
+
+			$lang = JLanguage::getInstance($langCode, $lang->getDebug());
+		}
+
+		// Ensure the right language files have been loaded
+		$lang->load('com_privacy', JPATH_ADMINISTRATOR, null, false, true)
+			|| $lang->load('com_privacy', JPATH_ADMINISTRATOR . '/components/com_privacy', null, false, true);
+
+		// Regenerate the confirmation token
+		$token       = JApplicationHelper::getHash(JUserHelper::genRandomPassword());
+		$hashedToken = JUserHelper::hashPassword($token);
+
+		$table->confirm_token            = $hashedToken;
+		$table->confirm_token_created_at = JFactory::getDate()->toSql();
+
+		try
+		{
+			$table->store();
+		}
+		catch (JDatabaseException $exception)
+		{
+			$this->setError($exception->getMessage());
+
+			return false;
+		}
+
+		// The mailer can be set to either throw Exceptions or return boolean false, account for both
+		try
+		{
+			$app = JFactory::getApplication();
+
+			$linkMode = $app->get('force_ssl', 0) == 2 ? 1 : -1;
+
+			$substitutions = array(
+				'[SITENAME]' => $app->get('sitename'),
+				'[URL]'      => JUri::root(),
+				'[TOKENURL]' => JRoute::link('site', 'index.php?option=com_privacy&view=confirm&confirm_token=' . $token, false, $linkMode),
+				'[FORMURL]'  => JRoute::link('site', 'index.php?option=com_privacy&view=confirm', false, $linkMode),
+				'[TOKEN]'    => $token,
+				'\\n'        => "\n",
+			);
+
+			switch ($table->request_type)
+			{
+				case 'export':
+					$emailSubject = $lang->_('COM_PRIVACY_EMAIL_ADMIN_REQUEST_SUBJECT_EXPORT_REQUEST');
+					$emailBody    = $lang->_('COM_PRIVACY_EMAIL_ADMIN_REQUEST_BODY_EXPORT_REQUEST');
+
+					break;
+
+				case 'remove':
+					$emailSubject = $lang->_('COM_PRIVACY_EMAIL_ADMIN_REQUEST_SUBJECT_REMOVE_REQUEST');
+					$emailBody    = $lang->_('COM_PRIVACY_EMAIL_ADMIN_REQUEST_BODY_REMOVE_REQUEST');
+
+					break;
+
+				default:
+					$this->setError(JText::_('COM_PRIVACY_ERROR_UNKNOWN_REQUEST_TYPE'));
+
+					return false;
+			}
+
+			foreach ($substitutions as $k => $v)
+			{
+				$emailSubject = str_replace($k, $v, $emailSubject);
+				$emailBody    = str_replace($k, $v, $emailBody);
+			}
+
+			$mailer = JFactory::getMailer();
+			$mailer->setSubject($emailSubject);
+			$mailer->setBody($emailBody);
+			$mailer->addRecipient($table->email);
+
+			$mailResult = $mailer->Send();
+
+			if ($mailResult instanceof JException)
+			{
+				// JError was already called so we just need to return now
+				return false;
+			}
+			elseif ($mailResult === false)
+			{
+				$this->setError($mailer->ErrorInfo);
+
+				return false;
+			}
+
+			return true;
+		}
+		catch (phpmailerException $exception)
+		{
+			$this->setError($exception->getMessage());
+
+			return false;
+		}
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success, False on error.
+	 *
+	 * @since   3.9.0
+	 */
+	public function save($data)
+	{
+		$table = $this->getTable();
+		$key   = $table->getKeyName();
+		$pk    = !empty($data[$key]) ? $data[$key] : (int) $this->getState($this->getName() . '.id');
+
+		if (!$pk && !JFactory::getConfig()->get('mailonline', 1))
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_CANNOT_CREATE_REQUEST_WHEN_SENDMAIL_DISABLED'));
+
+			return false;
+		}
+
+		return parent::save($data);
+	}
+
+	/**
+	 * Method to validate the form data.
+	 *
+	 * @param   JForm   $form   The form to validate against.
+	 * @param   array   $data   The data to validate.
+	 * @param   string  $group  The name of the field group to validate.
+	 *
+	 * @return  array|boolean  Array of filtered data if valid, false otherwise.
+	 *
+	 * @see     JFormRule
+	 * @see     JFilterInput
+	 * @since   3.9.0
+	 */
+	public function validate($form, $data, $group = null)
+	{
+		$validatedData = parent::validate($form, $data, $group);
+
+		// If parent validation failed there's no point in doing our extended validation
+		if ($validatedData === false)
+		{
+			return false;
+		}
+
+		// The user cannot create a request for their own account
+		if (strtolower(JFactory::getUser()->email) === strtolower($validatedData['email']))
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_CANNOT_CREATE_REQUEST_FOR_SELF'));
+
+			return false;
+		}
+
+		// Check for an active request for this email address
+		$db = $this->getDbo();
+
+		$query = $db->getQuery(true)
+			->select('COUNT(id)')
+			->from('#__privacy_requests')
+			->where('email = ' . $db->quote($validatedData['email']))
+			->where('request_type = ' . $db->quote($validatedData['request_type']))
+			->where('status IN (0, 1)');
+
+		$activeRequestCount = (int) $db->setQuery($query)->loadResult();
+
+		if ($activeRequestCount > 0)
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_ACTIVE_REQUEST_FOR_EMAIL'));
+
+			return false;
+		}
+
+		return $validatedData;
+	}
+}
diff --git a/administrator/components/com_privacy/models/requests.php b/administrator/components/com_privacy/models/requests.php
new file mode 100644
index 0000000000000..2f8b6caad0610
--- /dev/null
+++ b/administrator/components/com_privacy/models/requests.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+
+/**
+ * Requests management model class.
+ *
+ * @since  3.9.0
+ */
+class PrivacyModelRequests extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   3.9.0
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'email', 'a.email',
+				'requested_at', 'a.requested_at',
+				'request_type', 'a.request_type',
+				'status', 'a.status',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to get a JDatabaseQuery object for retrieving the data set from a database.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   3.9.0
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select($this->getState('list.select', 'a.*'));
+		$query->from($db->quoteName('#__privacy_requests', 'a'));
+
+		// Filter by status
+		$status = $this->getState('filter.status');
+
+		if (is_numeric($status))
+		{
+			$query->where('a.status = ' . (int) $status);
+		}
+
+		// Filter by request type
+		$requestType = $this->getState('filter.request_type', '');
+
+		if ($requestType)
+		{
+			$query->where('a.request_type = ' . $db->quote($db->escape($requestType, true)));
+		}
+
+		// Filter by search in email
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where($db->quoteName('a.id') . ' = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . $db->escape($search, true) . '%');
+				$query->where('(' . $db->quoteName('a.email') . ' LIKE ' . $search . ')');
+			}
+		}
+
+		// Handle the list ordering.
+		$ordering  = $this->getState('list.ordering');
+		$direction = $this->getState('list.direction');
+
+		if (!empty($ordering))
+		{
+			$query->order($db->escape($ordering) . ' ' . $db->escape($direction));
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.9.0
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.status');
+		$id .= ':' . $this->getState('filter.request_type');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function populateState($ordering = 'a.id', $direction = 'desc')
+	{
+		// Load the filter state.
+		$this->setState(
+			'filter.search',
+			$this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search')
+		);
+
+		$this->setState(
+			'filter.status',
+			$this->getUserStateFromRequest($this->context . '.filter.status', 'filter_status', '', 'int')
+		);
+
+		$this->setState(
+			'filter.request_type',
+			$this->getUserStateFromRequest($this->context . '.filter.request_type', 'filter_request_type', '', 'string')
+		);
+
+		// Load the parameters.
+		$this->setState('params', JComponentHelper::getParams('com_privacy'));
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to return number privacy requests older than X days.
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.9.0
+	 */
+	public function getNumberUrgentRequests()
+	{
+		// Load the parameters.
+		$params = ComponentHelper::getComponent('com_privacy')->getParams();
+		$notify = (int) $params->get('notify', 14);
+		$now    = JFactory::getDate()->toSql();
+		$period = '-' . $notify;
+
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('COUNT(*)');
+		$query->from($db->quoteName('#__privacy_requests'));
+		$query->where($db->quoteName('status') . ' = 1 ');
+		$query->where($query->dateAdd($db->quote($now), $period, 'DAY') . ' > ' . $db->quoteName('requested_at'));
+		$db->setQuery($query);
+
+		return (int) $db->loadResult();
+	}
+}
diff --git a/administrator/components/com_privacy/privacy.php b/administrator/components/com_privacy/privacy.php
new file mode 100644
index 0000000000000..9919fde723be1
--- /dev/null
+++ b/administrator/components/com_privacy/privacy.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Only super user can access here
+if (!JFactory::getUser()->authorise('core.admin'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('Privacy');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/administrator/components/com_privacy/privacy.xml b/administrator/components/com_privacy/privacy.xml
new file mode 100644
index 0000000000000..20fd0026bf346
--- /dev/null
+++ b/administrator/components/com_privacy/privacy.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.9" method="upgrade">
+	<name>com_privacy</name>
+	<author>Joomla! Project</author>
+	<creationDate>May 2018</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>COM_PRIVACY_XML_DESCRIPTION</description>
+	<files folder="site">
+		<filename>controller.php</filename>
+		<filename>privacy.php</filename>
+		<filename>router.php</filename>
+		<folder>controllers</folder>
+		<folder>models</folder>
+		<folder>views</folder>
+	</files>
+	<languages folder="site">
+		<language tag="en-GB">language/en-GB.com_privacy.ini</language>
+	</languages>
+	<administration>
+		<files folder="admin">
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<filename>privacy.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>tables</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_privacy.ini</language>
+			<language tag="en-GB">language/en-GB.com_privacy.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
+
diff --git a/administrator/components/com_privacy/tables/consent.php b/administrator/components/com_privacy/tables/consent.php
new file mode 100644
index 0000000000000..aec23c0937cc7
--- /dev/null
+++ b/administrator/components/com_privacy/tables/consent.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Table interface class for the #__privacy_consents table
+ *
+ * @property   integer  $id       Item ID (primary key)
+ * @property   integer  $remind   The status of the reminder request
+ * @property   string   $token    Hashed token for the reminder request
+ * @property   integer  $user_id  User ID (pseudo foreign key to the #__users table) if the request is associated to a user account
+ *
+ * @since  3.9.0
+ */
+class PrivacyTableConsent extends JTable
+{
+	/**
+	 * The class constructor.
+	 *
+	 * @param   JDatabaseDriver  $db  JDatabaseDriver connector object.
+	 *
+	 * @since   3.9.0
+	 */
+	public function __construct(JDatabaseDriver $db)
+	{
+		parent::__construct('#__privacy_consents', 'id', $db);
+	}
+
+	/**
+	 * Method to store a row in the database from the Table instance properties.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.9.0
+	 */
+	public function store($updateNulls = false)
+	{
+		$date = JFactory::getDate();
+
+		// Set default values for new records
+		if (!$this->id)
+		{
+			if (!$this->remind)
+			{
+				$this->remind = '0';
+			}
+
+			if (!$this->created)
+			{
+				$this->created = $date->toSql();
+			}
+		}
+
+		return parent::store($updateNulls);
+	}
+}
diff --git a/administrator/components/com_privacy/tables/request.php b/administrator/components/com_privacy/tables/request.php
new file mode 100644
index 0000000000000..3428a90e6596c
--- /dev/null
+++ b/administrator/components/com_privacy/tables/request.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Table interface class for the #__privacy_requests table
+ *
+ * @property   integer  $id                        Item ID (primary key)
+ * @property   string   $email                     The email address of the individual requesting the data
+ * @property   string   $requested_at              The time the request was created at
+ * @property   integer  $status                    The status of the information request
+ * @property   string   $request_type              The type of information request
+ * @property   string   $confirm_token             Hashed token for confirming the information request
+ * @property   string   $confirm_token_created_at  The time the confirmation token was generated
+ *
+ * @since  3.9.0
+ */
+class PrivacyTableRequest extends JTable
+{
+	/**
+	 * The class constructor.
+	 *
+	 * @param   JDatabaseDriver  $db  JDatabaseDriver connector object.
+	 *
+	 * @since   3.9.0
+	 */
+	public function __construct(JDatabaseDriver $db)
+	{
+		parent::__construct('#__privacy_requests', 'id', $db);
+	}
+
+	/**
+	 * Method to store a row in the database from the Table instance properties.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.9.0
+	 */
+	public function store($updateNulls = false)
+	{
+		$date = JFactory::getDate();
+
+		// Set default values for new records
+		if (!$this->id)
+		{
+			if (!$this->status)
+			{
+				$this->status = '0';
+			}
+
+			if (!$this->requested_at)
+			{
+				$this->requested_at = $date->toSql();
+			}
+		}
+
+		return parent::store($updateNulls);
+	}
+}
diff --git a/administrator/components/com_privacy/views/capabilities/tmpl/default.php b/administrator/components/com_privacy/views/capabilities/tmpl/default.php
new file mode 100644
index 0000000000000..4f0e03e27e1a9
--- /dev/null
+++ b/administrator/components/com_privacy/views/capabilities/tmpl/default.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var PrivacyViewCapabilities $this */
+
+?>
+<?php if (!empty($this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+	<div class="alert alert-info">
+		<h4 class="alert-heading"><?php echo JText::_('COM_PRIVACY_MSG_CAPABILITIES_ABOUT_THIS_INFORMATION'); ?></h4>
+		<?php echo JText::_('COM_PRIVACY_MSG_CAPABILITIES_INTRODUCTION'); ?>
+	</div>
+	<?php if (empty($this->capabilities)) : ?>
+		<div class="alert alert-no-items">
+			<?php echo JText::_('COM_PRIVACY_MSG_CAPABILITIES_NO_CAPABILITIES'); ?>
+		</div>
+	<?php else : ?>
+		<?php $i = 0; ?>
+		<?php echo JHtml::_('bootstrap.startAccordion', 'slide-capabilities', array('active' => 'slide-0')); ?>
+
+		<?php foreach ($this->capabilities as $extension => $capabilities) : ?>
+			<?php echo JHtml::_('bootstrap.addSlide', 'slide-capabilities', $extension, 'slide-' . $i); ?>
+				<?php if (empty($capabilities)) : ?>
+					<div class="alert alert-no-items">
+						<?php echo JText::_('COM_PRIVACY_MSG_EXTENSION_NO_CAPABILITIES'); ?>
+					</div>
+				<?php else : ?>
+					<ul>
+						<?php foreach ($capabilities as $capability) : ?>
+							<li><?php echo $capability; ?></li>
+						<?php endforeach; ?>
+					</ul>
+				<?php endif; ?>
+			<?php echo JHtml::_('bootstrap.endSlide'); ?>
+			<?php $i++; ?>
+		<?php endforeach; ?>
+
+		<?php echo JHtml::_('bootstrap.endAccordion'); ?>
+	<?php endif; ?>
+</div>
diff --git a/administrator/components/com_privacy/views/capabilities/view.html.php b/administrator/components/com_privacy/views/capabilities/view.html.php
new file mode 100644
index 0000000000000..427508dcab598
--- /dev/null
+++ b/administrator/components/com_privacy/views/capabilities/view.html.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Capabilities view class
+ *
+ * @since  3.9.0
+ */
+class PrivacyViewCapabilities extends JViewLegacy
+{
+	/**
+	 * The reported extension capabilities
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 */
+	protected $capabilities;
+
+	/**
+	 * The HTML markup for the sidebar
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	protected $sidebar;
+
+	/**
+	 * The state information
+	 *
+	 * @var    JObject
+	 * @since  3.9.0
+	 */
+	protected $state;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @see     JViewLegacy::loadTemplate()
+	 * @since   3.9.0
+	 * @throws  Exception
+	 */
+	public function display($tpl = null)
+	{
+		// Initialise variables
+		$this->capabilities = $this->get('Capabilities');
+		$this->state        = $this->get('State');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+
+		$this->sidebar = JHtmlSidebar::render();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function addToolbar()
+	{
+		JToolbarHelper::title(JText::_('COM_PRIVACY_VIEW_CAPABILITIES'), 'lock');
+
+		JToolbarHelper::preferences('com_privacy');
+
+		JToolbarHelper::help('JHELP_COMPONENTS_PRIVACY_CAPABILITIES');
+	}
+}
diff --git a/administrator/components/com_privacy/views/consents/tmpl/default.php b/administrator/components/com_privacy/views/consents/tmpl/default.php
new file mode 100644
index 0000000000000..5aefcae5fb9ff
--- /dev/null
+++ b/administrator/components/com_privacy/views/consents/tmpl/default.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var PrivacyViewConsent $this */
+
+// Load the tooltip behavior.
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$user       = JFactory::getUser();
+$listOrder  = $this->escape($this->state->get('list.ordering'));
+$listDirn   = $this->escape($this->state->get('list.direction'));
+$now        = JFactory::getDate();
+$stateIcons = array(-1 => 'trash', 0 => 'archive', 1 => 'publish');
+$stateMsgs  = array(-1 => JText::_('COM_PRIVACY_CONSENTS_STATE_INVALIDATED'), 0 => JText::_('COM_PRIVACY_CONSENTS_STATE_OBSOLETE'), 1 => JText::_('COM_PRIVACY_CONSENTS_STATE_VALID'));
+
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_privacy&view=consents'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty($this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+	<?php else : ?>
+		<div id="j-main-container">
+	<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<div class="clearfix"> </div>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('COM_PRIVACY_MSG_CONSENTS_NO_CONSENTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="consentList">
+				<thead>
+					<tr>
+						<th width="1%" class="center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_USERNAME', 'u.username', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_PRIVACY_HEADING_USERID', 'a.user_id', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_PRIVACY_HEADING_CONSENTS_SUBJECT', 'a.subject', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap">
+							<?php echo JText::_('COM_PRIVACY_HEADING_CONSENTS_BODY'); ?>
+						</th>
+						<th width="15%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_PRIVACY_HEADING_CONSENTS_CREATED', 'a.created', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="9">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+					<?php foreach ($this->items as $i => $item) : ?>
+						<tr class="row<?php echo $i % 2; ?>">
+							<td class="center">
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							</td>
+							<td>
+								<span class="icon icon-<?php echo $stateIcons[$item->state]; ?>" title="<?php echo $stateMsgs[$item->state]; ?>"></span>
+							</td>
+							<td>
+								<?php echo $item->username; ?>
+							</td>
+							<td>
+								<?php echo $item->user_id; ?>
+							</td>
+							<td>
+								<?php echo JText::_($item->subject); ?>
+							</td>
+							<td>
+								<?php echo $item->body; ?>
+							</td>
+							<td class="break-word">
+								<span class="hasTooltip" title="<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC6')); ?>">
+									<?php echo JHtml::_('date.relative', new JDate($item->created), null, $now); ?>
+								</span>
+							</td>
+							<td class="hidden-phone">
+								<?php echo (int) $item->id; ?>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/administrator/components/com_privacy/views/consents/tmpl/default.xml b/administrator/components/com_privacy/views/consents/tmpl/default.xml
new file mode 100644
index 0000000000000..b36c1cde72aea
--- /dev/null
+++ b/administrator/components/com_privacy/views/consents/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_PRIVACY_CONSENTS_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_PRIVACY_CONSENTS_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/administrator/components/com_privacy/views/consents/view.html.php b/administrator/components/com_privacy/views/consents/view.html.php
new file mode 100644
index 0000000000000..b931c811dc9af
--- /dev/null
+++ b/administrator/components/com_privacy/views/consents/view.html.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Consents view class
+ *
+ * @since  3.9.0
+ */
+class PrivacyViewConsents extends JViewLegacy
+{
+	/**
+	 * The active search tools filters
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 * @note   Must be public to be accessed from the search tools layout
+	 */
+	public $activeFilters;
+
+	/**
+	 * Form instance containing the search tools filter form
+	 *
+	 * @var    JForm
+	 * @since  3.9.0
+	 * @note   Must be public to be accessed from the search tools layout
+	 */
+	public $filterForm;
+
+	/**
+	 * The items to display
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var    JPagination
+	 * @since  3.9.0
+	 */
+	protected $pagination;
+
+	/**
+	 * The HTML markup for the sidebar
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	protected $sidebar;
+
+	/**
+	 * The state information
+	 *
+	 * @var    JObject
+	 * @since  3.9.0
+	 */
+	protected $state;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @see     JViewLegacy::loadTemplate()
+	 * @since   3.9.0
+	 * @throws  Exception
+	 */
+	public function display($tpl = null)
+	{
+		// Initialise variables
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+
+		$this->sidebar = JHtmlSidebar::render();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function addToolbar()
+	{
+		JToolbarHelper::title(JText::_('COM_PRIVACY_VIEW_CONSENTS'), 'lock');
+
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add a button to invalidate a consent
+		$bar->appendButton(
+			'Confirm',
+			'COM_PRIVACY_CONSENTS_TOOLBAR_INVALIDATE_CONFIRM_MSG',
+			'trash',
+			'COM_PRIVACY_CONSENTS_TOOLBAR_INVALIDATE',
+			'consents.invalidate',
+			true
+		);
+
+		// If the filter is restricted to a specific subject, show the "Invalidate all" button
+		if ($this->state->get('filter.subject') != '')
+		{
+			$bar->appendButton(
+				'Confirm',
+				'COM_PRIVACY_CONSENTS_TOOLBAR_INVALIDATE_ALL_CONFIRM_MSG',
+				'cancel',
+				'COM_PRIVACY_CONSENTS_TOOLBAR_INVALIDATE_ALL',
+				'consents.invalidateAll',
+				false
+			);
+		}
+
+		JToolbarHelper::preferences('com_privacy');
+
+		JToolbarHelper::help('JHELP_COMPONENTS_PRIVACY_CONSENTS');
+	}
+}
diff --git a/administrator/components/com_privacy/views/dashboard/tmpl/default.php b/administrator/components/com_privacy/views/dashboard/tmpl/default.php
new file mode 100644
index 0000000000000..16c449c052866
--- /dev/null
+++ b/administrator/components/com_privacy/views/dashboard/tmpl/default.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var PrivacyViewDashboard $this */
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+
+$totalRequests  = 0;
+$activeRequests = 0;
+
+?>
+<?php if (!empty($this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+	<div class="row-fluid">
+		<div class="span6">
+			<div class="well well-small">
+				<h3 class="module-title nav-header"><?php echo JText::_('COM_PRIVACY_DASHBOARD_HEADING_TOTAL_REQUEST_COUNT'); ?></h3>
+				<div class="row-striped">
+					<?php if (count($this->requestCounts)) : ?>
+						<div class="row-fluid">
+							<div class="span5"><strong><?php echo JText::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_TYPE'); ?></strong></div>
+							<div class="span5"><strong><?php echo JText::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_STATUS'); ?></strong></div>
+							<div class="span2"><strong><?php echo JText::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_COUNT'); ?></strong></div>
+						</div>
+						<?php foreach ($this->requestCounts as $row) : ?>
+							<div class="row-fluid">
+								<div class="span5">
+									<a class="hasTooltip" href="<?php echo JRoute::_('index.php?option=com_privacy&view=requests&filter[request_type]=' . $row->request_type . '&filter[status]=' . $row->status); ?>" data-original-title="<?php echo JText::_('COM_PRIVACY_DASHBOARD_VIEW_REQUESTS'); ?>">
+										<strong><?php echo JText::_('COM_PRIVACY_HEADING_REQUEST_TYPE_TYPE_' . $row->request_type); ?></strong>
+									</a>
+								</div>
+								<div class="span5"><?php echo JHtml::_('PrivacyHtml.helper.statusLabel', $row->status); ?></div>
+								<div class="span2"><span class="badge badge-info"><?php echo $row->count; ?></span></div>
+							</div>
+							<?php if (in_array($row->status, array(0, 1))) : ?>
+								<?php $activeRequests += $row->count; ?>
+							<?php endif; ?>
+							<?php $totalRequests += $row->count; ?>
+						<?php endforeach; ?>
+						<div class="row-fluid">
+							<div class="span5"><?php echo JText::plural('COM_PRIVACY_DASHBOARD_BADGE_TOTAL_REQUESTS', $totalRequests); ?></div>
+							<div class="span7"><?php echo JText::plural('COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS', $activeRequests); ?></div>
+						</div>
+					<?php else : ?>
+						<div class="row-fluid">
+							<div class="span12">
+								<div class="alert"><?php echo JText::_('COM_PRIVACY_DASHBOARD_NO_REQUESTS'); ?></div>
+							</div>
+						</div>
+					<?php endif; ?>
+				</div>
+			</div>
+		</div>
+		<div class="span6">
+			<div class="well well-small">
+				<h3 class="module-title nav-header"><?php echo JText::_('COM_PRIVACY_DASHBOARD_HEADING_STATUS_CHECK'); ?></h3>
+				<div class="row-striped">
+					<div class="row-fluid">
+						<div class="span3"><strong><?php echo JText::_('COM_PRIVACY_DASHBOARD_HEADING_STATUS'); ?></strong></div>
+						<div class="span9"><strong><?php echo JText::_('COM_PRIVACY_DASHBOARD_HEADING_CHECK'); ?></strong></div>
+					</div>
+					<div class="row-fluid">
+						<div class="span3">
+							<?php if ($this->privacyPolicyInfo['published'] && $this->privacyPolicyInfo['articlePublished']) : ?>
+								<span class="label label-success">
+									<span class="icon-checkbox" aria-hidden="true"></span>
+									<?php echo JText::_('JPUBLISHED'); ?>
+								</span>
+							<?php elseif ($this->privacyPolicyInfo['published'] && !$this->privacyPolicyInfo['articlePublished']) : ?>
+								<span class="label label-warning">
+									<span class="icon-warning" aria-hidden="true"></span>
+									<?php echo JText::_('JUNPUBLISHED'); ?>
+								</span>
+							<?php else : ?>
+								<span class="label label-warning">
+									<span class="icon-warning" aria-hidden="true"></span>
+									<?php echo JText::_('COM_PRIVACY_STATUS_CHECK_NOT_AVAILABLE'); ?>
+								</span>
+							<?php endif; ?>
+						</div>
+						<div class="span9">
+							<div><?php echo JText::_('COM_PRIVACY_STATUS_CHECK_PRIVACY_POLICY_PUBLISHED'); ?></div>
+							<?php if ($this->privacyPolicyInfo['editLink'] !== '') : ?>
+								<small><a href="<?php echo $this->privacyPolicyInfo['editLink']; ?>"><?php echo JText::_('COM_PRIVACY_EDIT_PRIVACY_POLICY'); ?></a></small>
+							<?php endif; ?>
+						</div>
+					</div>
+					<div class="row-fluid">
+						<div class="span3">
+							<?php if ($this->requestFormPublished['published'] && $this->requestFormPublished['exists']) : ?>
+								<span class="label label-success">
+									<span class="icon-checkbox" aria-hidden="true"></span>
+									<?php echo JText::_('JPUBLISHED'); ?>
+								</span>
+							<?php elseif (!$this->requestFormPublished['published'] && $this->requestFormPublished['exists']) : ?>
+								<span class="label label-warning">
+									<span class="icon-warning" aria-hidden="true"></span>
+									<?php echo JText::_('JUNPUBLISHED'); ?>
+								</span>
+							<?php else : ?>
+								<span class="label label-warning">
+									<span class="icon-warning" aria-hidden="true"></span>
+									<?php echo JText::_('COM_PRIVACY_STATUS_CHECK_NOT_AVAILABLE'); ?>
+								</span>
+							<?php endif; ?>
+						</div>
+						<div class="span9">
+							<div><?php echo JText::_('COM_PRIVACY_STATUS_CHECK_REQUEST_FORM_MENU_ITEM_PUBLISHED'); ?></div>
+							<?php if ($this->requestFormPublished['link'] !== '') : ?>
+								<small><a href="<?php echo $this->requestFormPublished['link']; ?>"><?php echo $this->requestFormPublished['link']; ?></a></small>
+							<?php endif; ?>
+						</div>
+					</div>
+					<div class="row-fluid">
+						<div class="span3">
+							<?php if ($this->numberOfUrgentRequests === 0) : ?>
+								<span class="label label-success">
+									<span class="icon-checkbox" aria-hidden="true"></span>
+									<?php echo JText::_('JNONE'); ?>
+								</span>
+							<?php else : ?>
+								<span class="label label-important">
+									<span class="icon-warning" aria-hidden="true"></span>
+									<?php echo JText::_('WARNING'); ?>
+								</span>
+							<?php endif; ?>
+						</div>
+						<div class="span9">
+							<div><?php echo JText::_('COM_PRIVACY_STATUS_CHECK_OUTSTANDING_URGENT_REQUESTS'); ?></div>
+							<small><?php echo JText::plural('COM_PRIVACY_STATUS_CHECK_OUTSTANDING_URGENT_REQUESTS_DESCRIPTION', $this->urgentRequestDays); ?></small>
+							<?php if ($this->numberOfUrgentRequests > 0) : ?>
+								<small><a href="<?php echo JRoute::_('index.php?option=com_privacy&view=requests&filter[status]=1&list[fullordering]=a.requested_at ASC'); ?>"><?php echo JText::_('COM_PRIVACY_SHOW_URGENT_REQUESTS'); ?></a></small>
+							<?php endif; ?>
+						</div>
+					</div>
+					<div class="row-fluid">
+						<div class="span3">
+							<?php if ($this->sendMailEnabled) : ?>
+								<span class="label label-success">
+									<span class="icon-checkbox" aria-hidden="true"></span>
+									<?php echo JText::_('JENABLED'); ?>
+								</span>
+							<?php else : ?>
+								<span class="label label-important">
+									<span class="icon-warning" aria-hidden="true"></span>
+									<?php echo JText::_('JDISABLED'); ?>
+								</span>
+							<?php endif; ?>
+						</div>
+						<div class="span9">
+							<?php if (!$this->sendMailEnabled) : ?>
+								<div><?php echo JText::_('COM_PRIVACY_STATUS_CHECK_SENDMAIL_DISABLED'); ?></div>
+								<small><?php echo JText::_('COM_PRIVACY_STATUS_CHECK_SENDMAIL_DISABLED_DESCRIPTION'); ?></small>
+							<?php else : ?>
+								<div><?php echo JText::_('COM_PRIVACY_STATUS_CHECK_SENDMAIL_ENABLED'); ?></div>
+							<?php endif; ?>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/administrator/components/com_privacy/views/dashboard/tmpl/default.xml b/administrator/components/com_privacy/views/dashboard/tmpl/default.xml
new file mode 100644
index 0000000000000..f9a24bf36cad4
--- /dev/null
+++ b/administrator/components/com_privacy/views/dashboard/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_PRIVACY_DASHBOARD_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_PRIVACY_DASHBOARD_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/administrator/components/com_privacy/views/dashboard/view.html.php b/administrator/components/com_privacy/views/dashboard/view.html.php
new file mode 100644
index 0000000000000..f9fcd32b54467
--- /dev/null
+++ b/administrator/components/com_privacy/views/dashboard/view.html.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Dashboard view class
+ *
+ * @since  3.9.0
+ */
+class PrivacyViewDashboard extends JViewLegacy
+{
+	/**
+	 * Number of urgent requests based on the component configuration
+	 *
+	 * @var    integer
+	 * @since  3.9.0
+	 */
+	protected $numberOfUrgentRequests;
+
+	/**
+	 * Information about whether a privacy policy is published
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 */
+	protected $privacyPolicyInfo;
+
+	/**
+	 * The request counts
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 */
+	protected $requestCounts;
+
+	/**
+	 * Information about whether a menu item for the request form is published
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 */
+	protected $requestFormPublished;
+
+	/**
+	 * Flag indicating the site supports sending email
+	 *
+	 * @var    boolean
+	 * @since  3.9.0
+	 */
+	protected $sendMailEnabled;
+
+	/**
+	 * The HTML markup for the sidebar
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	protected $sidebar;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @see     JViewLegacy::loadTemplate()
+	 * @since   3.9.0
+	 * @throws  Exception
+	 */
+	public function display($tpl = null)
+	{
+		// Initialise variables
+		$this->privacyPolicyInfo    = $this->get('PrivacyPolicyInfo');
+		$this->requestCounts        = $this->get('RequestCounts');
+		$this->requestFormPublished = $this->get('RequestFormPublished');
+		$this->sendMailEnabled      = (bool) JFactory::getConfig()->get('mailonline', 1);
+
+		/** @var PrivacyModelRequests $requestsModel */
+		$requestsModel = $this->getModel('requests');
+
+		$this->numberOfUrgentRequests = $requestsModel->getNumberUrgentRequests();
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->urgentRequestDays = (int) JComponentHelper::getParams('com_privacy')->get('notify', 14);
+
+		$this->addToolbar();
+
+		$this->sidebar = JHtmlSidebar::render();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function addToolbar()
+	{
+		JToolbarHelper::title(JText::_('COM_PRIVACY_VIEW_DASHBOARD'), 'lock');
+
+		JToolbarHelper::preferences('com_privacy');
+
+		JToolbarHelper::help('JHELP_COMPONENTS_PRIVACY_DASHBOARD');
+	}
+}
diff --git a/administrator/components/com_privacy/views/export/view.xml.php b/administrator/components/com_privacy/views/export/view.xml.php
new file mode 100644
index 0000000000000..dcb1fe5227629
--- /dev/null
+++ b/administrator/components/com_privacy/views/export/view.xml.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('PrivacyHelper', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/privacy.php');
+
+/**
+ * Export view class
+ *
+ * @since  3.9.0
+ *
+ * @property-read   \Joomla\CMS\Document\XmlDocument  $document
+ */
+class PrivacyViewExport extends JViewLegacy
+{
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @see     JViewLegacy::loadTemplate()
+	 * @since   3.9.0
+	 * @throws  Exception
+	 */
+	public function display($tpl = null)
+	{
+		/** @var PrivacyModelExport $model */
+		$model = $this->getModel();
+
+		$exportData = $model->collectDataForExportRequest();
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$requestId = $model->getState($model->getName() . '.request_id');
+
+		// This document should always be downloaded
+		$this->document->setDownload(true);
+		$this->document->setName('export-request-' . $requestId);
+
+		echo PrivacyHelper::renderDataAsXml($exportData);
+	}
+}
diff --git a/administrator/components/com_privacy/views/request/tmpl/default.php b/administrator/components/com_privacy/views/request/tmpl/default.php
new file mode 100644
index 0000000000000..ef1612a3f1e0d
--- /dev/null
+++ b/administrator/components/com_privacy/views/request/tmpl/default.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var PrivacyViewRequest $this */
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+
+$js = <<< JS
+Joomla.submitbutton = function(task) {
+	if (task === 'request.cancel' || document.formvalidator.isValid(document.getElementById('item-form'))) {
+		Joomla.submitform(task, document.getElementById('item-form'));
+	}
+};
+JS;
+
+JFactory::getDocument()->addScriptDeclaration($js);
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_privacy&view=request&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
+	<div class="row-fluid">
+		<div class="span6">
+			<h3><?php echo JText::_('COM_PRIVACY_HEADING_REQUEST_INFORMATION'); ?></h3>
+			<dl class="dl-horizontal">
+				<dt><?php echo JText::_('JGLOBAL_EMAIL'); ?>:</dt>
+				<dd><?php echo $this->item->email; ?></dd>
+
+				<dt><?php echo JText::_('JSTATUS'); ?>:</dt>
+				<dd><?php echo JHtml::_('PrivacyHtml.helper.statusLabel', $this->item->status); ?></dd>
+
+				<dt><?php echo JText::_('COM_PRIVACY_FIELD_REQUEST_TYPE_LABEL'); ?>:</dt>
+				<dd><?php echo JText::_('COM_PRIVACY_HEADING_REQUEST_TYPE_TYPE_' . $this->item->request_type); ?></dd>
+
+				<dt><?php echo JText::_('COM_PRIVACY_FIELD_REQUESTED_AT_LABEL'); ?>:</dt>
+				<dd><?php echo JHtml::_('date', $this->item->requested_at, JText::_('DATE_FORMAT_LC6')); ?></dd>
+			</dl>
+		</div>
+		<div class="span6">
+			<h3><?php echo JText::_('COM_PRIVACY_HEADING_ACTION_LOG'); ?></h3>
+			<?php if (empty($this->actionlogs)) : ?>
+				<div class="alert alert-no-items">
+					<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+				</div>
+			<?php else : ?>
+				<table class="table table-striped table-hover">
+					<thead>
+						<th>
+							<?php echo JText::_('COM_ACTIONLOGS_ACTION'); ?>
+						</th>
+						<th>
+							<?php echo JText::_('COM_ACTIONLOGS_DATE'); ?>
+						</th>
+						<th>
+							<?php echo JText::_('COM_ACTIONLOGS_NAME'); ?>
+						</th>
+					</thead>
+					<tbody>
+						<?php foreach ($this->actionlogs as $i => $item) : ?>
+							<tr class="row<?php echo $i % 2; ?>">
+								<td>
+									<?php echo ActionlogsHelper::getHumanReadableLogMessage($item); ?>
+								</td>
+								<td>
+									<?php echo JHtml::_('date', $item->log_date, JText::_('DATE_FORMAT_LC6')); ?>
+								</td>
+								<td>
+									<?php echo $item->name; ?>
+								</td>
+							</tr>
+						<?php endforeach; ?>
+					</tbody>
+				</table>
+			<?php endif;?>
+		</div>
+	</div>
+
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/administrator/components/com_privacy/views/request/tmpl/edit.php b/administrator/components/com_privacy/views/request/tmpl/edit.php
new file mode 100644
index 0000000000000..d679b04a4e384
--- /dev/null
+++ b/administrator/components/com_privacy/views/request/tmpl/edit.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var PrivacyViewRequest $this */
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('formbehavior.chosen', 'select');
+
+$js = <<< JS
+Joomla.submitbutton = function(task) {
+	if (task === 'request.cancel' || document.formvalidator.isValid(document.getElementById('item-form'))) {
+		Joomla.submitform(task, document.getElementById('item-form'));
+	}
+};
+JS;
+
+JFactory::getDocument()->addScriptDeclaration($js);
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_privacy&view=request&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
+	<div class="form-horizontal">
+		<div class="row-fluid">
+			<div class="span9">
+				<fieldset class="adminform">
+					<?php echo $this->form->renderField('email'); ?>
+					<?php echo $this->form->renderField('status'); ?>
+					<?php echo $this->form->renderField('request_type'); ?>
+				</fieldset>
+			</div>
+		</div>
+
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/administrator/components/com_privacy/views/request/view.html.php b/administrator/components/com_privacy/views/request/view.html.php
new file mode 100644
index 0000000000000..5697a820652e7
--- /dev/null
+++ b/administrator/components/com_privacy/views/request/view.html.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Request view class
+ *
+ * @since  3.9.0
+ */
+class PrivacyViewRequest extends JViewLegacy
+{
+	/**
+	 * The action logs for the item
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 */
+	protected $actionlogs;
+
+	/**
+	 * The form object
+	 *
+	 * @var    JForm
+	 * @since  3.9.0
+	 */
+	protected $form;
+
+	/**
+	 * The item record
+	 *
+	 * @var    JObject
+	 * @since  3.9.0
+	 */
+	protected $item;
+
+	/**
+	 * The state information
+	 *
+	 * @var    JObject
+	 * @since  3.9.0
+	 */
+	protected $state;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @see     JViewLegacy::loadTemplate()
+	 * @since   3.9.0
+	 * @throws  Exception
+	 */
+	public function display($tpl = null)
+	{
+		// Initialise variables.
+		$this->item  = $this->get('Item');
+		$this->state = $this->get('State');
+
+		// Variables only required for the default layout
+		if ($this->getLayout() === 'default')
+		{
+			/** @var ActionlogsModelActionlogs $logsModel */
+			$logsModel = $this->getModel('actionlogs');
+
+			$this->actionlogs = $logsModel->getLogsForItem('com_privacy.request', $this->item->id);
+
+			// Load the com_actionlogs language strings for use in the layout
+			$lang = JFactory::getLanguage();
+			$lang->load('com_actionlogs', JPATH_ADMINISTRATOR, null, false, true)
+				|| $lang->load('com_actionlogs', JPATH_ADMINISTRATOR . '/components/com_actionlogs', null, false, true);
+		}
+
+		// Variables only required for the edit layout
+		if ($this->getLayout() === 'edit')
+		{
+			$this->form = $this->get('Form');
+		}
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication('administrator')->set('hidemainmenu', true);
+
+		// Set the title and toolbar based on the layout
+		if ($this->getLayout() === 'edit')
+		{
+			JToolbarHelper::title(JText::_('COM_PRIVACY_VIEW_REQUEST_ADD_REQUEST'), 'lock');
+
+			JToolbarHelper::apply('request.save');
+			JToolbarHelper::cancel('request.cancel');
+			JToolbarHelper::help('JHELP_COMPONENTS_PRIVACY_REQUEST_EDIT');
+		}
+		else
+		{
+			JToolbarHelper::title(JText::_('COM_PRIVACY_VIEW_REQUEST_SHOW_REQUEST'), 'lock');
+
+			$bar = JToolbar::getInstance('toolbar');
+
+			// Add transition and action buttons based on item status
+			switch ($this->item->status)
+			{
+				case '0':
+					$bar->appendButton('Standard', 'cancel-circle', 'COM_PRIVACY_TOOLBAR_INVALIDATE', 'request.invalidate', false);
+
+					break;
+
+				case '1':
+					$return = '&return=' . base64_encode('index.php?option=com_privacy&view=request&id=' . (int) $this->item->id);
+
+					$bar->appendButton('Standard', 'apply', 'COM_PRIVACY_TOOLBAR_COMPLETE', 'request.complete', false);
+					$bar->appendButton('Standard', 'cancel-circle', 'COM_PRIVACY_TOOLBAR_INVALIDATE', 'request.invalidate', false);
+
+					if ($this->item->request_type === 'export')
+					{
+						JToolbarHelper::link(
+							JRoute::_('index.php?option=com_privacy&task=request.export&format=xml&id=' . (int) $this->item->id . $return),
+							'COM_PRIVACY_ACTION_EXPORT_DATA',
+							'download'
+						);
+
+						if (JFactory::getConfig()->get('mailonline', 1))
+						{
+							JToolbarHelper::link(
+								JRoute::_('index.php?option=com_privacy&task=request.emailexport&id=' . (int) $this->item->id . $return),
+								'COM_PRIVACY_ACTION_EMAIL_EXPORT_DATA',
+								'mail'
+							);
+						}
+					}
+
+					if ($this->item->request_type === 'remove')
+					{
+						$bar->appendButton('Standard', 'delete', 'COM_PRIVACY_ACTION_DELETE_DATA', 'request.remove', false);
+					}
+
+					break;
+
+				// Item is in a "locked" state and cannot transition
+				default:
+					break;
+			}
+
+			JToolbarHelper::cancel('request.cancel', 'JTOOLBAR_CLOSE');
+			JToolbarHelper::help('JHELP_COMPONENTS_PRIVACY_REQUEST');
+		}
+	}
+}
diff --git a/administrator/components/com_privacy/views/requests/tmpl/default.php b/administrator/components/com_privacy/views/requests/tmpl/default.php
new file mode 100644
index 0000000000000..8c053f9038227
--- /dev/null
+++ b/administrator/components/com_privacy/views/requests/tmpl/default.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var PrivacyViewRequests $this */
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/html');
+
+// Load the tooltip behavior.
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$now       = JFactory::getDate();
+
+$urgentRequestDate= clone $now;
+$urgentRequestDate->sub(new DateInterval('P' . $this->urgentRequestAge . 'D'));
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_privacy&view=requests'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty($this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+	<?php else : ?>
+		<div id="j-main-container">
+	<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<div class="clearfix"> </div>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('COM_PRIVACY_MSG_REQUESTS_NO_REQUESTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="requestList">
+				<thead>
+					<tr>
+						<th width="5%" class="nowrap center">
+							<?php echo JText::_('COM_PRIVACY_HEADING_ACTIONS'); ?>
+						</th>
+						<th width="5%" class="nowrap center">
+							<?php echo JText::_('JSTATUS'); ?>
+						</th>
+						<th class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_EMAIL', 'a.email', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_PRIVACY_HEADING_REQUEST_TYPE', 'a.request_type', $listDirn, $listOrder); ?>
+						</th>
+						<th width="20%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_PRIVACY_HEADING_REQUESTED_AT', 'a.requested_at', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="7">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+					<?php foreach ($this->items as $i => $item) : ?>
+						<?php
+						$itemRequestedAt = new JDate($item->requested_at);
+						?>
+						<tr class="row<?php echo $i % 2; ?>">
+							<td class="center">
+								<div class="btn-group">
+									<?php if ($item->status == 1 && $item->request_type === 'export') : ?>
+										<a class="btn btn-micro hasTooltip" href="<?php echo JRoute::_('index.php?option=com_privacy&task=request.export&format=xml&id=' . (int) $item->id); ?>" title="<?php echo JText::_('COM_PRIVACY_ACTION_EXPORT_DATA'); ?>"><span class="icon-download" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('COM_PRIVACY_ACTION_EXPORT_DATA'); ?></span></a>
+										<?php if ($this->sendMailEnabled) : ?>
+											<a class="btn btn-micro hasTooltip" href="<?php echo JRoute::_('index.php?option=com_privacy&task=request.emailexport&id=' . (int) $item->id); ?>" title="<?php echo JText::_('COM_PRIVACY_ACTION_EMAIL_EXPORT_DATA'); ?>"><span class="icon-mail" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('COM_PRIVACY_ACTION_EMAIL_EXPORT_DATA'); ?></span></a>
+										<?php endif; ?>
+									<?php endif; ?>
+									<?php if ($item->status == 1 && $item->request_type === 'remove') : ?>
+										<a class="btn btn-micro hasTooltip" href="<?php echo JRoute::_('index.php?option=com_privacy&task=request.remove&id=' . (int) $item->id); ?>" title="<?php echo JText::_('COM_PRIVACY_ACTION_DELETE_DATA'); ?>"><span class="icon-delete" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('COM_PRIVACY_ACTION_DELETE_DATA'); ?></span></a>
+									<?php endif; ?>
+								</div>
+							</td>
+							<td class="center">
+								<?php echo JHtml::_('PrivacyHtml.helper.statusLabel', $item->status); ?>
+							</td>
+							<td>
+								<?php if ($item->status == 1 && $urgentRequestDate >= $itemRequestedAt) : ?>
+									<span class="pull-right label label-important"><?php echo JText::_('COM_PRIVACY_BADGE_URGENT_REQUEST'); ?></span>
+								<?php endif; ?>
+								<a class="hasTooltip" href="<?php echo JRoute::_('index.php?option=com_privacy&view=request&id=' . (int) $item->id); ?>" title="<?php echo JText::_('COM_PRIVACY_ACTION_VIEW'); ?>">
+									<?php echo JStringPunycode::emailToUTF8($this->escape($item->email)); ?>
+								</a>
+							</td>
+							<td class="break-word">
+								<?php echo JText::_('COM_PRIVACY_HEADING_REQUEST_TYPE_TYPE_' . $item->request_type); ?>
+							</td>
+							<td class="break-word">
+								<span class="hasTooltip" title="<?php echo JHtml::_('date', $item->requested_at, JText::_('DATE_FORMAT_LC6')); ?>">
+									<?php echo JHtml::_('date.relative', $itemRequestedAt, null, $now); ?>
+								</span>
+							</td>
+							<td class="hidden-phone">
+								<?php echo (int) $item->id; ?>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/administrator/components/com_privacy/views/requests/tmpl/default.xml b/administrator/components/com_privacy/views/requests/tmpl/default.xml
new file mode 100644
index 0000000000000..4c624d279a747
--- /dev/null
+++ b/administrator/components/com_privacy/views/requests/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_PRIVACY_REQUESTS_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_PRIVACY_REQUESTS_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/administrator/components/com_privacy/views/requests/view.html.php b/administrator/components/com_privacy/views/requests/view.html.php
new file mode 100644
index 0000000000000..ec94a3f771d07
--- /dev/null
+++ b/administrator/components/com_privacy/views/requests/view.html.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Requests view class
+ *
+ * @since  3.9.0
+ */
+class PrivacyViewRequests extends JViewLegacy
+{
+	/**
+	 * The active search tools filters
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 * @note   Must be public to be accessed from the search tools layout
+	 */
+	public $activeFilters;
+
+	/**
+	 * Form instance containing the search tools filter form
+	 *
+	 * @var    JForm
+	 * @since  3.9.0
+	 * @note   Must be public to be accessed from the search tools layout
+	 */
+	public $filterForm;
+
+	/**
+	 * The items to display
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var    JPagination
+	 * @since  3.9.0
+	 */
+	protected $pagination;
+
+	/**
+	 * Flag indicating the site supports sending email
+	 *
+	 * @var    boolean
+	 * @since  3.9.0
+	 */
+	protected $sendMailEnabled;
+
+	/**
+	 * The HTML markup for the sidebar
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	protected $sidebar;
+
+	/**
+	 * The state information
+	 *
+	 * @var    JObject
+	 * @since  3.9.0
+	 */
+	protected $state;
+
+	/**
+	 * The age of urgent requests
+	 *
+	 * @var    integer
+	 * @since  3.9.0
+	 */
+	protected $urgentRequestAge;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @see     JViewLegacy::loadTemplate()
+	 * @since   3.9.0
+	 * @throws  Exception
+	 */
+	public function display($tpl = null)
+	{
+		// Initialise variables
+		$this->items            = $this->get('Items');
+		$this->pagination       = $this->get('Pagination');
+		$this->state            = $this->get('State');
+		$this->filterForm       = $this->get('FilterForm');
+		$this->activeFilters    = $this->get('ActiveFilters');
+		$this->urgentRequestAge = (int) JComponentHelper::getParams('com_privacy')->get('notify', 14);
+		$this->sendMailEnabled  = (bool) JFactory::getConfig()->get('mailonline', 1);
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+
+		$this->sidebar = JHtmlSidebar::render();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function addToolbar()
+	{
+		JToolbarHelper::title(JText::_('COM_PRIVACY_VIEW_REQUESTS'), 'lock');
+
+		// Requests can only be created if mail sending is enabled
+		if (JFactory::getConfig()->get('mailonline', 1))
+		{
+			JToolbarHelper::addNew('request.add');
+		}
+
+		JToolbarHelper::preferences('com_privacy');
+		JToolbarHelper::help('JHELP_COMPONENTS_PRIVACY_REQUESTS');
+
+	}
+}
diff --git a/administrator/components/com_redirect/Controller/DisplayController.php b/administrator/components/com_redirect/Controller/DisplayController.php
index f58058cee3e67..7bccd7acb4dbc 100644
--- a/administrator/components/com_redirect/Controller/DisplayController.php
+++ b/administrator/components/com_redirect/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/Controller/LinkController.php b/administrator/components/com_redirect/Controller/LinkController.php
index 007006521171f..4ae1097e93f63 100644
--- a/administrator/components/com_redirect/Controller/LinkController.php
+++ b/administrator/components/com_redirect/Controller/LinkController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Redirect\Administrator\Controller;
diff --git a/administrator/components/com_redirect/Controller/LinksController.php b/administrator/components/com_redirect/Controller/LinksController.php
index d4971cb539c32..d3742296af09e 100644
--- a/administrator/components/com_redirect/Controller/LinksController.php
+++ b/administrator/components/com_redirect/Controller/LinksController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,7 +14,6 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -34,7 +33,7 @@ class LinksController extends AdminController
 	public function activate()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$ids     = $this->input->get('cid', array(), 'array');
 		$newUrl  = $this->input->getString('new_url');
@@ -75,7 +74,7 @@ public function activate()
 	public function duplicateUrls()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$ids     = $this->input->get('cid', array(), 'array');
 		$newUrl  = $this->input->getString('new_url');
diff --git a/administrator/components/com_redirect/Extension/RedirectComponent.php b/administrator/components/com_redirect/Extension/RedirectComponent.php
index b9236d650721c..d1dec0c8fc5e3 100644
--- a/administrator/components/com_redirect/Extension/RedirectComponent.php
+++ b/administrator/components/com_redirect/Extension/RedirectComponent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/Field/RedirectField.php b/administrator/components/com_redirect/Field/RedirectField.php
index 11f2daeabfbe9..fa80712861090 100644
--- a/administrator/components/com_redirect/Field/RedirectField.php
+++ b/administrator/components/com_redirect/Field/RedirectField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,11 +11,9 @@
 
 defined('JPATH_BASE') or die;
 
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\HTML\HTMLHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * A dropdown containing all valid HTTP 1.1 response codes.
  *
@@ -23,7 +21,7 @@
  * @subpackage  com_redirect
  * @since       3.4
  */
-class RedirectField extends \JFormFieldList
+class RedirectField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/administrator/components/com_redirect/Helper/RedirectHelper.php b/administrator/components/com_redirect/Helper/RedirectHelper.php
index 7c3c437cdbf91..1a283e7d726c1 100644
--- a/administrator/components/com_redirect/Helper/RedirectHelper.php
+++ b/administrator/components/com_redirect/Helper/RedirectHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/Model/LinkModel.php b/administrator/components/com_redirect/Model/LinkModel.php
index 46115d9c176a2..a096cff3b067b 100644
--- a/administrator/components/com_redirect/Model/LinkModel.php
+++ b/administrator/components/com_redirect/Model/LinkModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/Model/LinksModel.php b/administrator/components/com_redirect/Model/LinksModel.php
index 729784bc893a4..a82e3d9a0661d 100644
--- a/administrator/components/com_redirect/Model/LinksModel.php
+++ b/administrator/components/com_redirect/Model/LinksModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/Service/HTML/Redirect.php b/administrator/components/com_redirect/Service/HTML/Redirect.php
index 747307c150016..170bb4f0d2064 100644
--- a/administrator/components/com_redirect/Service/HTML/Redirect.php
+++ b/administrator/components/com_redirect/Service/HTML/Redirect.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/Table/LinkTable.php b/administrator/components/com_redirect/Table/LinkTable.php
index 392d13003dfc2..865ea9f7e7407 100644
--- a/administrator/components/com_redirect/Table/LinkTable.php
+++ b/administrator/components/com_redirect/Table/LinkTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/View/Link/HtmlView.php b/administrator/components/com_redirect/View/Link/HtmlView.php
index 308e12214c216..1cdf0377b743c 100644
--- a/administrator/components/com_redirect/View/Link/HtmlView.php
+++ b/administrator/components/com_redirect/View/Link/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -91,7 +91,7 @@ protected function addToolbar()
 		// If not checked out, can save the item.
 		if ($canDo->get('core.edit'))
 		{
-			$toolbarButtons[] = ['apply', 'link.apply'];
+			ToolbarHelper::apply('link.apply');
 			$toolbarButtons[] = ['save', 'link.save'];
 		}
 
diff --git a/administrator/components/com_redirect/View/Links/HtmlView.php b/administrator/components/com_redirect/View/Links/HtmlView.php
index e201d9b6ef3de..cbd41f6cbaba1 100644
--- a/administrator/components/com_redirect/View/Links/HtmlView.php
+++ b/administrator/components/com_redirect/View/Links/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/helpers/redirect.php b/administrator/components/com_redirect/helpers/redirect.php
index c54f0a5e2e1e3..831bfc9be2cfb 100644
--- a/administrator/components/com_redirect/helpers/redirect.php
+++ b/administrator/components/com_redirect/helpers/redirect.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/layouts/toolbar/batch.php b/administrator/components/com_redirect/layouts/toolbar/batch.php
index bd0539e24eb45..86a5fc22b691d 100644
--- a/administrator/components/com_redirect/layouts/toolbar/batch.php
+++ b/administrator/components/com_redirect/layouts/toolbar/batch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/redirect.xml b/administrator/components/com_redirect/redirect.xml
index f093ef5f98c57..edaa5c74ca2e1 100644
--- a/administrator/components/com_redirect/redirect.xml
+++ b/administrator/components/com_redirect/redirect.xml
@@ -3,7 +3,7 @@
 	<name>com_redirect</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_redirect/services/provider.php b/administrator/components/com_redirect/services/provider.php
index c01730f15e3a6..67c2a2b4f923f 100644
--- a/administrator/components/com_redirect/services/provider.php
+++ b/administrator/components/com_redirect/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/tmpl/link/edit.php b/administrator/components/com_redirect/tmpl/link/edit.php
index c86cc049dcbbd..c9250f93ab5fb 100644
--- a/administrator/components/com_redirect/tmpl/link/edit.php
+++ b/administrator/components/com_redirect/tmpl/link/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/tmpl/links/default.php b/administrator/components/com_redirect/tmpl/links/default.php
index fb883e673988f..f561719658cbe 100644
--- a/administrator/components/com_redirect/tmpl/links/default.php
+++ b/administrator/components/com_redirect/tmpl/links/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/tmpl/links/default_addform.php b/administrator/components/com_redirect/tmpl/links/default_addform.php
index 970571b9f64f6..2e862d5287248 100644
--- a/administrator/components/com_redirect/tmpl/links/default_addform.php
+++ b/administrator/components/com_redirect/tmpl/links/default_addform.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/tmpl/links/default_batch_body.php b/administrator/components/com_redirect/tmpl/links/default_batch_body.php
index ff807d26ea428..7922034ac9057 100644
--- a/administrator/components/com_redirect/tmpl/links/default_batch_body.php
+++ b/administrator/components/com_redirect/tmpl/links/default_batch_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_redirect/tmpl/links/default_batch_footer.php b/administrator/components/com_redirect/tmpl/links/default_batch_footer.php
index e79a29bd36e11..e96641eff2cfe 100644
--- a/administrator/components/com_redirect/tmpl/links/default_batch_footer.php
+++ b/administrator/components/com_redirect/tmpl/links/default_batch_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -11,9 +11,9 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<a class="btn btn-secondary" data-dismiss="modal" type="button" onclick="document.getElementById('batch_urls').value='';">
+<button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="document.getElementById('batch_urls').value='';">
 	<?php echo Text::_('JCANCEL'); ?>
-</a>
-<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('links.batch');">
+</button>
+<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('links.batch');">
 	<?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?>
 </button>
diff --git a/administrator/components/com_search/Controller/DisplayController.php b/administrator/components/com_search/Controller/DisplayController.php
index df2081c380230..8f8ca6dac18a1 100644
--- a/administrator/components/com_search/Controller/DisplayController.php
+++ b/administrator/components/com_search/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_search/Controller/SearchesController.php b/administrator/components/com_search/Controller/SearchesController.php
index 7abbcf45fe902..3f26502a4f3da 100644
--- a/administrator/components/com_search/Controller/SearchesController.php
+++ b/administrator/components/com_search/Controller/SearchesController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,9 +11,7 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Session\Session;
 
 /**
  * Methods supporting a list of search terms.
@@ -30,7 +28,7 @@ class SearchesController extends BaseController
 	public function reset()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$model = $this->getModel('Searches');
 
@@ -50,7 +48,7 @@ public function reset()
 	public function toggleResults()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		if ($this->getModel('Searches')->getState('show_results', 1, 'int') === 0)
 		{
diff --git a/administrator/components/com_search/Helper/SearchHelper.php b/administrator/components/com_search/Helper/SearchHelper.php
index 1b2ce5a8143b6..a1f47055312d6 100644
--- a/administrator/components/com_search/Helper/SearchHelper.php
+++ b/administrator/components/com_search/Helper/SearchHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_search/Model/SearchesModel.php b/administrator/components/com_search/Model/SearchesModel.php
index b3695184f1c38..c9a5ffa87eebf 100644
--- a/administrator/components/com_search/Model/SearchesModel.php
+++ b/administrator/components/com_search/Model/SearchesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_search/View/Searches/HtmlView.php b/administrator/components/com_search/View/Searches/HtmlView.php
index 825d901257d77..65da00604e0cc 100644
--- a/administrator/components/com_search/View/Searches/HtmlView.php
+++ b/administrator/components/com_search/View/Searches/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_search/helpers/search.php b/administrator/components/com_search/helpers/search.php
index d0f01899ed33e..8b74a51cbdd4b 100644
--- a/administrator/components/com_search/helpers/search.php
+++ b/administrator/components/com_search/helpers/search.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_search/helpers/site.php b/administrator/components/com_search/helpers/site.php
index 0b3c2ec7aa3d3..80c83421e111f 100644
--- a/administrator/components/com_search/helpers/site.php
+++ b/administrator/components/com_search/helpers/site.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_search/search.xml b/administrator/components/com_search/search.xml
index d00812b49a027..387e1f44ba9c2 100644
--- a/administrator/components/com_search/search.xml
+++ b/administrator/components/com_search/search.xml
@@ -3,7 +3,7 @@
 	<name>com_search</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_search/services/provider.php b/administrator/components/com_search/services/provider.php
index bbdc52b6e4e92..d1c394fdeecf3 100644
--- a/administrator/components/com_search/services/provider.php
+++ b/administrator/components/com_search/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_search/tmpl/searches/default.php b/administrator/components/com_search/tmpl/searches/default.php
index aa2c0eec6fa7a..a40122f545725 100644
--- a/administrator/components/com_search/tmpl/searches/default.php
+++ b/administrator/components/com_search/tmpl/searches/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/Controller/DisplayController.php b/administrator/components/com_tags/Controller/DisplayController.php
index 468d6532ee757..3721d2b4f5495 100644
--- a/administrator/components/com_tags/Controller/DisplayController.php
+++ b/administrator/components/com_tags/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/Controller/TagController.php b/administrator/components/com_tags/Controller/TagController.php
index 2c78bd305655b..3cbe617c4edf5 100644
--- a/administrator/components/com_tags/Controller/TagController.php
+++ b/administrator/components/com_tags/Controller/TagController.php
@@ -3,16 +3,14 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Tags\Administrator\Controller;
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\Session\Session;
 
 /**
  * The Tag Controller
@@ -62,7 +60,7 @@ protected function allowEdit($data = array(), $key = 'id')
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Set the model
 		$model = $this->getModel('Tag');
diff --git a/administrator/components/com_tags/Controller/TagsController.php b/administrator/components/com_tags/Controller/TagsController.php
index 9be5004aec438..6c1e2beef8fbb 100644
--- a/administrator/components/com_tags/Controller/TagsController.php
+++ b/administrator/components/com_tags/Controller/TagsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -48,7 +48,7 @@ public function getModel($name = 'Tag', $prefix = 'Administrator', $config = arr
 	 */
 	public function rebuild()
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$this->setRedirect(Route::_('index.php?option=com_tags&view=tags', false));
 
diff --git a/administrator/components/com_tags/Model/TagModel.php b/administrator/components/com_tags/Model/TagModel.php
index 4b059d3bc8396..643aabbfb5c66 100644
--- a/administrator/components/com_tags/Model/TagModel.php
+++ b/administrator/components/com_tags/Model/TagModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/Model/TagsModel.php b/administrator/components/com_tags/Model/TagsModel.php
index 9b42df9b2631c..e7dbbbbad3155 100644
--- a/administrator/components/com_tags/Model/TagsModel.php
+++ b/administrator/components/com_tags/Model/TagsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/Table/TagTable.php b/administrator/components/com_tags/Table/TagTable.php
index 9344c202432fb..85f1d25f98a07 100644
--- a/administrator/components/com_tags/Table/TagTable.php
+++ b/administrator/components/com_tags/Table/TagTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/View/Tag/HtmlView.php b/administrator/components/com_tags/View/Tag/HtmlView.php
index ada929ab01ee9..4951f3234eeba 100644
--- a/administrator/components/com_tags/View/Tag/HtmlView.php
+++ b/administrator/components/com_tags/View/Tag/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -108,9 +108,9 @@ protected function addToolbar()
 		// Build the actions for new and existing records.
 		if ($isNew)
 		{
+			ToolbarHelper::apply('tag.apply');
 			ToolbarHelper::saveGroup(
 				[
-					['apply', 'tag.apply'],
 					['save', 'tag.save'],
 					['save2new', 'tag.save2new']
 				],
@@ -129,7 +129,7 @@ protected function addToolbar()
 			// Can't save the record if it's checked out and editable
 			if (!$checkedOut && $itemEditable)
 			{
-				$toolbarButtons[] = ['apply', 'tag.apply'];
+				ToolbarHelper::apply('tag.apply');
 				$toolbarButtons[] = ['save', 'tag.save'];
 
 				// We can save this record, but check the create permission to see if we can return to make a new one.
diff --git a/administrator/components/com_tags/View/Tags/HtmlView.php b/administrator/components/com_tags/View/Tags/HtmlView.php
index 3f6dcc2f42de8..a36882182b375 100644
--- a/administrator/components/com_tags/View/Tags/HtmlView.php
+++ b/administrator/components/com_tags/View/Tags/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/config.xml b/administrator/components/com_tags/config.xml
index 2361a898cf965..1117a2c9c4d45 100644
--- a/administrator/components/com_tags/config.xml
+++ b/administrator/components/com_tags/config.xml
@@ -35,8 +35,8 @@
 			showon="save_history:1"
 		/>
 
-		<field 
-			name="show_tag_title" 
+		<field
+			name="show_tag_title"
 			type="radio"
 			label="COM_TAGS_SHOW_TAG_TITLE_LABEL"
 			class="switcher"
@@ -46,8 +46,8 @@
 			<option value="1">JSHOW</option>
 		</field>
 
-		<field 
-			name="tag_list_show_tag_image" 
+		<field
+			name="tag_list_show_tag_image"
 			type="radio"
 			label="COM_TAGS_SHOW_TAG_IMAGE_LABEL"
 			class="switcher"
@@ -57,8 +57,8 @@
 			<option value="1">JSHOW</option>
 		</field>
 
-		<field 
-			name="tag_list_show_tag_description" 
+		<field
+			name="tag_list_show_tag_description"
 			type="radio"
 			label="COM_TAGS_SHOW_TAG_DESCRIPTION_LABEL"
 			class="switcher"
@@ -68,12 +68,12 @@
 			<option value="1">JSHOW</option>
 		</field>
 
-		<field 
-			name="tag_list_image" 
+		<field
+			name="tag_list_image"
 			type="media"
 			label="COM_TAGS_TAG_LIST_MEDIA_LABEL"
 		/>
-	
+
 		<field
 			name="tag_list_orderby"
 			type="list"
@@ -87,8 +87,8 @@
 			<option value="c.core_publish_up">JGLOBAL_PUBLISHED_DATE</option>
 		</field>
 
-		<field 
-			name="tag_list_orderby_direction" 
+		<field
+			name="tag_list_orderby_direction"
 			type="radio"
 			label="JGLOBAL_ORDER_DIRECTION_LABEL"
 			class="switcher switcher-primary"
@@ -98,8 +98,8 @@
 			<option value="DESC">JGLOBAL_ORDER_DESCENDING</option>
 		</field>
 
-		<field 
-			name="show_headings" 
+		<field
+			name="show_headings"
 			type="radio"
 			label="COM_TAGS_TAG_LIST_SHOW_HEADINGS_LABEL"
 			class="switcher"
@@ -109,7 +109,7 @@
 			<option value="1">JSHOW</option>
 		</field>
 
-		<field 
+		<field
 			name="tag_list_show_date"
 			type="list"
 			label="COM_TAGS_TAG_LIST_SHOW_DATE_LABEL"
@@ -121,8 +121,8 @@
 			<option value="published">JPUBLISHED</option>
 		</field>
 
-		<field 
-			name="tag_list_show_item_image" 
+		<field
+			name="tag_list_show_item_image"
 			type="radio"
 			label="COM_TAGS_SHOW_ITEM_IMAGE_LABEL"
 			class="switcher"
@@ -131,9 +131,9 @@
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
 		</field>
-		
-		<field 
-			name="tag_list_show_item_description" 
+
+		<field
+			name="tag_list_show_item_description"
 			type="radio"
 			label="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_LABEL"
 			class="switcher"
@@ -141,7 +141,7 @@
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
 		</field>
-		
+
 		<field
 			name="tag_list_item_maximum_characters"
 			type="number"
@@ -151,7 +151,7 @@
 		/>
 
 	</fieldset>
-	
+
 	<fieldset
 		name="tagselection"
 		label="COM_TAGS_CONFIG_SELECTION_SETTINGS_LABEL"
@@ -167,8 +167,8 @@
 			default="3"
 		/>
 
-		<field 
-			name="return_any_or_all" 
+		<field
+			name="return_any_or_all"
 			type="radio"
 			label="COM_TAGS_SEARCH_TYPE_LABEL"
 			class="switcher switcher-primary"
@@ -177,9 +177,9 @@
 			<option value="0">COM_TAGS_ALL</option>
 			<option value="1">COM_TAGS_ANY</option>
 		</field>
-		
-		<field 
-			name="include_children" 
+
+		<field
+			name="include_children"
 			type="radio"
 			label="COM_TAGS_INCLUDE_CHILDREN_LABEL"
 			class="switcher"
@@ -188,7 +188,7 @@
 			<option value="0">COM_TAGS_EXCLUDE</option>
 			<option value="1">COM_TAGS_INCLUDE</option>
 		</field>
-		
+
 		<field
 			name="maximum"
 			type="number"
@@ -196,8 +196,8 @@
 			default="200"
 			filter="integer"
 		/>
-		
-		<field 
+
+		<field
 			name="tag_list_language_filter"
 			type="contentlanguage"
 			label="COM_TAGS_FIELD_LANGUAGE_FILTER_LABEL"
@@ -206,8 +206,8 @@
 			<option value="all">JALL</option>
 			<option value="current_language">JCURRENT</option>
 		</field>
-		
-	</fieldset>	
+
+	</fieldset>
 
 	<fieldset
 		name="alltags"
@@ -215,7 +215,7 @@
 		description="COM_TAGS_CONFIG_ALL_TAGS_SETTINGS_DESC">
 
 		<field
-			name="tags_layout" 
+			name="tags_layout"
 			type="componentlayout"
 			label="COM_TAGS_CONFIG_ALL_TAGS_FIELD_LAYOUT_LABEL"
 			class="custom-select"
@@ -224,7 +224,7 @@
 			view="tags"
 		/>
 
-		<field 
+		<field
 			name="all_tags_orderby"
 			type="list"
 			label="JGLOBAL_FIELD_FIELD_ORDERING_LABEL"
@@ -237,8 +237,8 @@
 			<option value="publish_up">JGLOBAL_PUBLISHED_DATE</option>
 		</field>
 
-		<field 
-			name="all_tags_orderby_direction" 
+		<field
+			name="all_tags_orderby_direction"
 			type="radio"
 			label="JGLOBAL_ORDER_DIRECTION_LABEL"
 			class="switcher switcher-primary"
@@ -248,8 +248,9 @@
 			<option value="DESC">JGLOBAL_ORDER_DESCENDING</option>
 		</field>
 
-		<field 
-			name="all_tags_show_tag_image" 
+		<field
+			name="all_tags_show_tag_image"
+			type="radio"
 			label="COM_TAGS_SHOW_ITEM_IMAGE_LABEL"
 			class="switcher"
 			default="1"
@@ -258,8 +259,9 @@
 			<option value="1">JSHOW</option>
 		</field>
 
-		<field 
-			name="all_tags_show_tag_descripion" 
+		<field
+			name="all_tags_show_tag_descripion"
+			type="radio"
 			label="COM_TAGS_SHOW_ITEM_DESCRIPTION_LABEL"
 			class="switcher"
 			default="1"
@@ -267,7 +269,7 @@
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
 		</field>
-		
+
 		<field
 			name="all_tags_tag_maximum_characters"
 			type="number"
@@ -275,9 +277,9 @@
 			filter="integer"
 			showon="all_tags_show_tag_descripion:1"
 		/>
-		
-		<field 
-			name="all_tags_show_tag_hits" 
+
+		<field
+			name="all_tags_show_tag_hits"
 			type="radio"
 			label="JGLOBAL_HITS"
 			class="switcher"
@@ -293,7 +295,7 @@
 		name="shared"
 		label="COM_TAGS_CONFIG_SHARED_SETTINGS_LABEL"
 		description="COM_TAGS_CONFIG_SHARED_SETTINGS_DESC">
-		
+
 		<field
 			name="filter_field"
 			type="radio"
@@ -305,8 +307,8 @@
 			<option value="1">JSHOW</option>
 		</field>
 
-		<field 
-			name="show_pagination_limit" 
+		<field
+			name="show_pagination_limit"
 			type="radio"
 			label="JGLOBAL_DISPLAY_SELECT_LABEL"
 			default="1"
@@ -316,8 +318,8 @@
 			<option value="1">JSHOW</option>
 		</field>
 
-		<field 
-			name="show_pagination" 
+		<field
+			name="show_pagination"
 			type="list"
 			label="JGLOBAL_PAGINATION_LABEL"
 			default="2"
@@ -338,16 +340,16 @@
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
 		</field>
-		
+
 	</fieldset>
-	
+
 	<fieldset
 		name="data_entry"
 		label="COM_TAGS_CONFIG_DATA_ENTRY_SETTINGS_LABEL"
 		description="COM_TAGS_CONFIG_DATA_ENTRY_SETTINGS_DESC">
-		
-		<field 
-			name="tag_field_ajax_mode" 
+
+		<field
+			name="tag_field_ajax_mode"
 			type="radio"
 			label="COM_TAGS_TAG_FIELD_MODE_LABEL"
 			class="switcher"
@@ -358,8 +360,8 @@
 		</field>
 
 	</fieldset>
-	
-	<fieldset 
+
+	<fieldset
 		name="integration"
 		label="JGLOBAL_INTEGRATION_LABEL"
 		description="COM_TAGS_CONFIG_INTEGRATION_SETTINGS_DESC"
diff --git a/administrator/components/com_tags/forms/tag.xml b/administrator/components/com_tags/forms/tag.xml
index 094567d30c9b0..2bbb7510a3d1a 100644
--- a/administrator/components/com_tags/forms/tag.xml
+++ b/administrator/components/com_tags/forms/tag.xml
@@ -136,6 +136,7 @@
 		name="alias"
 		type="text"
 		label="JFIELD_ALIAS_LABEL"
+		hint="JFIELD_ALIAS_PLACEHOLDER"
 		size="40"
 	/>
 
@@ -192,7 +193,7 @@
 		<option value="*">JALL</option>
 	</field>
 
-	<field 
+	<field
 		name="version_note"
 		type="text"
 		label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
diff --git a/administrator/components/com_tags/services/provider.php b/administrator/components/com_tags/services/provider.php
index c3741e771feb1..307557e476474 100644
--- a/administrator/components/com_tags/services/provider.php
+++ b/administrator/components/com_tags/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/tags.xml b/administrator/components/com_tags/tags.xml
index a03f7ac1788fc..19388b5f35bd9 100644
--- a/administrator/components/com_tags/tags.xml
+++ b/administrator/components/com_tags/tags.xml
@@ -3,7 +3,7 @@
 	<name>com_tags</name>
 	<author>Joomla! Project</author>
 	<creationDate>December 2013</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_tags/tmpl/tag/edit.php b/administrator/components/com_tags/tmpl/tag/edit.php
index 93839e3dfb376..ec5c7e31270a4 100644
--- a/administrator/components/com_tags/tmpl/tag/edit.php
+++ b/administrator/components/com_tags/tmpl/tag/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -35,7 +35,8 @@
 		<div class="row">
 			<div class="col-md-9">
 				<div class="form-vertical">
-					<?php echo $this->form->renderField('description'); ?>
+					<?php echo $this->form->getLabel('description'); ?>
+					<?php echo $this->form->getInput('description'); ?>
 				</div>
 			</div>
 			<div class="col-md-3">
diff --git a/administrator/components/com_tags/tmpl/tag/edit_metadata.php b/administrator/components/com_tags/tmpl/tag/edit_metadata.php
index 45e13c468cdb3..6d414fccd0cef 100644
--- a/administrator/components/com_tags/tmpl/tag/edit_metadata.php
+++ b/administrator/components/com_tags/tmpl/tag/edit_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/tmpl/tag/edit_options.php b/administrator/components/com_tags/tmpl/tag/edit_options.php
index 3098d80dac10d..42d20cad72ce9 100644
--- a/administrator/components/com_tags/tmpl/tag/edit_options.php
+++ b/administrator/components/com_tags/tmpl/tag/edit_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/tmpl/tags/default.php b/administrator/components/com_tags/tmpl/tags/default.php
index 00a178877ccc7..a8f6ca78d2903 100644
--- a/administrator/components/com_tags/tmpl/tags/default.php
+++ b/administrator/components/com_tags/tmpl/tags/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/tmpl/tags/default_batch_body.php b/administrator/components/com_tags/tmpl/tags/default_batch_body.php
index 28d008c6f06a4..0cace11f96614 100644
--- a/administrator/components/com_tags/tmpl/tags/default_batch_body.php
+++ b/administrator/components/com_tags/tmpl/tags/default_batch_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_tags/tmpl/tags/default_batch_footer.php b/administrator/components/com_tags/tmpl/tags/default_batch_footer.php
index 8952a5005a713..a1d78e7df89e6 100644
--- a/administrator/components/com_tags/tmpl/tags/default_batch_footer.php
+++ b/administrator/components/com_tags/tmpl/tags/default_batch_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -11,9 +11,9 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<a class="btn btn-secondary" type="button" onclick="document.getElementById('batch-tag-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
+<button type="button" class="btn btn-secondary" type="button" onclick="document.getElementById('batch-tag-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
 	<?php echo Text::_('JCANCEL'); ?>
-</a>
-<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('tag.batch');">
+</button>
+<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('tag.batch');">
 	<?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?>
-</button>
\ No newline at end of file
+</button>
diff --git a/administrator/components/com_templates/Controller/DisplayController.php b/administrator/components/com_templates/Controller/DisplayController.php
index 65d7d567ac34d..50d2b04df1752 100644
--- a/administrator/components/com_templates/Controller/DisplayController.php
+++ b/administrator/components/com_templates/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/Controller/StyleController.php b/administrator/components/com_templates/Controller/StyleController.php
index baa8e827e895b..3cce8bf6052c6 100644
--- a/administrator/components/com_templates/Controller/StyleController.php
+++ b/administrator/components/com_templates/Controller/StyleController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Templates\Administrator\Controller;
@@ -13,7 +13,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\Session\Session;
 
 /**
  * Template style controller class.
@@ -42,10 +41,7 @@ class StyleController extends FormController
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		if (!Session::checkToken())
-		{
-			Factory::getApplication()->redirect('index.php', Text::_('JINVALID_TOKEN'));
-		}
+		$this->checkToken();
 
 		$document = Factory::getDocument();
 
diff --git a/administrator/components/com_templates/Controller/StylesController.php b/administrator/components/com_templates/Controller/StylesController.php
index b9439a1b196f9..c699aca8404ee 100644
--- a/administrator/components/com_templates/Controller/StylesController.php
+++ b/administrator/components/com_templates/Controller/StylesController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,7 +14,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -32,7 +31,7 @@ class StylesController extends AdminController
 	public function duplicate()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$pks = $this->input->post->get('cid', array(), 'array');
 
@@ -83,7 +82,7 @@ public function getModel($name = 'Style', $prefix = 'Administrator', $config = a
 	public function setDefault()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$pks = $this->input->post->get('cid', array(), 'array');
 
@@ -122,7 +121,7 @@ public function setDefault()
 	public function unsetDefault()
 	{
 		// Check for request forgeries
-		Session::checkToken('request') or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken('request');
 
 		$pks = $this->input->get->get('cid', array(), 'array');
 		$pks = ArrayHelper::toInteger($pks);
diff --git a/administrator/components/com_templates/Controller/TemplateController.php b/administrator/components/com_templates/Controller/TemplateController.php
index bf5ddc2fd53a2..046e4afcbafe7 100644
--- a/administrator/components/com_templates/Controller/TemplateController.php
+++ b/administrator/components/com_templates/Controller/TemplateController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -72,7 +72,6 @@ public function cancel()
 	 */
 	public function close()
 	{
-		$app  = Factory::getApplication();
 		$file = base64_encode('home');
 		$id   = $this->input->get('id');
 		$url  = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
@@ -89,9 +88,8 @@ public function close()
 	public function publish()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
-		$app  = Factory::getApplication();
 		$file = $this->input->get('file');
 		$id   = $this->input->get('id');
 
@@ -147,7 +145,7 @@ public function publish()
 	public function copy()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$app = $this->app;
 		$this->input->set('installtype', 'folder');
@@ -282,7 +280,7 @@ protected function allowSave()
 	public function save()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$data         = $this->input->post->get('jform', array(), 'array');
 		$task         = $this->getTask();
@@ -425,7 +423,7 @@ public function overrides()
 	public function delete()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		/* @var \Joomla\Component\Templates\Administrator\Model\TemplateModel $model */
 		$model = $this->getModel();
@@ -464,7 +462,7 @@ public function delete()
 	public function createFile()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		/* @var \Joomla\Component\Templates\Administrator\Model\TemplateModel $model */
 		$model    = $this->getModel();
@@ -511,7 +509,7 @@ public function createFile()
 	public function uploadFile()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		/* @var \Joomla\Component\Templates\Administrator\Model\TemplateModel $model */
 		$model    = $this->getModel();
@@ -545,7 +543,7 @@ public function uploadFile()
 	public function createFolder()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		/* @var \Joomla\Component\Templates\Administrator\Model\TemplateModel $model */
 		$model    = $this->getModel();
@@ -584,7 +582,7 @@ public function createFolder()
 	public function deleteFolder()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		/* @var \Joomla\Component\Templates\Administrator\Model\TemplateModel $model */
 		$model    = $this->getModel();
@@ -628,7 +626,7 @@ public function deleteFolder()
 	public function renameFile()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		/* @var \Joomla\Component\Templates\Administrator\Model\TemplateModel $model */
 		$model   = $this->getModel();
@@ -742,7 +740,7 @@ public function resizeImage()
 	public function copyFile()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$id       = $this->input->get('id');
 		$file     = $this->input->get('file');
@@ -781,7 +779,7 @@ public function copyFile()
 	public function extractArchive()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$id    = $this->input->get('id');
 		$file  = $this->input->get('file');
@@ -818,7 +816,7 @@ public function ajax()
 		{
 			$app->setHeader('status', 403, true);
 			$app->sendHeaders();
-			echo Text::_('JINVALID_TOKEN');
+			echo Text::_('JINVALID_TOKEN_NOTICE');
 			$app->close();
 		}
 
diff --git a/administrator/components/com_templates/Extension/TemplatesComponent.php b/administrator/components/com_templates/Extension/TemplatesComponent.php
index 3095e34d0bf30..5ef96e3cf3ce9 100644
--- a/administrator/components/com_templates/Extension/TemplatesComponent.php
+++ b/administrator/components/com_templates/Extension/TemplatesComponent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/Field/TemplatelocationField.php b/administrator/components/com_templates/Field/TemplatelocationField.php
index 53555ba4d8fb8..2e1e1a8125fa1 100644
--- a/administrator/components/com_templates/Field/TemplatelocationField.php
+++ b/administrator/components/com_templates/Field/TemplatelocationField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,17 +11,15 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\Component\Templates\Administrator\Helper\TemplatesHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Template Location field.
  *
  * @since  3.5
  */
-class TemplatelocationField extends \JFormFieldList
+class TemplatelocationField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/administrator/components/com_templates/Field/TemplatenameField.php b/administrator/components/com_templates/Field/TemplatenameField.php
index b676e52f9b9a8..b168ea80a503c 100644
--- a/administrator/components/com_templates/Field/TemplatenameField.php
+++ b/administrator/components/com_templates/Field/TemplatenameField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,17 +12,15 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\Component\Templates\Administrator\Helper\TemplatesHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Template Name field.
  *
  * @since  3.5
  */
-class TemplatenameField extends \JFormFieldList
+class TemplatenameField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/administrator/components/com_templates/Helper/TemplateHelper.php b/administrator/components/com_templates/Helper/TemplateHelper.php
index 7b06fb2772ead..bd7fcabe7d8d1 100644
--- a/administrator/components/com_templates/Helper/TemplateHelper.php
+++ b/administrator/components/com_templates/Helper/TemplateHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/Helper/TemplatesHelper.php b/administrator/components/com_templates/Helper/TemplatesHelper.php
index 677a8ae11ee3e..cbd022b9e55d9 100644
--- a/administrator/components/com_templates/Helper/TemplatesHelper.php
+++ b/administrator/components/com_templates/Helper/TemplatesHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/Model/StyleModel.php b/administrator/components/com_templates/Model/StyleModel.php
index cd9b6323b55ff..bda0477881cf7 100644
--- a/administrator/components/com_templates/Model/StyleModel.php
+++ b/administrator/components/com_templates/Model/StyleModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/Model/StylesModel.php b/administrator/components/com_templates/Model/StylesModel.php
index 3cb97a9dff614..e98cc382fb85f 100644
--- a/administrator/components/com_templates/Model/StylesModel.php
+++ b/administrator/components/com_templates/Model/StylesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index df8c05c7fc629..e46b7fbdc476f 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -1021,6 +1021,7 @@ public function getOverridesList()
 			$client        = ApplicationHelper::getClientInfo($template->client_id);
 			$componentPath = Path::clean($client->path . '/components/');
 			$modulePath    = Path::clean($client->path . '/modules/');
+			$pluginPath    = Path::clean(JPATH_ROOT . '/plugins/');
 			$layoutPath    = Path::clean(JPATH_ROOT . '/layouts/');
 			$components    = Folder::folders($componentPath);
 
@@ -1062,6 +1063,18 @@ public function getOverridesList()
 				}
 			}
 
+			foreach (Folder::folders($pluginPath) as $pluginGroup)
+			{
+				foreach (Folder::folders($pluginPath . '/' . $pluginGroup) as $plugin)
+				{
+					if (file_exists($pluginPath . '/' . $pluginGroup . '/' . $plugin . '/tmpl/'))
+					{
+						$pluginLayoutPath = Path::clean($pluginPath . '/' . $pluginGroup . '/');
+						$result['plugins'][$pluginGroup][] = $this->getOverridesFolder($plugin, $pluginLayoutPath);
+					}
+				}
+			}
+
 			$modules = Folder::folders($modulePath);
 
 			foreach ($modules as $module)
@@ -1145,6 +1158,12 @@ public function createOverride($override)
 					$htmlPath = Path::clean($client->path . '/templates/' . $template->element . '/html/' . $url);
 				}
 			}
+			elseif (stripos($override, Path::clean(JPATH_ROOT . '/plugins/')) === 0)
+			{
+				$size       = count($explodeArray);
+				$layoutPath = Path::clean('plg_' . $explodeArray[$size - 2] . '_' . $explodeArray[$size - 1]);
+				$htmlPath   = Path::clean($client->path . '/templates/' . $template->element . '/html/' . $layoutPath);
+			}
 			else
 			{
 				$layoutPath = implode('/', array_slice($explodeArray, -2));
@@ -1178,6 +1197,10 @@ public function createOverride($override)
 
 				$return = $this->createTemplateOverride(Path::clean($path), $htmlPath);
 			}
+			elseif (stripos($override, Path::clean(JPATH_ROOT . '/plugins/')) === 0)
+			{
+				$return = $this->createTemplateOverride(Path::clean($override . '/tmpl'), $htmlPath);
+			}
 			else
 			{
 				$return = $this->createTemplateOverride($override, $htmlPath);
diff --git a/administrator/components/com_templates/Model/TemplatesModel.php b/administrator/components/com_templates/Model/TemplatesModel.php
index b9fbe4450adb8..97b19cb4f98df 100644
--- a/administrator/components/com_templates/Model/TemplatesModel.php
+++ b/administrator/components/com_templates/Model/TemplatesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/Service/HTML/Templates.php b/administrator/components/com_templates/Service/HTML/Templates.php
index 3f5bf0924418b..f95057d2be6a1 100644
--- a/administrator/components/com_templates/Service/HTML/Templates.php
+++ b/administrator/components/com_templates/Service/HTML/Templates.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/Table/StyleTable.php b/administrator/components/com_templates/Table/StyleTable.php
index 3c42fe0960f72..fed994c354c4e 100644
--- a/administrator/components/com_templates/Table/StyleTable.php
+++ b/administrator/components/com_templates/Table/StyleTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/View/Style/HtmlView.php b/administrator/components/com_templates/View/Style/HtmlView.php
index b001c8b77c74b..8e9e6a4b46fba 100644
--- a/administrator/components/com_templates/View/Style/HtmlView.php
+++ b/administrator/components/com_templates/View/Style/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -111,7 +111,7 @@ protected function addToolbar()
 		// If not checked out, can save the item.
 		if ($canDo->get('core.edit'))
 		{
-			$toolbarButtons[] = ['apply', 'style.apply'];
+			ToolbarHelper::apply('style.apply');
 			$toolbarButtons[] = ['save', 'style.save'];
 		}
 
diff --git a/administrator/components/com_templates/View/Style/JsonView.php b/administrator/components/com_templates/View/Style/JsonView.php
index b93706c3d66ba..219c7c85d7b16 100644
--- a/administrator/components/com_templates/View/Style/JsonView.php
+++ b/administrator/components/com_templates/View/Style/JsonView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/View/Styles/HtmlView.php b/administrator/components/com_templates/View/Styles/HtmlView.php
index b5aa18c43ee1d..b1ce2c1025305 100644
--- a/administrator/components/com_templates/View/Styles/HtmlView.php
+++ b/administrator/components/com_templates/View/Styles/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -96,7 +96,6 @@ public function display($tpl = null)
 		}
 
 		$this->addToolbar();
-		$this->sidebar = \JHtmlSidebar::render();
 
 		return parent::display($tpl);
 	}
@@ -147,7 +146,5 @@ protected function addToolbar()
 		}
 
 		ToolbarHelper::help('JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES');
-
-		\JHtmlSidebar::setAction('index.php?option=com_templates&view=styles');
 	}
 }
diff --git a/administrator/components/com_templates/View/Template/HtmlView.php b/administrator/components/com_templates/View/Template/HtmlView.php
index 8ca523188a979..324ca1f6254ca 100644
--- a/administrator/components/com_templates/View/Template/HtmlView.php
+++ b/administrator/components/com_templates/View/Template/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -237,13 +237,8 @@ protected function addToolbar()
 			// Add an Apply and save button
 			if ($this->type == 'file')
 			{
-				ToolbarHelper::saveGroup(
-					[
-						['apply', 'template.apply'],
-						['save', 'template.save']
-					],
-					'btn-success'
-				);
+				ToolbarHelper::apply('template.apply');
+				ToolbarHelper::save('template.save');
 			}
 			// Add a Crop and Resize button
 			elseif ($this->type == 'image')
diff --git a/administrator/components/com_templates/View/Templates/HtmlView.php b/administrator/components/com_templates/View/Templates/HtmlView.php
index dbf5181401ee5..25b9ee8fe28ae 100644
--- a/administrator/components/com_templates/View/Templates/HtmlView.php
+++ b/administrator/components/com_templates/View/Templates/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -151,9 +151,5 @@ protected function addToolbar()
 		}
 
 		ToolbarHelper::help('JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES');
-
-		\JHtmlSidebar::setAction('index.php?option=com_templates&view=templates');
-
-		$this->sidebar = \JHtmlSidebar::render();
 	}
 }
diff --git a/administrator/components/com_templates/helpers/template.php b/administrator/components/com_templates/helpers/template.php
index 9fc818fc9e784..7cd2414992b00 100644
--- a/administrator/components/com_templates/helpers/template.php
+++ b/administrator/components/com_templates/helpers/template.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/helpers/templates.php b/administrator/components/com_templates/helpers/templates.php
index 8bd618a2d5b52..ff9798ed43fc4 100644
--- a/administrator/components/com_templates/helpers/templates.php
+++ b/administrator/components/com_templates/helpers/templates.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/services/provider.php b/administrator/components/com_templates/services/provider.php
index 156c23ff5ab00..afecbce2dc94c 100644
--- a/administrator/components/com_templates/services/provider.php
+++ b/administrator/components/com_templates/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/templates.xml b/administrator/components/com_templates/templates.xml
index 67750fe3959e5..025d563f37412 100644
--- a/administrator/components/com_templates/templates.xml
+++ b/administrator/components/com_templates/templates.xml
@@ -3,7 +3,7 @@
 	<name>com_templates</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_templates/tmpl/style/edit.php b/administrator/components/com_templates/tmpl/style/edit.php
index 7e317fe48b68e..7b67f069f2bc4 100644
--- a/administrator/components/com_templates/tmpl/style/edit.php
+++ b/administrator/components/com_templates/tmpl/style/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/tmpl/style/edit_assignment.php b/administrator/components/com_templates/tmpl/style/edit_assignment.php
index 9c90371d9bf94..6d0c64a1e3701 100644
--- a/administrator/components/com_templates/tmpl/style/edit_assignment.php
+++ b/administrator/components/com_templates/tmpl/style/edit_assignment.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/tmpl/style/edit_options.php b/administrator/components/com_templates/tmpl/style/edit_options.php
index 33c6417cbc5ef..01880b4d95310 100644
--- a/administrator/components/com_templates/tmpl/style/edit_options.php
+++ b/administrator/components/com_templates/tmpl/style/edit_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/tmpl/styles/default.php b/administrator/components/com_templates/tmpl/styles/default.php
index b6a5740af5376..c65133b8d1bc0 100644
--- a/administrator/components/com_templates/tmpl/styles/default.php
+++ b/administrator/components/com_templates/tmpl/styles/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -26,10 +26,7 @@
 ?>
 <form action="<?php echo Route::_('index.php?option=com_templates&view=styles'); ?>" method="post" name="adminForm" id="adminForm">
 	<div class="row">
-		<div id="j-sidebar-container" class="col-md-2">
-			<?php echo $this->sidebar; ?>
-		</div>
-		<div class="col-md-10">
+		<div class="col-md-12">
 			<div id="j-main-container" class="j-main-container">
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('selectorFieldName' => 'client_id'))); ?>
 				<?php if ($this->total > 0) : ?>
@@ -45,6 +42,11 @@
 								<th scope="col">
 									<?php echo JHtml::_('searchtools.sort', 'COM_TEMPLATES_HEADING_STYLE', 'a.title', $listDirn, $listOrder); ?>
 								</th>
+								<?php if ($clientId === 0) : ?>
+									<th scope="col" style="width:5%" class="text-center">
+										<?php echo Text::_('COM_TEMPLATES_TEMPLATE_PREVIEW'); ?>
+									</th>
+								<?php endif; ?>
 								<th scope="col" style="width:12%" class="text-center">
 									<?php echo JHtml::_('searchtools.sort', 'COM_TEMPLATES_HEADING_DEFAULT', 'a.home', $listDirn, $listOrder); ?>
 								</th>
@@ -72,17 +74,6 @@
 									<?php echo HTMLHelper::_('grid.id', $i, $item->id); ?>
 								</td>
 								<th scope="row">
-									<?php if ($this->preview && $item->client_id == '0') : ?>
-										<a target="_blank" href="<?php echo Uri::root() . 'index.php?tp=1&templateStyle=' . (int) $item->id ?>" class="jgrid">
-										<span class="icon-eye-open hasTooltip" aria-hidden="true" title="<?php echo HTMLHelper::_('tooltipText', Text::_('COM_TEMPLATES_TEMPLATE_PREVIEW'), $item->title, 0); ?>"></span>
-										<span class="sr-only"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_PREVIEW'); ?></span>
-									<?php elseif ($item->client_id == '1') : ?>
-										<span class="icon-eye-close disabled hasTooltip" aria-hidden="true" title="<?php echo HTMLHelper::_('tooltipText', 'COM_TEMPLATES_TEMPLATE_NO_PREVIEW_ADMIN'); ?>"></span>
-										<span class="sr-only"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW_ADMIN'); ?></span>
-									<?php else: ?>
-										<span class="icon-eye-close disabled hasTooltip" aria-hidden="true" title="<?php echo HTMLHelper::_('tooltipText', 'COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?>"></span>
-										<span class="sr-only"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?></span>
-									<?php endif; ?>
 									<?php if ($canEdit) : ?>
 										<a href="<?php echo JRoute::_('index.php?option=com_templates&task=style.edit&id=' . (int) $item->id); ?>" title="<?php echo JText::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->title)); ?>">
 											<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span><?php echo $this->escape($item->title); ?></a>
@@ -90,6 +81,18 @@
 										<?php echo $this->escape($item->title); ?>
 									<?php endif; ?>
 								</th>
+								<?php if ($clientId === 0) : ?>
+									<td class="text-center">
+										<?php if ($this->preview && $item->client_id == '0') : ?>
+											<a target="_blank" href="<?php echo Uri::root() . 'index.php?tp=1&templateStyle=' . (int) $item->id ?>" class="jgrid">
+											<span class="icon-eye-open hasTooltip" aria-hidden="true" title="<?php echo HTMLHelper::_('tooltipText', Text::_('COM_TEMPLATES_TEMPLATE_PREVIEW'), $item->title, 0); ?>"></span>
+											<span class="sr-only"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_PREVIEW'); ?></span>
+										<?php else: ?>
+											<span class="icon-eye-close disabled hasTooltip" aria-hidden="true" title="<?php echo HTMLHelper::_('tooltipText', 'COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?>"></span>
+											<span class="sr-only"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?></span>
+										<?php endif; ?>
+									</td>
+								<?php endif; ?>
 								<td class="text-center">
 									<?php if ($item->home == '0' || $item->home == '1') : ?>
 										<?php echo HTMLHelper::_('jgrid.isdefault', $item->home != '0', $i, 'styles.', $canChange && $item->home != '1'); ?>
diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index a439b09690489..be459a7b0c6c7 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -235,7 +235,7 @@
 
 <?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'overrides', Text::_('COM_TEMPLATES_TAB_OVERRIDES')); ?>
 <div class="row">
-	<div class="col-md-4">
+	<div class="col-md-3">
 		<legend><?php echo Text::_('COM_TEMPLATES_OVERRIDES_MODULES'); ?></legend>
 		<ul class="list-unstyled">
 			<?php $token = Session::getFormToken() . '=' . 1; ?>
@@ -252,7 +252,7 @@
 			<?php endforeach; ?>
 		</ul>
 	</div>
-	<div class="col-md-4">
+	<div class="col-md-3">
 		<legend><?php echo Text::_('COM_TEMPLATES_OVERRIDES_COMPONENTS'); ?></legend>
 		<ul class="list-unstyled">
 			<?php $token = Session::getFormToken() . '=' . 1; ?>
@@ -278,7 +278,33 @@
 			<?php endforeach; ?>
 		</ul>
 	</div>
-	<div class="col-md-4">
+	<div class="col-md-3">
+		<legend><?php echo Text::_('COM_TEMPLATES_OVERRIDES_PLUGINS'); ?></legend>
+		<ul class="nav nav-list">
+			<?php $token = Session::getFormToken() . '=' . 1; ?>
+			<?php foreach ($this->overridesList['plugins'] as $key => $group) : ?>
+				<li class="plugin-folder">
+					<a href="#" class="plugin-folder-url">
+						<span class="fa fa-folder" aria-hidden="true"></span>&nbsp;<?php echo $key; ?>
+					</a>
+					<ul class="list-unstyled">
+						<?php foreach ($group as $plugin) : ?>
+							<li>
+								<?php
+								$overrideLinkUrl = 'index.php?option=com_templates&view=template&task=template.overrides&folder=' . $plugin->path
+									. '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token;
+								?>
+								<a class="plugin-file-url" href="<?php echo Route::_($overrideLinkUrl); ?>">
+									<span class="fa fa-files-o" aria-hidden="true"></span> <?php echo $plugin->name; ?>
+								</a>
+							</li>
+						<?php endforeach; ?>
+					</ul>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</div>
+	<div class="col-md-3">
 		<legend><?php echo Text::_('COM_TEMPLATES_OVERRIDES_LAYOUTS'); ?></legend>
 		<ul class="list-unstyled">
 			<?php $token = Session::getFormToken() . '=' . 1; ?>
diff --git a/administrator/components/com_templates/tmpl/template/default_description.php b/administrator/components/com_templates/tmpl/template/default_description.php
index 5e89e73fa38f8..fcf9116e80f75 100644
--- a/administrator/components/com_templates/tmpl/template/default_description.php
+++ b/administrator/components/com_templates/tmpl/template/default_description.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/tmpl/template/default_folders.php b/administrator/components/com_templates/tmpl/template/default_folders.php
index b1a578ae9680b..6199da874b1f3 100644
--- a/administrator/components/com_templates/tmpl/template/default_folders.php
+++ b/administrator/components/com_templates/tmpl/template/default_folders.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_copy_body.php b/administrator/components/com_templates/tmpl/template/default_modal_copy_body.php
index 8ed0e9cbe969b..513d90d4c5ae8 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_copy_body.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_copy_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_copy_footer.php b/administrator/components/com_templates/tmpl/template/default_modal_copy_footer.php
index d573553cee930..6df3b0d72d450 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_copy_footer.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_copy_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,5 +12,5 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<a href="#" class="btn btn-secondary" data-dismiss="modal"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></a>
-<button class="btn btn-primary" type="submit"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_COPY'); ?></button>
+<button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></button>
+<button type="submit" class="btn btn-primary"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_COPY'); ?></button>
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_delete_body.php b/administrator/components/com_templates/tmpl/template/default_modal_delete_body.php
index d1be1658b1686..394d1fbc0838f 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_delete_body.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_delete_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_delete_footer.php b/administrator/components/com_templates/tmpl/template/default_modal_delete_footer.php
index 88218bb1fcf16..9382c9a39a171 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_delete_footer.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_delete_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -21,6 +21,6 @@
 	<input type="hidden" name="id" value="<?php echo $input->getInt('id'); ?>">
 	<input type="hidden" name="file" value="<?php echo $this->file; ?>">
 	<?php echo HTMLHelper::_('form.token'); ?>
-	<a href="#" class="btn btn-secondary" data-dismiss="modal"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></a>
+	<button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></button>
 	<button type="submit" class="btn btn-danger"><?php echo Text::_('COM_TEMPLATES_BUTTON_DELETE'); ?></button>
 </form>
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_file_body.php b/administrator/components/com_templates/tmpl/template/default_modal_file_body.php
index 343fc0648c313..9f62d3fc1c807 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_file_body.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_file_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_file_footer.php b/administrator/components/com_templates/tmpl/template/default_modal_file_footer.php
index 81fe765ca0575..810ad8f291d10 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_file_footer.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_file_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,4 +12,4 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<a href="#" class="btn btn-secondary" data-dismiss="modal"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></a>
+<button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></button>
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_folder_body.php b/administrator/components/com_templates/tmpl/template/default_modal_folder_body.php
index 7bab5f3a8a77f..459503aa11ec7 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_folder_body.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_folder_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_folder_footer.php b/administrator/components/com_templates/tmpl/template/default_modal_folder_footer.php
index d4290b5a55caa..c23b86e870a03 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_folder_footer.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_folder_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -18,7 +18,7 @@
 ?>
 <form id="deleteFolder" method="post" action="<?php echo Route::_('index.php?option=com_templates&task=template.deleteFolder&id=' . $input->getInt('id') . '&file=' . $this->file); ?>">
 	<fieldset>
-		<a href="#" class="btn btn-secondary" data-dismiss="modal"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></a>
+		<button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></button>
 		<input type="hidden" class="address" name="address">
 		<?php echo HTMLHelper::_('form.token'); ?>
 		<button type="submit" class="btn btn-danger"><?php echo Text::_('COM_TEMPLATES_BUTTON_DELETE'); ?></button>
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_rename_body.php b/administrator/components/com_templates/tmpl/template/default_modal_rename_body.php
index 7b967ca0068d2..ce309fef18716 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_rename_body.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_rename_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_rename_footer.php b/administrator/components/com_templates/tmpl/template/default_modal_rename_footer.php
index fff1e64b05e9c..c94b60a8493cc 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_rename_footer.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_rename_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,5 +12,5 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<a href="#" class="btn btn-secondary" data-dismiss="modal"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></a>
-<button class="btn btn-primary" type="submit"><?php echo Text::_('COM_TEMPLATES_BUTTON_RENAME'); ?></button>
+<button type="button" href="#" class="btn btn-secondary" data-dismiss="modal"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></button>
+<button type="submit" class="btn btn-primary"><?php echo Text::_('COM_TEMPLATES_BUTTON_RENAME'); ?></button>
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_resize_body.php b/administrator/components/com_templates/tmpl/template/default_modal_resize_body.php
index e0894abeb1ea5..d7ff7fd6c73e2 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_resize_body.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_resize_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_resize_footer.php b/administrator/components/com_templates/tmpl/template/default_modal_resize_footer.php
index 0a2a54693a8a5..25b0a77df46f3 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_resize_footer.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_resize_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,5 +12,5 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<a href="#" class="btn btn-secondary" data-dismiss="modal"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></a>
-<button class="btn btn-primary" type="submit"><?php echo Text::_('COM_TEMPLATES_BUTTON_RESIZE'); ?></button>
+<button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></button>
+<button type="submit" class="btn btn-primary"><?php echo Text::_('COM_TEMPLATES_BUTTON_RESIZE'); ?></button>
diff --git a/administrator/components/com_templates/tmpl/template/default_tree.php b/administrator/components/com_templates/tmpl/template/default_tree.php
index 8ed551ba189fb..ee515fb658b9b 100644
--- a/administrator/components/com_templates/tmpl/template/default_tree.php
+++ b/administrator/components/com_templates/tmpl/template/default_tree.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/tmpl/template/default_updated_files.php b/administrator/components/com_templates/tmpl/template/default_updated_files.php
index 4d41c3615ef37..7bc91753de82f 100644
--- a/administrator/components/com_templates/tmpl/template/default_updated_files.php
+++ b/administrator/components/com_templates/tmpl/template/default_updated_files.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -40,7 +40,7 @@
 								<?php echo Text::_('COM_TEMPLATES_OVERRIDE_MODIFIED_DATE'); ?>
 							</th>
 							<th scope="col">
-								<?php echo Text::_('COM_TEMPLATES_OVERRIDE_ACTION'); ?>
+								<?php echo Text::_('COM_TEMPLATES_OVERRIDE_SOURCE'); ?>
 							</th>
 						</tr>
 					</thead>
diff --git a/administrator/components/com_templates/tmpl/template/readonly.php b/administrator/components/com_templates/tmpl/template/readonly.php
index 0a7d9dd4bfd87..1ec229e885c87 100644
--- a/administrator/components/com_templates/tmpl/template/readonly.php
+++ b/administrator/components/com_templates/tmpl/template/readonly.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/tmpl/templates/default.php b/administrator/components/com_templates/tmpl/templates/default.php
index ac7454ff2f6b2..3d213d831f6a0 100644
--- a/administrator/components/com_templates/tmpl/templates/default.php
+++ b/administrator/components/com_templates/tmpl/templates/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,6 +12,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
 
@@ -24,12 +25,9 @@
 
 <form action="<?php echo Route::_('index.php?option=com_templates&view=templates'); ?>" method="post" name="adminForm" id="adminForm">
 	<div class="row">
-		<div id="j-sidebar-container" class="col-md-2">
-			<?php echo $this->sidebar; ?>
-		</div>
-		<div class="col-md-10">
+		<div class="col-md-12">
 			<div id="j-main-container" class="j-main-container">
-				<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('selectorFieldName' => 'client_id'))); ?>
+				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('selectorFieldName' => 'client_id'))); ?>
 				<?php if ($this->total > 0) : ?>
 					<table class="table" id="template-mgr">
 						<caption id="captionTable" class="sr-only">
diff --git a/administrator/components/com_users/Controller/DisplayController.php b/administrator/components/com_users/Controller/DisplayController.php
index 4c645d20fe78b..507417dcb33cc 100644
--- a/administrator/components/com_users/Controller/DisplayController.php
+++ b/administrator/components/com_users/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/Controller/GroupController.php b/administrator/components/com_users/Controller/GroupController.php
index dbe864a95a44e..a723fb76fc82e 100644
--- a/administrator/components/com_users/Controller/GroupController.php
+++ b/administrator/components/com_users/Controller/GroupController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/Controller/GroupsController.php b/administrator/components/com_users/Controller/GroupsController.php
index c268a215ad526..d75efb7ea8ff2 100644
--- a/administrator/components/com_users/Controller/GroupsController.php
+++ b/administrator/components/com_users/Controller/GroupsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Users\Administrator\Controller;
diff --git a/administrator/components/com_users/Controller/LevelController.php b/administrator/components/com_users/Controller/LevelController.php
index 8e6dd5400f1aa..fb60329456b3e 100644
--- a/administrator/components/com_users/Controller/LevelController.php
+++ b/administrator/components/com_users/Controller/LevelController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,7 +17,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -107,7 +106,7 @@ protected function allowEdit($data = array(), $key = 'id')
 	public function delete()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$ids = $this->input->get('cid', array(), 'array');
 
diff --git a/administrator/components/com_users/Controller/LevelsController.php b/administrator/components/com_users/Controller/LevelsController.php
index 6558079407d5c..adfcd78a7cd57 100644
--- a/administrator/components/com_users/Controller/LevelsController.php
+++ b/administrator/components/com_users/Controller/LevelsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Users\Administrator\Controller;
diff --git a/administrator/components/com_users/Controller/MailController.php b/administrator/components/com_users/Controller/MailController.php
index 559ef5c810e51..9d1999af25550 100644
--- a/administrator/components/com_users/Controller/MailController.php
+++ b/administrator/components/com_users/Controller/MailController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,10 +11,8 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 
 /**
  * Users mail controller.
@@ -39,7 +37,7 @@ public function send()
 		}
 
 		// Check for request forgeries.
-		Session::checkToken('request') or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken('request');
 
 		$model = $this->getModel('Mail');
 
@@ -66,7 +64,7 @@ public function send()
 	public function cancel()
 	{
 		// Check for request forgeries.
-		Session::checkToken('request') or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken('request');
 		$this->setRedirect('index.php');
 	}
 }
diff --git a/administrator/components/com_users/Controller/NoteController.php b/administrator/components/com_users/Controller/NoteController.php
index 184c94386c8cd..bb2bd820b25d9 100644
--- a/administrator/components/com_users/Controller/NoteController.php
+++ b/administrator/components/com_users/Controller/NoteController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/Controller/NotesController.php b/administrator/components/com_users/Controller/NotesController.php
index cb5518c19f48e..71424f94222f1 100644
--- a/administrator/components/com_users/Controller/NotesController.php
+++ b/administrator/components/com_users/Controller/NotesController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/Controller/ProfileController.php b/administrator/components/com_users/Controller/ProfileController.php
index c03a5eb413592..ce89ca01d2952 100644
--- a/administrator/components/com_users/Controller/ProfileController.php
+++ b/administrator/components/com_users/Controller/ProfileController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/Controller/UserController.php b/administrator/components/com_users/Controller/UserController.php
index f8872d9e215ac..b4763620422c6 100644
--- a/administrator/components/com_users/Controller/UserController.php
+++ b/administrator/components/com_users/Controller/UserController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Users\Administrator\Controller;
@@ -57,6 +57,27 @@ protected function allowEdit($data = array(), $key = 'id')
 		return parent::allowEdit($data, $key);
 	}
 
+	/**
+	 * Override parent cancel to redirect when using status edit account.
+	 *
+	 * @param   string  $key  The name of the primary key of the URL variable.
+	 *
+	 * @return  boolean  True if access level checks pass, false otherwise.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function cancel($key = null)
+	{
+		$result = parent::cancel();
+
+		if ($return = $this->input->get('return', '', 'BASE64'))
+		{
+			$this->app->redirect(base64_decode($return));
+		}
+
+		return $result;
+	}
+
 	/**
 	 * Method to run batch operations.
 	 *
@@ -68,7 +89,7 @@ protected function allowEdit($data = array(), $key = 'id')
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Set the model
 		$model = $this->getModel('User', 'Administrator', array());
diff --git a/administrator/components/com_users/Controller/UsersController.php b/administrator/components/com_users/Controller/UsersController.php
index 6592ae5434520..249c36eb4af67 100644
--- a/administrator/components/com_users/Controller/UsersController.php
+++ b/administrator/components/com_users/Controller/UsersController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -79,7 +79,7 @@ public function getModel($name = 'User', $prefix = 'Administrator', $config = ar
 	public function changeBlock()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$ids    = $this->input->get('cid', array(), 'array');
 		$values = array('block' => 1, 'unblock' => 0);
@@ -126,7 +126,7 @@ public function changeBlock()
 	public function activate()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$ids = $this->input->get('cid', array(), 'array');
 
diff --git a/administrator/components/com_users/Extension/UsersComponent.php b/administrator/components/com_users/Extension/UsersComponent.php
index 87bdab272968a..a0ee88f7062dc 100644
--- a/administrator/components/com_users/Extension/UsersComponent.php
+++ b/administrator/components/com_users/Extension/UsersComponent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/Field/GroupparentField.php b/administrator/components/com_users/Field/GroupparentField.php
index 09f0bd7d925cd..9e03f25b51361 100644
--- a/administrator/components/com_users/Field/GroupparentField.php
+++ b/administrator/components/com_users/Field/GroupparentField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,11 +14,8 @@
 use Joomla\CMS\Access\Access;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\Helper\UserGroupsHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * User Group Parent field..
  *
diff --git a/administrator/components/com_users/Field/LevelsField.php b/administrator/components/com_users/Field/LevelsField.php
index 493f840680489..a28396c99c21d 100644
--- a/administrator/components/com_users/Field/LevelsField.php
+++ b/administrator/components/com_users/Field/LevelsField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,11 +12,8 @@
 defined('JPATH_BASE') or die;
 
 use Joomla\CMS\Form\Field\ListField;
-use Joomla\CMS\Form\FormHelper;
 use Joomla\Component\Users\Administrator\Helper\UsersHelperDebug;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Access Levels field.
  *
diff --git a/administrator/components/com_users/Helper/UsersHelper.php b/administrator/components/com_users/Helper/UsersHelper.php
index c6aca8358f1a0..8cef026ec4904 100644
--- a/administrator/components/com_users/Helper/UsersHelper.php
+++ b/administrator/components/com_users/Helper/UsersHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -176,64 +176,6 @@ public static function getVisibleByGroups($rules)
 		return $groups;
 	}
 
-	/**
-	 * Adds Count Items for Tag Manager.
-	 *
-	 * @param   \stdClass[]  &$items     The user note tag objects
-	 * @param   string       $extension  The name of the active view.
-	 *
-	 * @return  \stdClass[]
-	 *
-	 * @since   3.6
-	 */
-	public static function countTagItems(&$items, $extension)
-	{
-		$db = Factory::getDbo();
-
-		foreach ($items as $item)
-		{
-			$item->count_trashed = 0;
-			$item->count_archived = 0;
-			$item->count_unpublished = 0;
-			$item->count_published = 0;
-			$query = $db->getQuery(true);
-			$query->select('published as state, count(*) AS count')
-				->from($db->quoteName('#__contentitem_tag_map') . 'AS ct ')
-				->where('ct.tag_id = ' . (int) $item->id)
-				->where('ct.type_alias =' . $db->quote($extension))
-				->join('LEFT', $db->quoteName('#__categories') . ' AS c ON ct.content_item_id=c.id')
-				->group('c.published');
-
-			$db->setQuery($query);
-			$users = $db->loadObjectList();
-
-			foreach ($users as $user)
-			{
-				if ($user->state == 1)
-				{
-					$item->count_published = $user->count;
-				}
-
-				if ($user->state == 0)
-				{
-					$item->count_unpublished = $user->count;
-				}
-
-				if ($user->state == 2)
-				{
-					$item->count_archived = $user->count;
-				}
-
-				if ($user->state == -2)
-				{
-					$item->count_trashed = $user->count;
-				}
-			}
-		}
-
-		return $items;
-	}
-
 	/**
 	 * Returns a valid section for users. If it is not valid then null
 	 * is returned.
diff --git a/administrator/components/com_users/Helper/UsersHelperDebug.php b/administrator/components/com_users/Helper/UsersHelperDebug.php
index a3b61193fbdd4..a02aa4ce06a09 100644
--- a/administrator/components/com_users/Helper/UsersHelperDebug.php
+++ b/administrator/components/com_users/Helper/UsersHelperDebug.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/Model/DebuggroupModel.php b/administrator/components/com_users/Model/DebuggroupModel.php
index 221a6827fd24f..7b480e63c454c 100644
--- a/administrator/components/com_users/Model/DebuggroupModel.php
+++ b/administrator/components/com_users/Model/DebuggroupModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -88,19 +88,7 @@ public function getItems()
 				foreach ($actions as $action)
 				{
 					$name = $action[0];
-					$level = $asset->level;
-
-					// Check that we check this action for the level of the asset.
-					if ($level === null || $level >= $asset->level)
-					{
-						// We need to test this action.
-						$asset->checks[$name] = Access::checkGroup($groupId, $name, $asset->name);
-					}
-					else
-					{
-						// We ignore this action.
-						$asset->checks[$name] = 'skip';
-					}
+					$asset->checks[$name] = Access::checkGroup($groupId, $name, $asset->name);
 				}
 			}
 		}
diff --git a/administrator/components/com_users/Model/DebuguserModel.php b/administrator/components/com_users/Model/DebuguserModel.php
index b0240ff47f24a..cd0d7c528ce76 100644
--- a/administrator/components/com_users/Model/DebuguserModel.php
+++ b/administrator/components/com_users/Model/DebuguserModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -88,19 +88,7 @@ public function getItems()
 				foreach ($actions as $action)
 				{
 					$name = $action[0];
-					$level = $asset->level;
-
-					// Check that we check this action for the level of the asset.
-					if ($level === null || $level >= $asset->level)
-					{
-						// We need to test this action.
-						$asset->checks[$name] = $user->authorise($name, $asset->name);
-					}
-					else
-					{
-						// We ignore this action.
-						$asset->checks[$name] = 'skip';
-					}
+					$asset->checks[$name] = $user->authorise($name, $asset->name);
 				}
 			}
 		}
diff --git a/administrator/components/com_users/Model/GroupModel.php b/administrator/components/com_users/Model/GroupModel.php
index 72c3f22e31818..fbf760efa653c 100644
--- a/administrator/components/com_users/Model/GroupModel.php
+++ b/administrator/components/com_users/Model/GroupModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/Model/GroupsModel.php b/administrator/components/com_users/Model/GroupsModel.php
index 33f4d88236640..4a39cd7f26f12 100644
--- a/administrator/components/com_users/Model/GroupsModel.php
+++ b/administrator/components/com_users/Model/GroupsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Users\Administrator\Model;
diff --git a/administrator/components/com_users/Model/LevelModel.php b/administrator/components/com_users/Model/LevelModel.php
index 5374065693277..d1c15ea83b9d0 100644
--- a/administrator/components/com_users/Model/LevelModel.php
+++ b/administrator/components/com_users/Model/LevelModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/Model/LevelsModel.php b/administrator/components/com_users/Model/LevelsModel.php
index eccda0ba3d9ad..ec86e82ffa4b2 100644
--- a/administrator/components/com_users/Model/LevelsModel.php
+++ b/administrator/components/com_users/Model/LevelsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/Model/MailModel.php b/administrator/components/com_users/Model/MailModel.php
index 88b6fa449c333..bfb3b8301b174 100644
--- a/administrator/components/com_users/Model/MailModel.php
+++ b/administrator/components/com_users/Model/MailModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/Model/NoteModel.php b/administrator/components/com_users/Model/NoteModel.php
index 97ee21a87f7f2..229f280a74440 100644
--- a/administrator/components/com_users/Model/NoteModel.php
+++ b/administrator/components/com_users/Model/NoteModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/Model/NotesModel.php b/administrator/components/com_users/Model/NotesModel.php
index b32c6dae2e138..9136356023ec1 100644
--- a/administrator/components/com_users/Model/NotesModel.php
+++ b/administrator/components/com_users/Model/NotesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/Model/UserModel.php b/administrator/components/com_users/Model/UserModel.php
index 026752de661a3..1535c17a51ee8 100644
--- a/administrator/components/com_users/Model/UserModel.php
+++ b/administrator/components/com_users/Model/UserModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -104,15 +104,7 @@ public function getItem($pk = null)
 
 		if (!isset($this->_item[$pk]))
 		{
-			$result = parent::getItem($pk);
-
-			if ($result)
-			{
-				$result->tags = new TagsHelper;
-				$result->tags->getTagIds($result->id, 'com_users.user');
-			}
-
-			$this->_item[$pk] = $result;
+			$this->_item[$pk] = parent::getItem($pk);
 		}
 
 		return $this->_item[$pk];
diff --git a/administrator/components/com_users/Model/UsersModel.php b/administrator/components/com_users/Model/UsersModel.php
index 28091baf95997..72bcdec630f36 100644
--- a/administrator/components/com_users/Model/UsersModel.php
+++ b/administrator/components/com_users/Model/UsersModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/Service/HTML/Users.php b/administrator/components/com_users/Service/HTML/Users.php
index b60d2bb9f6e76..0bb86942be642 100644
--- a/administrator/components/com_users/Service/HTML/Users.php
+++ b/administrator/components/com_users/Service/HTML/Users.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -63,7 +63,7 @@ public function addNote($userId)
 		$title = Text::_('COM_USERS_ADD_NOTE');
 
 		return '<a href="' . Route::_('index.php?option=com_users&task=note.add&u_id=' . (int) $userId)
-			. '" class="hasTooltip btn btn-secondary btn-sm" title="' . $title . '"><span class="fa fa-plus" aria-hidden="true">'
+			. '" class="hasTooltip btn btn-secondary btn-sm"><span class="fa fa-plus" aria-hidden="true">'
 			. '</span> ' . $title . '</a>';
 	}
 
@@ -170,7 +170,7 @@ public function blockStates( $self = false)
 				1 => array(
 					'task'           => 'unblock',
 					'text'           => '',
-					'active_title'   => 'COM_USERS_USER_FIELD_BLOCK_DESC',
+					'active_title'   => 'COM_USERS_TOOLBAR_BLOCK',
 					'inactive_title' => '',
 					'tip'            => true,
 					'active_class'   => 'unpublish',
@@ -202,7 +202,7 @@ public function blockStates( $self = false)
 				0 => array(
 					'task'           => 'block',
 					'text'           => '',
-					'active_title'   => 'COM_USERS_USER_FIELD_BLOCK_DESC',
+					'active_title'   => 'COM_USERS_TOOLBAR_BLOCK',
 					'inactive_title' => '',
 					'tip'            => true,
 					'active_class'   => 'publish',
diff --git a/administrator/components/com_users/Table/NoteTable.php b/administrator/components/com_users/Table/NoteTable.php
index 70c560b25ac65..8d388aac8ae4c 100644
--- a/administrator/components/com_users/Table/NoteTable.php
+++ b/administrator/components/com_users/Table/NoteTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/View/Debuggroup/HtmlView.php b/administrator/components/com_users/View/Debuggroup/HtmlView.php
index 6987d9ae1fa4d..4a92bfdcb1423 100644
--- a/administrator/components/com_users/View/Debuggroup/HtmlView.php
+++ b/administrator/components/com_users/View/Debuggroup/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/View/Debuguser/HtmlView.php b/administrator/components/com_users/View/Debuguser/HtmlView.php
index 728e1947db724..ba3b185d8bb52 100644
--- a/administrator/components/com_users/View/Debuguser/HtmlView.php
+++ b/administrator/components/com_users/View/Debuguser/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/View/Group/HtmlView.php b/administrator/components/com_users/View/Group/HtmlView.php
index b13b4c85cad68..3c1eeb8bd809a 100644
--- a/administrator/components/com_users/View/Group/HtmlView.php
+++ b/administrator/components/com_users/View/Group/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -92,7 +92,7 @@ protected function addToolbar()
 
 		if ($canDo->get('core.edit') || $canDo->get('core.create'))
 		{
-			$toolbarButtons[] = ['apply', 'group.apply'];
+			ToolbarHelper::apply('group.apply');
 			$toolbarButtons[] = ['save', 'group.save'];
 		}
 
diff --git a/administrator/components/com_users/View/Groups/HtmlView.php b/administrator/components/com_users/View/Groups/HtmlView.php
index 57ce4535a77a5..ad1bcbfd44055 100644
--- a/administrator/components/com_users/View/Groups/HtmlView.php
+++ b/administrator/components/com_users/View/Groups/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/View/Level/HtmlView.php b/administrator/components/com_users/View/Level/HtmlView.php
index a20283fbafa89..880a96b75a24d 100644
--- a/administrator/components/com_users/View/Level/HtmlView.php
+++ b/administrator/components/com_users/View/Level/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -92,7 +92,7 @@ protected function addToolbar()
 
 		if ($canDo->get('core.edit') || $canDo->get('core.create'))
 		{
-			$toolbarButtons[] = ['apply', 'level.apply'];
+			ToolbarHelper::apply('level.apply');
 			$toolbarButtons[] = ['save', 'level.save'];
 		}
 
diff --git a/administrator/components/com_users/View/Levels/HtmlView.php b/administrator/components/com_users/View/Levels/HtmlView.php
index 63d8b3ba71941..c42119e4ba40d 100644
--- a/administrator/components/com_users/View/Levels/HtmlView.php
+++ b/administrator/components/com_users/View/Levels/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/View/Mail/HtmlView.php b/administrator/components/com_users/View/Mail/HtmlView.php
index 14a96b5594f7f..74943cda76e8c 100644
--- a/administrator/components/com_users/View/Mail/HtmlView.php
+++ b/administrator/components/com_users/View/Mail/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/View/Note/HtmlView.php b/administrator/components/com_users/View/Note/HtmlView.php
index 0374b6c83d2d3..843ac058cdb36 100644
--- a/administrator/components/com_users/View/Note/HtmlView.php
+++ b/administrator/components/com_users/View/Note/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -104,7 +104,7 @@ protected function addToolbar()
 		// If not checked out, can save the item.
 		if (!$checkedOut && ($canDo->get('core.edit') || count($user->getAuthorisedCategories('com_users', 'core.create'))))
 		{
-			$toolbarButtons[] = ['apply', 'note.apply'];
+			ToolbarHelper::apply('note.apply');
 			$toolbarButtons[] = ['save', 'note.save'];
 		}
 
diff --git a/administrator/components/com_users/View/Notes/HtmlView.php b/administrator/components/com_users/View/Notes/HtmlView.php
index 629264d7de370..bb257b3ab5e58 100644
--- a/administrator/components/com_users/View/Notes/HtmlView.php
+++ b/administrator/components/com_users/View/Notes/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/View/User/HtmlView.php b/administrator/components/com_users/View/User/HtmlView.php
index d7cb511f4a94e..be6734eec1099 100644
--- a/administrator/components/com_users/View/User/HtmlView.php
+++ b/administrator/components/com_users/View/User/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -145,7 +145,7 @@ protected function addToolbar()
 
 		if ($canDo->get('core.edit') || $canDo->get('core.create'))
 		{
-			$toolbarButtons[] = ['apply', 'user.apply'];
+			ToolbarHelper::apply('user.apply');
 			$toolbarButtons[] = ['save', 'user.save'];
 		}
 
diff --git a/administrator/components/com_users/View/Users/HtmlView.php b/administrator/components/com_users/View/Users/HtmlView.php
index dc4293a3e399c..c8038b17955ad 100644
--- a/administrator/components/com_users/View/Users/HtmlView.php
+++ b/administrator/components/com_users/View/Users/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -149,7 +149,7 @@ protected function addToolbar()
 
 		if ($canDo->get('core.edit.state') || $canDo->get('core.admin'))
 		{	
-			$dropdown = $toolbar->dropdownButton('status')
+			$dropdown = $toolbar->dropdownButton('status-group')
 					->text('JTOOLBAR_CHANGE_STATUS')
 					->toggleSplit(false)
 					->icon('fa fa-globe')
@@ -166,14 +166,6 @@ protected function addToolbar()
 					->listCheck(true);
 		}
 
-		if ($canDo->get('core.delete'))
-		{
-			$toolbar->delete('users.delete')
-				->text('JTOOLBAR_DELETE')
-				->message('JGLOBAL_CONFIRM_DELETE')
-				->listCheck(true);
-		}
-
 		// Add a batch button
 		if ($user->authorise('core.create', 'com_users')
 			&& $user->authorise('core.edit', 'com_users')
@@ -185,6 +177,14 @@ protected function addToolbar()
 				->listCheck(true);
 		}
 
+		if ($canDo->get('core.delete'))
+		{
+			$toolbar->delete('users.delete')
+				->text('JTOOLBAR_DELETE')
+				->message('JGLOBAL_CONFIRM_DELETE')
+				->listCheck(true);
+		}
+
 		if ($canDo->get('core.admin') || $canDo->get('core.options'))
 		{
 			$toolbar->preferences('com_users');
diff --git a/administrator/components/com_users/config.xml b/administrator/components/com_users/config.xml
index d03ddc4ba7eeb..81c25c807b662 100644
--- a/administrator/components/com_users/config.xml
+++ b/administrator/components/com_users/config.xml
@@ -110,6 +110,22 @@
 
 	</fieldset>
 
+	<fieldset
+		name="domain_options"
+		label="COM_USERS_CONFIG_DOMAIN_OPTIONS"
+		>
+
+		<field
+			name="domains"
+			type="subform"
+			label="COM_USERS_CONFIG_FIELD_DOMAINS_LABEL"
+			description="COM_USERS_CONFIG_FIELD_DOMAINS_DESC"
+			multiple="true"
+			layout="joomla.form.field.subform.repeatable-table"
+			formsource="administrator/components/com_users/models/forms/config_domain.xml"
+		/>
+	</fieldset>
+
 	<fieldset
 		name="password_options"
 		label="COM_USERS_CONFIG_PASSWORD_OPTIONS" >
diff --git a/administrator/components/com_users/forms/config_domain.xml b/administrator/components/com_users/forms/config_domain.xml
new file mode 100644
index 0000000000000..f1c72499d04e3
--- /dev/null
+++ b/administrator/components/com_users/forms/config_domain.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="name"
+			type="text"
+			label="COM_USERS_CONFIG_FIELD_DOMAIN_NAME_LABEL"
+			description="COM_USERS_CONFIG_FIELD_DOMAIN_NAME_DESC"
+			required="true"
+		/>
+
+		<field
+			name="rule"
+			type="list"
+			label="COM_USERS_CONFIG_FIELD_DOMAIN_RULE_LABEL"
+			description="COM_USERS_CONFIG_FIELD_DOMAIN_RULE_DESC"
+			required="true"
+			default="0"
+			filter="integer"
+			>
+			<option value="1">COM_USERS_CONFIG_FIELD_DOMAIN_RULE_OPTION_ALLOW</option>
+			<option value="0">COM_USERS_CONFIG_FIELD_DOMAIN_RULE_OPTION_DISALLOW</option>
+		</field>
+	</fieldset>
+</form>
diff --git a/administrator/components/com_users/forms/group.xml b/administrator/components/com_users/forms/group.xml
index d9a2e04fdbf34..3a901a7069811 100644
--- a/administrator/components/com_users/forms/group.xml
+++ b/administrator/components/com_users/forms/group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form addfieldprefix="Joomla\Component\Users\Administrator\Field">
-	<fieldset>
+	<fieldset name="group_details">
 		<field
 			name="id"
 			type="hidden"
diff --git a/administrator/components/com_users/forms/user.xml b/administrator/components/com_users/forms/user.xml
index 11de26f71648d..3a2b1742c28a9 100644
--- a/administrator/components/com_users/forms/user.xml
+++ b/administrator/components/com_users/forms/user.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
 	<fieldset name="user_details">
-		<field 
-			name="name" 
+		<field
+			name="name"
 			type="text"
 			label="COM_USERS_USER_FIELD_NAME_LABEL"
 			required="true"
 			size="30"
 		/>
 
-		<field 
+		<field
 			name="username"
 			type="text"
 			label="COM_USERS_USER_FIELD_USERNAME_LABEL"
@@ -30,8 +30,8 @@
 			size="30"
 		/>
 
-		<field 
-			name="password2" 
+		<field
+			name="password2"
 			type="password"
 			label="COM_USERS_USER_FIELD_PASSWORD2_LABEL"
 			autocomplete="off"
@@ -50,6 +50,7 @@
 			required="true"
 			size="30"
 			validate="email"
+			validDomains="com_users.domains"
 		/>
 
 		<field
@@ -148,8 +149,8 @@
 		<!--  Basic user account settings. -->
 		<fieldset name="settings" label="COM_USERS_SETTINGS_FIELDSET_LABEL">
 
-			<field 
-				name="admin_style" 
+			<field
+				name="admin_style"
 				type="templatestyle"
 				label="COM_USERS_USER_FIELD_BACKEND_TEMPLATE_LABEL"
 				client="administrator"
@@ -158,8 +159,8 @@
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field 
-				name="admin_language" 
+			<field
+				name="admin_language"
 				type="language"
 				label="COM_USERS_USER_FIELD_BACKEND_LANGUAGE_LABEL"
 				client="administrator"
@@ -167,8 +168,8 @@
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field 
-				name="language" 
+			<field
+				name="language"
 				type="language"
 				label="COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_LABEL"
 				client="site"
@@ -176,25 +177,25 @@
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field 
-				name="editor" 
-				type="plugins" 
+			<field
+				name="editor"
+				type="plugins"
 				label="COM_USERS_USER_FIELD_EDITOR_LABEL"
 				folder="editors"
 				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field 
-				name="helpsite" 
+			<field
+				name="helpsite"
 				type="helpsite"
 				label="COM_USERS_USER_FIELD_HELPSITE_LABEL"
 				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field 
-				name="timezone" 
+			<field
+				name="timezone"
 				type="timezone"
 				label="COM_USERS_USER_FIELD_TIMEZONE_LABEL"
 				>
diff --git a/administrator/components/com_users/helpers/debug.php b/administrator/components/com_users/helpers/debug.php
index f8fbd6d0e372a..0531adbb90767 100644
--- a/administrator/components/com_users/helpers/debug.php
+++ b/administrator/components/com_users/helpers/debug.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/helpers/users.php b/administrator/components/com_users/helpers/users.php
index 1197d214e3440..43abd472f42fc 100644
--- a/administrator/components/com_users/helpers/users.php
+++ b/administrator/components/com_users/helpers/users.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/services/provider.php b/administrator/components/com_users/services/provider.php
index 037dbc2564f39..81ef4df5dd82e 100644
--- a/administrator/components/com_users/services/provider.php
+++ b/administrator/components/com_users/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/tmpl/debuggroup/default.php b/administrator/components/com_users/tmpl/debuggroup/default.php
index cd934c991ba4e..c28d6c0abc4c2 100644
--- a/administrator/components/com_users/tmpl/debuggroup/default.php
+++ b/administrator/components/com_users/tmpl/debuggroup/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/tmpl/debuguser/default.php b/administrator/components/com_users/tmpl/debuguser/default.php
index 82efc0c626a44..cb3f85ad969e8 100644
--- a/administrator/components/com_users/tmpl/debuguser/default.php
+++ b/administrator/components/com_users/tmpl/debuguser/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/tmpl/group/edit.php b/administrator/components/com_users/tmpl/group/edit.php
index eb19579bb1c6a..df94c53ec80f7 100644
--- a/administrator/components/com_users/tmpl/group/edit.php
+++ b/administrator/components/com_users/tmpl/group/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,28 +17,15 @@
 ?>
 
 <form action="<?php echo Route::_('index.php?option=com_users&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="group-form" class="form-validate">
-	<fieldset>
-		<legend><?php echo Text::_('COM_USERS_USERGROUP_DETAILS'); ?></legend>
-		<div class="control-group">
-			<div class="control-label">
-				<?php echo $this->form->getLabel('title'); ?>
-			</div>
-			<div class="controls">
-				<?php echo $this->form->getInput('title'); ?>
-			</div>
-		</div>
-		<div class="control-group">
-			<?php $parent_id = $this->form->getField('parent_id'); ?>
-			<?php if (!$parent_id->hidden) : ?>
-				<div class="control-label">
-					<?php echo $parent_id->label; ?>
-				</div>
-			<?php endif; ?>
-			<div class="controls">
-				<?php echo $parent_id->input; ?>
-			</div>
-		</div>
-	</fieldset>
+	<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
+	<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', Text::_('COM_USERS_USERGROUP_DETAILS')); ?>
+		<?php echo $this->form->renderField('title'); ?>
+		<?php echo $this->form->renderField('parent_id'); ?>
+	<?php echo JHtml::_('bootstrap.endTab'); ?>
+	<?php $this->ignore_fieldsets = array('group_details'); ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+	<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+
 	<input type="hidden" name="task" value="">
 	<?php echo HTMLHelper::_('form.token'); ?>
 </form>
diff --git a/administrator/components/com_users/tmpl/groups/default.php b/administrator/components/com_users/tmpl/groups/default.php
index b7f6b1fe00e22..c31f21835ab5c 100644
--- a/administrator/components/com_users/tmpl/groups/default.php
+++ b/administrator/components/com_users/tmpl/groups/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/tmpl/level/edit.php b/administrator/components/com_users/tmpl/level/edit.php
index e92127a25eee0..80335fb98c8f0 100644
--- a/administrator/components/com_users/tmpl/level/edit.php
+++ b/administrator/components/com_users/tmpl/level/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/tmpl/levels/default.php b/administrator/components/com_users/tmpl/levels/default.php
index 1f9c46cb0fc9e..8f8e5ff71cfcd 100644
--- a/administrator/components/com_users/tmpl/levels/default.php
+++ b/administrator/components/com_users/tmpl/levels/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/tmpl/mail/default.php b/administrator/components/com_users/tmpl/mail/default.php
index 7d458de33595b..b8180b8e08d8e 100644
--- a/administrator/components/com_users/tmpl/mail/default.php
+++ b/administrator/components/com_users/tmpl/mail/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/tmpl/note/edit.php b/administrator/components/com_users/tmpl/note/edit.php
index 5e31fdce155a7..dea5680825f63 100644
--- a/administrator/components/com_users/tmpl/note/edit.php
+++ b/administrator/components/com_users/tmpl/note/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/tmpl/notes/default.php b/administrator/components/com_users/tmpl/notes/default.php
index 20713db0657b0..dfab444ce8f0f 100644
--- a/administrator/components/com_users/tmpl/notes/default.php
+++ b/administrator/components/com_users/tmpl/notes/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/tmpl/notes/modal.php b/administrator/components/com_users/tmpl/notes/modal.php
index 888dee5d47971..9127784813dc8 100644
--- a/administrator/components/com_users/tmpl/notes/modal.php
+++ b/administrator/components/com_users/tmpl/notes/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/tmpl/user/edit.php b/administrator/components/com_users/tmpl/user/edit.php
index 5942c7d591f6a..93572c8d8f7cb 100644
--- a/administrator/components/com_users/tmpl/user/edit.php
+++ b/administrator/components/com_users/tmpl/user/edit.php
@@ -3,12 +3,13 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
@@ -18,6 +19,8 @@
 HTMLHelper::_('behavior.formvalidator');
 HTMLHelper::_('script', 'com_users/admin-users-user.min.js', array('version' => 'auto', 'relative' => true));
 
+$input = Factory::getApplication()->input;
+
 // Get the form fieldsets.
 $fieldsets = $this->form->getFieldsets();
 $settings  = array();
@@ -60,8 +63,7 @@
 		<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'twofactorauth', Text::_('COM_USERS_USER_TWO_FACTOR_AUTH')); ?>
 		<div class="control-group">
 			<div class="control-label">
-				<label id="jform_twofactor_method-lbl" for="jform_twofactor_method" class="hasTooltip"
-					title="<?php echo '<strong>' . Text::_('COM_USERS_USER_FIELD_TWOFACTOR_LABEL') . '</strong>'; ?>">
+				<label id="jform_twofactor_method-lbl" for="jform_twofactor_method">
 					<?php echo Text::_('COM_USERS_USER_FIELD_TWOFACTOR_LABEL'); ?>
 				</label>
 			</div>
@@ -105,5 +107,6 @@
 	</fieldset>
 
 	<input type="hidden" name="task" value="">
+	<input type="hidden" name="return" value="<?php echo $input->getCmd('return'); ?>">
 	<?php echo HTMLHelper::_('form.token'); ?>
 </form>
diff --git a/administrator/components/com_users/tmpl/user/edit_groups.php b/administrator/components/com_users/tmpl/user/edit_groups.php
index 94a38d2790fb6..5022338642758 100644
--- a/administrator/components/com_users/tmpl/user/edit_groups.php
+++ b/administrator/components/com_users/tmpl/user/edit_groups.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/tmpl/users/default.php b/administrator/components/com_users/tmpl/users/default.php
index ea59fb5e2cf59..21915a51aaa64 100644
--- a/administrator/components/com_users/tmpl/users/default.php
+++ b/administrator/components/com_users/tmpl/users/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/tmpl/users/default_batch_body.php b/administrator/components/com_users/tmpl/users/default_batch_body.php
index d3ba400eac359..cabde3ade7f2b 100644
--- a/administrator/components/com_users/tmpl/users/default_batch_body.php
+++ b/administrator/components/com_users/tmpl/users/default_batch_body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_users/tmpl/users/default_batch_footer.php b/administrator/components/com_users/tmpl/users/default_batch_footer.php
index 102e53bc44ded..a0170dc243e9c 100644
--- a/administrator/components/com_users/tmpl/users/default_batch_footer.php
+++ b/administrator/components/com_users/tmpl/users/default_batch_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -11,9 +11,9 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<a class="btn btn-secondary" type="button" onclick="document.getElementById('batch-group-id').value=''" data-dismiss="modal">
+<button type="button" class="btn btn-secondary" type="button" onclick="document.getElementById('batch-group-id').value=''" data-dismiss="modal">
 	<?php echo Text::_('JCANCEL'); ?>
-</a>
-<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('user.batch');">
+</button>
+<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('user.batch');">
 	<?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?>
-</button>
\ No newline at end of file
+</button>
diff --git a/administrator/components/com_users/tmpl/users/modal.php b/administrator/components/com_users/tmpl/users/modal.php
index 0af4c3eb444de..c1685120f6261 100644
--- a/administrator/components/com_users/tmpl/users/modal.php
+++ b/administrator/components/com_users/tmpl/users/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/users.xml b/administrator/components/com_users/users.xml
index aaae205c09197..7a989905cf586 100644
--- a/administrator/components/com_users/users.xml
+++ b/administrator/components/com_users/users.xml
@@ -3,7 +3,7 @@
 	<name>com_users</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_workflow/Controller/DisplayController.php b/administrator/components/com_workflow/Controller/DisplayController.php
index d397b91280135..f4b334b320b7d 100644
--- a/administrator/components/com_workflow/Controller/DisplayController.php
+++ b/administrator/components/com_workflow/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_workflow/Controller/StageController.php b/administrator/components/com_workflow/Controller/StageController.php
index 3c106a703c8e1..ccbf205504b76 100644
--- a/administrator/components/com_workflow/Controller/StageController.php
+++ b/administrator/components/com_workflow/Controller/StageController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Workflow\Administrator\Controller;
diff --git a/administrator/components/com_workflow/Controller/StagesController.php b/administrator/components/com_workflow/Controller/StagesController.php
index 684c0e5d589d8..42f5e66349a71 100644
--- a/administrator/components/com_workflow/Controller/StagesController.php
+++ b/administrator/components/com_workflow/Controller/StagesController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Workflow\Administrator\Controller;
diff --git a/administrator/components/com_workflow/Controller/TransitionController.php b/administrator/components/com_workflow/Controller/TransitionController.php
index 6a13a869074bb..12fac44506344 100644
--- a/administrator/components/com_workflow/Controller/TransitionController.php
+++ b/administrator/components/com_workflow/Controller/TransitionController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Workflow\Administrator\Controller;
diff --git a/administrator/components/com_workflow/Controller/TransitionsController.php b/administrator/components/com_workflow/Controller/TransitionsController.php
index 9c31edf3cda2f..8baee4dd5911e 100644
--- a/administrator/components/com_workflow/Controller/TransitionsController.php
+++ b/administrator/components/com_workflow/Controller/TransitionsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Workflow\Administrator\Controller;
diff --git a/administrator/components/com_workflow/Controller/WorkflowController.php b/administrator/components/com_workflow/Controller/WorkflowController.php
index ef369c1446881..71727219a0fab 100644
--- a/administrator/components/com_workflow/Controller/WorkflowController.php
+++ b/administrator/components/com_workflow/Controller/WorkflowController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Workflow\Administrator\Controller;
diff --git a/administrator/components/com_workflow/Controller/WorkflowsController.php b/administrator/components/com_workflow/Controller/WorkflowsController.php
index e2b41993dce0e..e3bf9f54f7aad 100644
--- a/administrator/components/com_workflow/Controller/WorkflowsController.php
+++ b/administrator/components/com_workflow/Controller/WorkflowsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Workflow\Administrator\Controller;
diff --git a/administrator/components/com_workflow/Dispatcher/Dispatcher.php b/administrator/components/com_workflow/Dispatcher/Dispatcher.php
index aa8fc896c0cf7..8d471ee7af06d 100644
--- a/administrator/components/com_workflow/Dispatcher/Dispatcher.php
+++ b/administrator/components/com_workflow/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_workflow/Helper/StageHelper.php b/administrator/components/com_workflow/Helper/StageHelper.php
index 43fc640759dee..ed3f017f8f5a9 100644
--- a/administrator/components/com_workflow/Helper/StageHelper.php
+++ b/administrator/components/com_workflow/Helper/StageHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_workflow/Helper/WorkflowHelper.php b/administrator/components/com_workflow/Helper/WorkflowHelper.php
index 6d7494259536d..6dc7ec5554bb4 100644
--- a/administrator/components/com_workflow/Helper/WorkflowHelper.php
+++ b/administrator/components/com_workflow/Helper/WorkflowHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_workflow/Model/StageModel.php b/administrator/components/com_workflow/Model/StageModel.php
index 6c2175f8d01ad..27dfda7cec578 100644
--- a/administrator/components/com_workflow/Model/StageModel.php
+++ b/administrator/components/com_workflow/Model/StageModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       4.0.0
  */
diff --git a/administrator/components/com_workflow/Model/StagesModel.php b/administrator/components/com_workflow/Model/StagesModel.php
index ed694bee8ccf8..7d728e6e5eaa4 100644
--- a/administrator/components/com_workflow/Model/StagesModel.php
+++ b/administrator/components/com_workflow/Model/StagesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       4.0.0
  */
diff --git a/administrator/components/com_workflow/Model/TransitionModel.php b/administrator/components/com_workflow/Model/TransitionModel.php
index f3ff69b17d874..5199a7cc5cb49 100644
--- a/administrator/components/com_workflow/Model/TransitionModel.php
+++ b/administrator/components/com_workflow/Model/TransitionModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       4.0.0
  */
diff --git a/administrator/components/com_workflow/Model/TransitionsModel.php b/administrator/components/com_workflow/Model/TransitionsModel.php
index 777fe535f2832..39f17eecc7b27 100644
--- a/administrator/components/com_workflow/Model/TransitionsModel.php
+++ b/administrator/components/com_workflow/Model/TransitionsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       4.0.0
  */
diff --git a/administrator/components/com_workflow/Model/WorkflowModel.php b/administrator/components/com_workflow/Model/WorkflowModel.php
index 3ec310fbd6831..a588e9a5ff7d8 100644
--- a/administrator/components/com_workflow/Model/WorkflowModel.php
+++ b/administrator/components/com_workflow/Model/WorkflowModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       4.0.0
  */
@@ -13,6 +13,7 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Workflow\Workflow;
@@ -113,12 +114,12 @@ public function save($data)
 				[
 					'title' => 'JUNPUBLISHED',
 					'condition' => Workflow::CONDITION_UNPUBLISHED,
+					'default' => 1,
 					'transition' => 'Unpublish'
 				],
 				[
 					'title' => 'JPUBLISHED',
 					'condition' => Workflow::CONDITION_PUBLISHED,
-					'default' => 1,
 					'transition' => 'Publish'
 				],
 				[
@@ -259,7 +260,7 @@ protected function loadFormData()
 	 *
 	 * @since  4.0.0
 	 */
-	protected function preprocessForm(\JForm $form, $data, $group = 'content')
+	protected function preprocessForm(Form $form, $data, $group = 'content')
 	{
 		$extension = Factory::getApplication()->input->get('extension');
 
diff --git a/administrator/components/com_workflow/Model/WorkflowsModel.php b/administrator/components/com_workflow/Model/WorkflowsModel.php
index d136bc6bc0b60..7bd197fd39e76 100644
--- a/administrator/components/com_workflow/Model/WorkflowsModel.php
+++ b/administrator/components/com_workflow/Model/WorkflowsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       4.0.0
  */
diff --git a/administrator/components/com_workflow/Table/StageTable.php b/administrator/components/com_workflow/Table/StageTable.php
index efbf612264a8c..edf9eda24085f 100644
--- a/administrator/components/com_workflow/Table/StageTable.php
+++ b/administrator/components/com_workflow/Table/StageTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_workflow/Table/TransitionTable.php b/administrator/components/com_workflow/Table/TransitionTable.php
index d79aaa032ab87..17040d4a9befb 100644
--- a/administrator/components/com_workflow/Table/TransitionTable.php
+++ b/administrator/components/com_workflow/Table/TransitionTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_workflow/Table/WorkflowTable.php b/administrator/components/com_workflow/Table/WorkflowTable.php
index 3e21c92ae036a..3a5925120a3ba 100644
--- a/administrator/components/com_workflow/Table/WorkflowTable.php
+++ b/administrator/components/com_workflow/Table/WorkflowTable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Workflow\Administrator\Table;
diff --git a/administrator/components/com_workflow/View/Stage/HtmlView.php b/administrator/components/com_workflow/View/Stage/HtmlView.php
index 4f4f81e1c0f27..b39afc1eb2179 100644
--- a/administrator/components/com_workflow/View/Stage/HtmlView.php
+++ b/administrator/components/com_workflow/View/Stage/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Workflow\Administrator\View\Stage;
@@ -111,7 +111,8 @@ protected function addToolbar()
 			// For new records, check the create permission.
 			if ($canDo->get('core.edit'))
 			{
-				$toolbarButtons = [['apply', 'stage.apply'], ['save', 'stage.save'], ['save2new', 'stage.save2new']];
+				ToolbarHelper::apply('stage.apply');
+				$toolbarButtons = [['save', 'stage.save'], ['save2new', 'stage.save2new']];
 			}
 
 			ToolbarHelper::saveGroup(
@@ -126,7 +127,8 @@ protected function addToolbar()
 
 			if ($itemEditable)
 			{
-				$toolbarButtons = [['apply', 'stage.apply'], ['save', 'stage.save']];
+				ToolbarHelper::apply('stage.apply');
+				$toolbarButtons = [['save', 'stage.save']];
 
 				// We can save this record, but check the create permission to see if we can return to make a new one.
 				if ($canDo->get('core.create'))
diff --git a/administrator/components/com_workflow/View/Stages/HtmlView.php b/administrator/components/com_workflow/View/Stages/HtmlView.php
index 9ffd611a6e9a0..14c58d9a07768 100644
--- a/administrator/components/com_workflow/View/Stages/HtmlView.php
+++ b/administrator/components/com_workflow/View/Stages/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Workflow\Administrator\View\Stages;
@@ -14,6 +14,7 @@
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Workflow\Workflow;
 use Joomla\Component\Workflow\Administrator\Helper\WorkflowHelper;
@@ -155,6 +156,8 @@ protected function addToolbar()
 	{
 		$canDo = ContentHelper::getActions($this->extension, 'workflow', $this->workflowID);
 
+		$toolbar = Toolbar::getInstance('toolbar');
+
 		$workflow = !empty($this->state->get('active_workflow', '')) ? Text::_($this->state->get('active_workflow', '')) . ': ' : '';
 
 		ToolbarHelper::title(Text::sprintf('COM_WORKFLOW_STAGES_LIST', $this->escape($workflow)), 'address contact');
@@ -166,33 +169,50 @@ protected function addToolbar()
 			'JTOOLBAR_BACK', $arrow
 		);
 
-		if ($canDo->get('core.create') && !$isCore)
-		{
-			ToolbarHelper::addNew('stage.add');
-		}
-
-		if ($canDo->get('core.edit.state') && !$isCore)
+		if (!$isCore)
 		{
-			ToolbarHelper::publishList('stages.publish');
-			ToolbarHelper::unpublishList('stages.unpublish');
-			ToolbarHelper::makeDefault('stages.setDefault', 'COM_WORKFLOW_TOOLBAR_DEFAULT');
-		}
+			if ($canDo->get('core.create'))
+			{
+				$toolbar->addNew('stage.add');
+			}
 
-		if ($canDo->get('core.admin'))
-		{
-			ToolbarHelper::checkin('stages.checkin', 'JTOOLBAR_CHECKIN', true);
-		}
+			if ($canDo->get('core.edit.state') || $user->authorise('core.admin'))
+			{		
+				$dropdown = $toolbar->dropdownButton('status-group')
+					->text('JTOOLBAR_CHANGE_STATUS')
+					->toggleSplit(false)
+					->icon('fa fa-globe')
+					->buttonClass('btn btn-info')
+					->listCheck(true);
+
+				$childBar = $dropdown->getChildToolbar();
+
+				$childBar->publish('stages.publish')->listCheck(true);
+				$childBar->unpublish('stages.unpublish')->listCheck(true);
+				$childBar->makeDefault('stages.setDefault', 'COM_WORKFLOW_TOOLBAR_DEFAULT');
+
+				if ($canDo->get('core.admin'))
+				{
+					// @ToDo Imlement the checked_out for workflows
+					// $childBar->checkin('stages.checkin', 'JTOOLBAR_CHECKIN', true);
+				}
+
+				if ($this->state->get('filter.published') !== '-2')
+				{
+					$childBar->trash('stages.trash');
+				}
+			}
 
-		if ($this->state->get('filter.published') === '-2' && $canDo->get('core.delete') && !$isCore)
-		{
-			ToolbarHelper::deleteList(Text::_('COM_WORKFLOW_ARE_YOU_SURE'), 'stages.delete');
-		}
-		elseif ($canDo->get('core.edit.state') && !$isCore)
-		{
-			ToolbarHelper::trash('stages.trash');
+			if ($this->state->get('filter.published') === '-2' && $canDo->get('core.delete') && !$isCore)
+			{
+				$toolbar->delete('stages.delete')
+					->text('JTOOLBAR_EMPTY_TRASH')
+					->message('JGLOBAL_CONFIRM_DELETE')
+					->listCheck(true);
+			}
 		}
 
-		ToolbarHelper::help('JHELP_WORKFLOW_STAGES_LIST');
+		$toolbar->help('JHELP_WORKFLOW_STAGES_LIST');
 	}
 
 	/**
diff --git a/administrator/components/com_workflow/View/Transition/HtmlView.php b/administrator/components/com_workflow/View/Transition/HtmlView.php
index bb7ed36020a71..616114873b706 100644
--- a/administrator/components/com_workflow/View/Transition/HtmlView.php
+++ b/administrator/components/com_workflow/View/Transition/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Workflow\Administrator\View\Transition;
@@ -133,7 +133,8 @@ protected function addToolbar()
 			// For new records, check the create permission.
 			if ($canDo->get('core.edit'))
 			{
-				$toolbarButtons = [['apply', 'transition.apply'], ['save', 'transition.save'], ['save2new', 'transition.save2new']];
+				ToolbarHelper::apply('transition.apply');
+				$toolbarButtons = [['save', 'transition.save'], ['save2new', 'transition.save2new']];
 			}
 
 			ToolbarHelper::saveGroup(
@@ -148,7 +149,8 @@ protected function addToolbar()
 
 			if ($itemEditable)
 			{
-				$toolbarButtons = [['apply', 'transition.apply'], ['save', 'transition.save']];
+				ToolbarHelper::apply('transition.apply');
+				$toolbarButtons = [['save', 'transition.save']];
 
 				// We can save this record, but check the create permission to see if we can return to make a new one.
 				if ($canDo->get('core.create'))
diff --git a/administrator/components/com_workflow/View/Transitions/HtmlView.php b/administrator/components/com_workflow/View/Transitions/HtmlView.php
index 2e738fd05693d..8c5c22ab480af 100644
--- a/administrator/components/com_workflow/View/Transitions/HtmlView.php
+++ b/administrator/components/com_workflow/View/Transitions/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Workflow\Administrator\View\Transitions;
@@ -14,6 +14,7 @@
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Workflow\Administrator\Helper\WorkflowHelper;
 
@@ -143,6 +144,8 @@ protected function addToolbar()
 	{
 		$canDo = ContentHelper::getActions($this->extension, 'workflow', $this->workflowID);
 
+		$toolbar = Toolbar::getInstance('toolbar');
+
 		$workflow = !empty($this->state->get('active_workflow', '')) ? Text::_($this->state->get('active_workflow', '')) . ': ' : '';
 
 		ToolbarHelper::title(Text::sprintf('COM_WORKFLOW_TRANSITIONS_LIST', $this->escape($workflow)), 'address contact');
@@ -154,26 +157,49 @@ protected function addToolbar()
 			'JTOOLBAR_BACK', $arrow
 		);
 
-		if ($canDo->get('core.create') && !$isCore)
-		{
-			ToolbarHelper::addNew('transition.add');
-		}
-
-		if ($canDo->get('core.edit.state') && !$isCore)
-		{
-			ToolbarHelper::publishList('transitions.publish');
-			ToolbarHelper::unpublishList('transitions.unpublish');
-		}
 
-		if ($this->state->get('filter.published') === '-2' && $canDo->get('core.delete') && !$isCore)
-		{
-			ToolbarHelper::deleteList(Text::_('COM_WORKFLOW_ARE_YOU_SURE'), 'transitions.delete');
-		}
-		elseif ($canDo->get('core.edit.state') && !$isCore)
+		if (!$isCore)
 		{
-			ToolbarHelper::trash('transitions.trash');
+			if ($canDo->get('core.create'))
+			{
+				$toolbar->addNew('transition.add');
+			}
+
+			if ($canDo->get('core.edit.state') || $user->authorise('core.admin'))
+			{
+				$dropdown = $toolbar->dropdownButton('status-group')
+					->text('JTOOLBAR_CHANGE_STATUS')
+					->toggleSplit(false)
+					->icon('fa fa-globe')
+					->buttonClass('btn btn-info')
+					->listCheck(true);
+
+				$childBar = $dropdown->getChildToolbar();
+
+				$childBar->publish('transitions.publish');
+				$childBar->unpublish('transitions.unpublish');
+
+				if ($canDo->get('core.admin'))
+				{
+					// @ToDo Imlement the checked_out for workflows
+					// $childBar->checkin('transitions.checkin', 'JTOOLBAR_CHECKIN', true);
+				}
+
+				if ($this->state->get('filter.published') !== '-2')
+				{
+					$childBar->trash('transitions.trash');
+				}
+			}
+
+			if ($this->state->get('filter.published') === '-2' && $canDo->get('core.delete'))
+			{
+				$toolbar->delete('transitions.delete')
+					->text('JTOOLBAR_EMPTY_TRASH')
+					->message('JGLOBAL_CONFIRM_DELETE')
+					->listCheck(true);
+			}
 		}
 
-		ToolbarHelper::help('JHELP_WORKFLOW_TRANSITIONS_LIST');
+		$toolbar->help('JHELP_WORKFLOW_TRANSITIONS_LIST');
 	}
 }
diff --git a/administrator/components/com_workflow/View/Workflow/HtmlView.php b/administrator/components/com_workflow/View/Workflow/HtmlView.php
index bd3367bfe53cd..edacca9129bf0 100644
--- a/administrator/components/com_workflow/View/Workflow/HtmlView.php
+++ b/administrator/components/com_workflow/View/Workflow/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Workflow\Administrator\View\Workflow;
@@ -117,7 +117,8 @@ protected function addToolbar()
 			// For new records, check the create permission.
 			if ($canDo->get('core.edit'))
 			{
-				$toolbarButtons = [['apply', 'workflow.apply'], ['save', 'workflow.save'], ['save2new', 'workflow.save2new']];
+				ToolbarHelper::apply('workflow.apply');
+				$toolbarButtons = [['save', 'workflow.save'], ['save2new', 'workflow.save2new']];
 			}
 
 			ToolbarHelper::saveGroup(
@@ -132,7 +133,8 @@ protected function addToolbar()
 
 			if ($itemEditable && !$this->item->core)
 			{
-				$toolbarButtons = [['apply', 'workflow.apply'], ['save', 'workflow.save']];
+				ToolbarHelper::apply('workflow.apply');
+				$toolbarButtons = [['save', 'workflow.save']];
 
 				// We can save this record, but check the create permission to see if we can return to make a new one.
 				if ($canDo->get('core.create'))
diff --git a/administrator/components/com_workflow/View/Workflows/HtmlView.php b/administrator/components/com_workflow/View/Workflows/HtmlView.php
index 5a96a9a38e743..ba1a66ee7fa4c 100644
--- a/administrator/components/com_workflow/View/Workflows/HtmlView.php
+++ b/administrator/components/com_workflow/View/Workflows/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Workflow\Administrator\View\Workflows;
diff --git a/administrator/components/com_workflow/services/provider.php b/administrator/components/com_workflow/services/provider.php
index 0ab109ce37ad1..e06c91c8eab69 100644
--- a/administrator/components/com_workflow/services/provider.php
+++ b/administrator/components/com_workflow/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_workflow/tmpl/stage/edit.php b/administrator/components/com_workflow/tmpl/stage/edit.php
index 33abe7965384c..e5f49d7e62748 100644
--- a/administrator/components/com_workflow/tmpl/stage/edit.php
+++ b/administrator/components/com_workflow/tmpl/stage/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_workflow/tmpl/stages/default.php b/administrator/components/com_workflow/tmpl/stages/default.php
index 534ba078ce4d6..690378bb6dc77 100644
--- a/administrator/components/com_workflow/tmpl/stages/default.php
+++ b/administrator/components/com_workflow/tmpl/stages/default.php
@@ -5,7 +5,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       4.0.0
  */
@@ -89,10 +89,10 @@
 							<?php foreach ($this->stages as $i => $item):
 								$edit = Route::_('index.php?option=com_workflow&task=stage.edit&id=' . $item->id . '&workflow_id=' . (int) $this->workflowID . '&extension=' . $this->extension);
 
-								$canEdit    = $user->authorise('core.edit', $this->extension . '.stage.' . $item->id) && !$isCore;
+								$canEdit    = $user->authorise('core.edit', $this->extension . '.stage.' . $item->id);
 								// @TODO set proper checkin fields
 								$canCheckin = true || $user->authorise('core.admin', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
-								$canChange  = $user->authorise('core.edit.stage', $this->extension . '.stage.' . $item->id) && $canCheckin && !$isCore;
+								$canChange  = $user->authorise('core.edit.stage', $this->extension . '.stage.' . $item->id) && $canCheckin;
 								?>
 								<tr class="row<?php echo $i % 2; ?>">
 									<td class="order text-center hidden-sm-down">
@@ -118,14 +118,14 @@
 									</td>
 									<td class="text-center">
 										<div class="btn-group">
-											<?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'stages.', $canChange); ?>
+											<?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'stages.', $canChange && !$isCore); ?>
 										</div>
 									</td>
 									<td class="text-center">
 										<?php echo HTMLHelper::_('jgrid.isdefault', $item->default, $i, 'stages.', $canChange); ?>
 									</td>
 									<th scope="row">
-										<?php if ($canEdit) : ?>
+										<?php if ($canEdit && !$isCore) : ?>
 											<?php $editIcon = '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
 											<a href="<?php echo $edit; ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes(Text::_($item->title))); ?>">
 												<?php echo $editIcon; ?><?php echo $this->escape(Text::_($item->title)); ?>
diff --git a/administrator/components/com_workflow/tmpl/transition/edit.php b/administrator/components/com_workflow/tmpl/transition/edit.php
index a6c835e7b4255..27c0dae3069a1 100644
--- a/administrator/components/com_workflow/tmpl/transition/edit.php
+++ b/administrator/components/com_workflow/tmpl/transition/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_workflow/tmpl/transitions/default.php b/administrator/components/com_workflow/tmpl/transitions/default.php
index 7f0a11ec7f3a3..6308d446d15b4 100644
--- a/administrator/components/com_workflow/tmpl/transitions/default.php
+++ b/administrator/components/com_workflow/tmpl/transitions/default.php
@@ -5,7 +5,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       4.0.0
  */
diff --git a/administrator/components/com_workflow/tmpl/workflow/edit.php b/administrator/components/com_workflow/tmpl/workflow/edit.php
index 2d608eb352018..4bd6c89dd0cb5 100644
--- a/administrator/components/com_workflow/tmpl/workflow/edit.php
+++ b/administrator/components/com_workflow/tmpl/workflow/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_workflow/tmpl/workflows/default.php b/administrator/components/com_workflow/tmpl/workflows/default.php
index 53b42fedeb02b..a58f97cf6cee6 100644
--- a/administrator/components/com_workflow/tmpl/workflows/default.php
+++ b/administrator/components/com_workflow/tmpl/workflows/default.php
@@ -5,7 +5,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_workflow
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       4.0.0
  */
@@ -102,11 +102,11 @@
 							$edit = Route::_('index.php?option=com_workflow&task=workflow.edit&id=' . $item->id . '&extension=' . $extension);
 
 							$isCore     = !empty($item->core);
-							$canEdit    = $user->authorise('core.edit', $extension . '.workflow.' . $item->id) && !$isCore;
+							$canEdit    = $user->authorise('core.edit', $extension . '.workflow.' . $item->id);
 							// @TODO set proper checkin fields
 							$canCheckin = true || $user->authorise('core.admin', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
-							$canEditOwn = $user->authorise('core.edit.own',   $extension . '.workflow.' . $item->id) && $item->created_by == $userId && !$isCore;
-							$canChange  = $user->authorise('core.edit.state', $extension . '.workflow.' . $item->id) && $canCheckin  && !$isCore;
+							$canEditOwn = $user->authorise('core.edit.own',   $extension . '.workflow.' . $item->id) && $item->created_by == $userId;
+							$canChange  = $user->authorise('core.edit.state', $extension . '.workflow.' . $item->id) && $canCheckin;
 							?>
 							<tr class="row<?php echo $i % 2; ?>" data-dragable-group="0">
 								<td class="order text-center hidden-sm-down">
@@ -133,11 +133,11 @@
 								</td>
 								<td class="text-center">
 									<div class="btn-group">
-										<?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'workflows.', $canChange); ?>
+										<?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'workflows.', $canChange && !$isCore); ?>
 									</div>
 								</td>
 								<th scope="row">
-									<?php if ($canEdit || $canEditOwn) : ?>
+									<?php if (!$isCore && ($canEdit || $canEditOwn)) : ?>
 										<?php $editIcon = '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
 										<a href="<?php echo $edit; ?>" title="<?php echo Text::_('JACTION_EDIT', true); ?> <?php echo Text::_($item->title, true); ?>">
 											<?php echo $editIcon; ?><?php echo $this->escape(Text::_($item->title)); ?>
diff --git a/administrator/components/com_workflow/workflow.xml b/administrator/components/com_workflow/workflow.xml
index 5e216ccfe7735..efe363ae4218c 100644
--- a/administrator/components/com_workflow/workflow.xml
+++ b/administrator/components/com_workflow/workflow.xml
@@ -3,7 +3,7 @@
     <name>com_workflow</name>
     <author>Joomla! Project</author>
     <creationDate>June 2017</creationDate>
-    <copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+    <copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
     <license>GNU General Public License version 2 or later; see LICENSE.txt</license>
     <authorEmail>admin@joomla.org</authorEmail>
     <authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_wrapper/services/provider.php b/administrator/components/com_wrapper/services/provider.php
index 50796d9376ccd..0db3361963e98 100644
--- a/administrator/components/com_wrapper/services/provider.php
+++ b/administrator/components/com_wrapper/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_wrapper
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_wrapper/wrapper.xml b/administrator/components/com_wrapper/wrapper.xml
index b70faab78f601..e292a03a97c69 100644
--- a/administrator/components/com_wrapper/wrapper.xml
+++ b/administrator/components/com_wrapper/wrapper.xml
@@ -3,7 +3,7 @@
 	<name>com_wrapper</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.
 	</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/administrator/includes/app.php b/administrator/includes/app.php
index ea56b1e27f8af..c8dc7ff23e871 100644
--- a/administrator/includes/app.php
+++ b/administrator/includes/app.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Administrator
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/includes/defines.php b/administrator/includes/defines.php
index 1e2eb7b80a31a..6175618744b03 100644
--- a/administrator/includes/defines.php
+++ b/administrator/includes/defines.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Administrator
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -23,3 +23,4 @@
 define('JPATH_THEMES',        JPATH_BASE . DIRECTORY_SEPARATOR . 'templates');
 define('JPATH_CACHE',         JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'cache');
 define('JPATH_MANIFESTS',     JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'manifests');
+define('JPATH_API',           JPATH_ROOT . DIRECTORY_SEPARATOR . 'api');
diff --git a/administrator/includes/framework.php b/administrator/includes/framework.php
index 05eb4bde1ea87..dc0f1f826ae44 100644
--- a/administrator/includes/framework.php
+++ b/administrator/includes/framework.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Administrator
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/index.php b/administrator/index.php
index c980d1b8d19dd..8122b3678dc58 100644
--- a/administrator/index.php
+++ b/administrator/index.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Administrator
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/language/en-GB/en-GB.com_actionlogs.ini b/administrator/language/en-GB/en-GB.com_actionlogs.ini
new file mode 100644
index 0000000000000..46d9f599397e3
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.com_actionlogs.ini
@@ -0,0 +1,62 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_ACTIONLOGS="User Actions Log"
+COM_ACTIONLOGS_ACTION="Action"
+COM_ACTIONLOGS_ACTION_ASC="Action ascending"
+COM_ACTIONLOGS_ACTION_DESC="Action descending"
+COM_ACTIONLOGS_ACTION_VIEWLOGS="View logs"
+COM_ACTIONLOGS_ACTION_VIEWLOGS_DESC="Allows users in the group to view the logs."
+COM_ACTIONLOGS_COMMA="Comma"
+COM_ACTIONLOGS_CONFIGURATION="User Actions Log: Options"
+COM_ACTIONLOGS_CSV_DELIMITER_DESC="Set the separator for values in the CSV export."
+COM_ACTIONLOGS_CSV_DELIMITER_LABEL="CSV Delimiter"
+COM_ACTIONLOGS_DATE="Date"
+COM_ACTIONLOGS_DISABLED="Disabled"
+COM_ACTIONLOGS_EMAIL_DESC="This is the latest action performed by a user on your website."
+COM_ACTIONLOGS_EMAIL_SUBJECT="Latest User Actions"
+COM_ACTIONLOGS_EXPORT_ALL_CSV="Export All as CSV"
+COM_ACTIONLOGS_EXPORT_CSV="Export Selected as CSV"
+COM_ACTIONLOGS_EXTENSION="Extension"
+COM_ACTIONLOGS_EXTENSION_ASC="Extension ascending"
+COM_ACTIONLOGS_EXTENSION_DESC="Extension descending"
+COM_ACTIONLOGS_EXTENSION_FILTER_DESC="Search in the User Action logs by extension"
+COM_ACTIONLOGS_ERROR_COULD_NOT_EXPORT_DATA="Could not export data."
+COM_ACTIONLOGS_IP_ADDRESS="IP Address"
+COM_ACTIONLOGS_IP_ADDRESS_ASC="IP Address ascending"
+COM_ACTIONLOGS_IP_ADDRESS_DESC="IP Address descending"
+COM_ACTIONLOGS_IP_INVALID="Invalid IP"
+COM_ACTIONLOGS_IP_LOGGING_DESC="Enable logging the IP address of users."
+COM_ACTIONLOGS_IP_LOGGING_LABEL="IP Logging"
+COM_ACTIONLOGS_LOG_EXTENSIONS_DESC="Select events to be logged."
+COM_ACTIONLOGS_LOG_EXTENSIONS_LABEL="Events To Log"
+COM_ACTIONLOGS_MANAGER_USERLOGS="User Actions Log"
+COM_ACTIONLOGS_N_ITEMS_DELETED="%s logs deleted."
+COM_ACTIONLOGS_N_ITEMS_DELETED_1="%s log deleted."
+COM_ACTIONLOGS_NAME="Name"
+COM_ACTIONLOGS_NAME_ASC="Name ascending"
+COM_ACTIONLOGS_NAME_DESC="Name descending"
+COM_ACTIONLOGS_NO_ITEM_SELECTED="Please first make a selection from the list."
+COM_ACTIONLOGS_NO_LOGS_TO_EXPORT="There are no User Action logs to export."
+COM_ACTIONLOGS_OPTION_FILTER_DATE="- Select Date -"
+COM_ACTIONLOGS_OPTION_RANGE_NEVER="Never"
+COM_ACTIONLOGS_OPTION_RANGE_PAST_1MONTH="In the last month"
+COM_ACTIONLOGS_OPTION_RANGE_PAST_3MONTH="In the last 3 months"
+COM_ACTIONLOGS_OPTION_RANGE_PAST_6MONTH="In the last 6 months"
+COM_ACTIONLOGS_OPTION_RANGE_PAST_WEEK="In the last week"
+COM_ACTIONLOGS_OPTION_RANGE_PAST_YEAR="In the last year"
+COM_ACTIONLOGS_OPTION_RANGE_POST_YEAR="More than a year ago"
+COM_ACTIONLOGS_OPTION_RANGE_TODAY="Today"
+COM_ACTIONLOGS_OPTIONS="Options"
+COM_ACTIONLOGS_POSTINSTALL_BODY="<p>With the release of Joomla 3.9.0 you can now log all administrative actions performed by your users in supported extensions. It is now easy to see who did what and when they did it.</p><p>The logs can be reviewed in Joomla or exported for external use.</p><p>For further information on this new feature read the <a href='https://docs.joomla.org/J3.x:User_Action_Logs' target='_new'>User Action Logs documentation.</a></p>"
+COM_ACTIONLOGS_POSTINSTALL_TITLE="User Actions Can Now Be Logged"
+COM_ACTIONLOGS_PURGE_CONFIRM="Are you sure want to delete all User Action logs?"
+COM_ACTIONLOGS_PURGE_FAIL="Failed to delete all User Action logs."
+COM_ACTIONLOGS_PURGE_SUCCESS="All User Action logs have been deleted."
+COM_ACTIONLOGS_SELECT_EXTENSION="- Select Extension -"
+COM_ACTIONLOGS_SELECT_USER="- Select User -"
+COM_ACTIONLOGS_SEMICOLON="Semicolon"
+COM_ACTIONLOGS_TOOLBAR_PURGE="Purge"
+COM_ACTIONLOGS_XML_DESCRIPTION="Displays a log of actions performed by users on your website."
diff --git a/administrator/language/en-GB/en-GB.com_actionlogs.sys.ini b/administrator/language/en-GB/en-GB.com_actionlogs.sys.ini
new file mode 100644
index 0000000000000..db27ad08cf0d0
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.com_actionlogs.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_ACTIONLOGS="User Actions Log"
+COM_ACTIONLOGS_XML_DESCRIPTION="Displays a log of actions performed by users on your website."
diff --git a/administrator/language/en-GB/en-GB.com_admin.ini b/administrator/language/en-GB/en-GB.com_admin.ini
index 3c691310375ea..60b9aa482c4b3 100644
--- a/administrator/language/en-GB/en-GB.com_admin.ini
+++ b/administrator/language/en-GB/en-GB.com_admin.ini
@@ -1,12 +1,11 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 COM_ADMIN="System Information"
 COM_ADMIN_ALPHABETICAL_INDEX="Alphabetical Index"
 COM_ADMIN_CACHE_DIRECTORY="(Cache Folder)"
-COM_ADMIN_CLEAR_RESULTS="Clear results"
 COM_ADMIN_CONFIGURATION_FILE="Configuration File"
 COM_ADMIN_DATABASE_COLLATION="Database Collation"
 COM_ADMIN_DATABASE_CONNECTION_COLLATION="Database Connection Collation"
@@ -21,8 +20,8 @@ COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_JSON="Download as JSON"
 COM_ADMIN_EXTENSIONS="Extensions"
 COM_ADMIN_FILE_UPLOADS="File Uploads"
 COM_ADMIN_GLOSSARY="Glossary"
-COM_ADMIN_GO="Go"
 COM_ADMIN_HELP="Joomla! Help"
+COM_ADMIN_HELP_COMPONENTS_ACTIONLOGS="Action Logs"
 COM_ADMIN_HELP_COMPONENTS_ASSOCIATIONS="Multilingual Associations"
 COM_ADMIN_HELP_COMPONENTS_ASSOCIATIONS_EDIT="Multilingual Associations: Select"
 COM_ADMIN_HELP_COMPONENTS_BANNERS_BANNERS="Banners"
@@ -55,6 +54,12 @@ COM_ADMIN_HELP_COMPONENTS_NEWSFEEDS_CATEGORIES_EDIT="News Feeds: Categories - Ne
 COM_ADMIN_HELP_COMPONENTS_NEWSFEEDS_FEEDS="News Feeds"
 COM_ADMIN_HELP_COMPONENTS_NEWSFEEDS_FEEDS_EDIT="News Feeds: New/Edit"
 COM_ADMIN_HELP_COMPONENTS_POST_INSTALLATION_MESSAGES="Post-Installation Messages"
+COM_ADMIN_HELP_COMPONENTS_PRIVACY_CAPABILITIES="Privacy: Extension Capabilities"
+COM_ADMIN_HELP_COMPONENTS_PRIVACY_CONSENTS="Privacy: Consents"
+COM_ADMIN_HELP_COMPONENTS_PRIVACY_DASHBOARD="Privacy: Dashboard"
+COM_ADMIN_HELP_COMPONENTS_PRIVACY_REQUEST="Privacy: Review Information Request"
+COM_ADMIN_HELP_COMPONENTS_PRIVACY_REQUEST_EDIT="Privacy: New Information Request"
+COM_ADMIN_HELP_COMPONENTS_PRIVACY_REQUESTS="Privacy: Information Requests"
 COM_ADMIN_HELP_COMPONENTS_REDIRECT_MANAGER="Redirect: Links"
 COM_ADMIN_HELP_COMPONENTS_REDIRECT_MANAGER_EDIT="Redirect: Links - New/Edit"
 COM_ADMIN_HELP_COMPONENTS_SEARCH="Search"
@@ -107,15 +112,12 @@ COM_ADMIN_HELP_USERS_USER_NOTES_EDIT="Users: User Notes - New/Edit"
 COM_ADMIN_HELP_USERS_USER_MANAGER="Users"
 COM_ADMIN_HELP_USERS_USER_MANAGER_EDIT="Users: New/Edit"
 COM_ADMIN_ICONV_AVAILABLE="Iconv Available"
-COM_ADMIN_INFORMATION="System Information"
 COM_ADMIN_JOOMLA_VERSION="Joomla! Version"
 COM_ADMIN_LATEST_VERSION_CHECK="Latest Version Check"
 COM_ADMIN_LICENSE="License"
 COM_ADMIN_LOG_DIRECTORY="(Log folder)"
-COM_ADMIN_MAGIC_QUOTES="Magic Quotes"
 COM_ADMIN_MAX_INPUT_VARS="Maximum Input Variables"
 COM_ADMIN_MBSTRING_ENABLED="Multibyte String (mbstring) Enabled"
-COM_ADMIN_MCRYPT_ENABLED="Mcrypt Enabled"
 COM_ADMIN_MEDIA_CACHE_DIRECTORY="Cached Media Directory"
 COM_ADMIN_NA="n/a"
 COM_ADMIN_OPEN_BASEDIR="Open basedir"
@@ -125,38 +127,17 @@ COM_ADMIN_PHP_INFORMATION="PHP Information"
 COM_ADMIN_PHP_SETTINGS="PHP Settings"
 COM_ADMIN_PHP_VERSION="PHP Version"
 COM_ADMIN_PHPINFO_DISABLED="The built in phpinfo() function has been disabled by your host."
-COM_ADMIN_PLATFORM_VERSION="Joomla! Platform Version"
-COM_ADMIN_RELEVANT_PHP_SETTINGS="Relevant PHP Settings"
-COM_ADMIN_SEARCH="Search"
 COM_ADMIN_SESSION_AUTO_START="Session Auto Start"
 COM_ADMIN_SESSION_SAVE_PATH="Session Save Path"
 COM_ADMIN_SETTING="Setting"
 COM_ADMIN_SHORT_OPEN_TAGS="Short Open Tags"
 COM_ADMIN_START_HERE="Start here"
 COM_ADMIN_STATUS="Status"
-COM_ADMIN_SYSTEM_INFO="System Info"
 COM_ADMIN_SYSTEM_INFORMATION="System Information"
 COM_ADMIN_TEMP_DIRECTORY="(Temp folder)"
 COM_ADMIN_UNWRITABLE="Unwritable"
-COM_ADMIN_USER_ACCOUNT_DETAILS="My Profile Details"
 COM_ADMIN_USER_AGENT="User Agent"
-COM_ADMIN_USER_FIELD_BACKEND_LANGUAGE_LABEL="Backend Language"
-COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_LABEL="Backend Template Style"
-COM_ADMIN_USER_FIELD_EDITOR_LABEL="Editor"
-COM_ADMIN_USER_FIELD_FRONTEND_LANGUAGE_LABEL="Frontend Language"
-COM_ADMIN_USER_FIELD_HELPSITE_LABEL="Help Site"
-COM_ADMIN_USER_FIELD_LASTVISIT_LABEL="Last Visit Date"
-COM_ADMIN_USER_FIELD_NOCHANGE_USERNAME_DESC="If you want to change your Username, please contact a site administrator."
-COM_ADMIN_USER_FIELD_PASSWORD1_MESSAGE="The passwords you entered do not match. Please enter your desired password in the password field and confirm your entry by entering it in the confirm password field."
-COM_ADMIN_USER_FIELD_PASSWORD2_LABEL="Confirm Password"
-COM_ADMIN_USER_FIELD_REGISTERDATE_LABEL="Registration Date"
-COM_ADMIN_USER_FIELD_TIMEZONE_LABEL="Time Zone"
-COM_ADMIN_USER_FIELD_USERNAME_LABEL="Login Name"
-COM_ADMIN_USER_HEADING_NAME="Name"
-COM_ADMIN_USER_SETTINGS_FIELDSET_LABEL="Basic Settings"
 COM_ADMIN_VALUE="Value"
-COM_ADMIN_VIEW="View"
-COM_ADMIN_VIEW_PROFILE_TITLE="My Profile"
 COM_ADMIN_WEBSERVER_TO_PHP_INTERFACE="WebServer to PHP Interface"
 COM_ADMIN_WEB_SERVER="Web Server"
 COM_ADMIN_WRITABLE="Writable"
@@ -164,15 +145,3 @@ COM_ADMIN_XML_DESCRIPTION="Administration system information component."
 COM_ADMIN_XML_ENABLED="XML Enabled"
 COM_ADMIN_ZIP_ENABLED="Native ZIP Enabled"
 COM_ADMIN_ZLIB_ENABLED="Zlib Enabled"
-
-; Messages
-COM_USERS_MSG_NOT_ENOUGH_INTEGERS_N="Password does not have enough digits. At least %s digits are required."
-COM_USERS_MSG_NOT_ENOUGH_INTEGERS_N_1="Password does not have enough digits. At least 1 digit is required."
-COM_USERS_MSG_NOT_ENOUGH_SYMBOLS_N="Password does not have enough symbols. At least %s symbols are required."
-COM_USERS_MSG_NOT_ENOUGH_SYMBOLS_N_1="Password does not have enough symbols. At least 1 symbol is required."
-COM_USERS_MSG_NOT_ENOUGH_UPPERCASE_LETTERS_N="Password does not have enough uppercase characters. At least %s upper case characters are required."
-COM_USERS_MSG_NOT_ENOUGH_UPPERCASE_LETTERS_N_1="Password does not have enough uppercase characters. At least 1 upper case character is required."
-COM_USERS_MSG_PASSWORD_TOO_LONG="Password is too long. Passwords must be less than 100 characters."
-COM_USERS_MSG_PASSWORD_TOO_SHORT_N="Password is too short. Passwords must have at least %s characters."
-COM_USERS_MSG_SPACES_IN_PASSWORD="Password must not have spaces at the beginning or end."
-
diff --git a/administrator/language/en-GB/en-GB.com_admin.sys.ini b/administrator/language/en-GB/en-GB.com_admin.sys.ini
index 7c5a6191aa8f6..a1bbc6c44e353 100644
--- a/administrator/language/en-GB/en-GB.com_admin.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_admin.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_ajax.ini b/administrator/language/en-GB/en-GB.com_ajax.ini
index cef5ced392ffa..b2eba95084108 100644
--- a/administrator/language/en-GB/en-GB.com_ajax.ini
+++ b/administrator/language/en-GB/en-GB.com_ajax.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_ajax.sys.ini b/administrator/language/en-GB/en-GB.com_ajax.sys.ini
index a281c5710b188..08d9146f0ca73 100644
--- a/administrator/language/en-GB/en-GB.com_ajax.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_ajax.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_associations.ini b/administrator/language/en-GB/en-GB.com_associations.ini
index 96efbb4d037c6..14898e17551dd 100644
--- a/administrator/language/en-GB/en-GB.com_associations.ini
+++ b/administrator/language/en-GB/en-GB.com_associations.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -18,6 +18,7 @@ COM_ASSOCIATIONS_EDIT_ASSOCIATION="Edit association"
 COM_ASSOCIATIONS_EDIT_HIDE_REFERENCE="Hide Reference"
 COM_ASSOCIATIONS_EDIT_SHOW_REFERENCE="Show Reference"
 COM_ASSOCIATIONS_ERROR_NO_ASSOC="The Multilingual Associations component can't be used if the site is not set as multilingual and/or Associations is not enabled in the <a href=\"%s\">Language Filter plugin</a>."
+COM_ASSOCIATIONS_ERROR_NO_TYPE="The item type selected does not exist for this component."
 COM_ASSOCIATIONS_FILTER_SEARCH_DESC="Search an item by its title"
 COM_ASSOCIATIONS_FILTER_SEARCH_LABEL="Search item"
 COM_ASSOCIATIONS_FILTER_SELECT_ITEM_TYPE="- Select Item Type -"
diff --git a/administrator/language/en-GB/en-GB.com_associations.sys.ini b/administrator/language/en-GB/en-GB.com_associations.sys.ini
index f6f948cec1cf7..7ddb71c4d55b0 100644
--- a/administrator/language/en-GB/en-GB.com_associations.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_associations.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_banners.ini b/administrator/language/en-GB/en-GB.com_banners.ini
index cb496cb573f3f..293178ede0287 100644
--- a/administrator/language/en-GB/en-GB.com_banners.ini
+++ b/administrator/language/en-GB/en-GB.com_banners.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_banners.sys.ini b/administrator/language/en-GB/en-GB.com_banners.sys.ini
index 1c17a12a4d4ca..2e6780fc2aa55 100644
--- a/administrator/language/en-GB/en-GB.com_banners.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_banners.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_cache.ini b/administrator/language/en-GB/en-GB.com_cache.ini
index 399c8a6ecbee1..9622d4ea0c111 100644
--- a/administrator/language/en-GB/en-GB.com_cache.ini
+++ b/administrator/language/en-GB/en-GB.com_cache.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_cache.sys.ini b/administrator/language/en-GB/en-GB.com_cache.sys.ini
index 128c508017ad2..9baf2344d057a 100644
--- a/administrator/language/en-GB/en-GB.com_cache.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_cache.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_categories.ini b/administrator/language/en-GB/en-GB.com_categories.ini
index 8f5b823b67c1b..0f9f0ac60365f 100644
--- a/administrator/language/en-GB/en-GB.com_categories.ini
+++ b/administrator/language/en-GB/en-GB.com_categories.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_categories.sys.ini b/administrator/language/en-GB/en-GB.com_categories.sys.ini
index 814aea9caa7c2..5452ec6920a2d 100644
--- a/administrator/language/en-GB/en-GB.com_categories.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_categories.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_checkin.ini b/administrator/language/en-GB/en-GB.com_checkin.ini
index 6d18103e1ac95..270a7f09ef7df 100644
--- a/administrator/language/en-GB/en-GB.com_checkin.ini
+++ b/administrator/language/en-GB/en-GB.com_checkin.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_checkin.sys.ini b/administrator/language/en-GB/en-GB.com_checkin.sys.ini
index e272c30509263..8545c4638d188 100644
--- a/administrator/language/en-GB/en-GB.com_checkin.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_checkin.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini
index a340b1927de71..a3f1fd863383b 100644
--- a/administrator/language/en-GB/en-GB.com_config.ini
+++ b/administrator/language/en-GB/en-GB.com_config.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -26,6 +26,7 @@ COM_CONFIG_ERROR_ROOT_ASSET_NOT_FOUND="The asset for global configuration could
 COM_CONFIG_ERROR_SSL_NOT_AVAILABLE="HTTPS has not been enabled as it is not available on this server. HTTPS connection test failed with the following error: <em>%s</em>"
 COM_CONFIG_ERROR_SSL_NOT_AVAILABLE_HTTP_CODE="HTTPS version of the site returned an invalid HTTP status code."
 COM_CONFIG_ERROR_REMOVING_SUPER_ADMIN="You can't remove your own Super User permissions."
+COM_CONFIG_ERROR_UNKNOWN_BEFORE_SAVING="A plugin reported an unknown error before saving the configuration."
 COM_CONFIG_ERROR_WRITE_FAILED="Could not write to the configuration file"
 COM_CONFIG_FIELD_CACHE_HANDLER_LABEL="Cache Handler"
 COM_CONFIG_FIELD_CACHE_PLATFORMPREFIX_LABEL="Platform Specific Caching"
@@ -40,8 +41,12 @@ COM_CONFIG_FIELD_DATABASE_NAME_LABEL="Database Name"
 COM_CONFIG_FIELD_DATABASE_PREFIX_LABEL="Database Tables Prefix"
 COM_CONFIG_FIELD_DATABASE_TYPE_LABEL="Database Type"
 COM_CONFIG_FIELD_DATABASE_USERNAME_LABEL="Database Username"
+COM_CONFIG_FIELD_DEBUG_CONST="Constant"
+COM_CONFIG_FIELD_DEBUG_CONST_LANG_DESC="Select if you should display the language constant or the language value when debugging the language strings."
+COM_CONFIG_FIELD_DEBUG_CONST_LANG_LABEL="Language Display"
 COM_CONFIG_FIELD_DEBUG_LANG_LABEL="Debug Language"
 COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL="Debug System"
+COM_CONFIG_FIELD_DEBUG_VALUE="Value"
 COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL="Default Access Level"
 COM_CONFIG_FIELD_DEFAULT_EDITOR_LABEL="Default Editor"
 COM_CONFIG_FIELD_DEFAULT_CAPTCHA_LABEL="Default Captcha"
@@ -105,7 +110,7 @@ COM_CONFIG_FIELD_SEF_REWRITE_DESC="Available for IIS 7 and Apache. <br><strong>A
 COM_CONFIG_FIELD_SEF_REWRITE_LABEL="Use URL Rewriting"
 COM_CONFIG_FIELD_SEF_SUFFIX_LABEL="Add Suffix to URL"
 COM_CONFIG_FIELD_SEF_URL_LABEL="Search Engine Friendly URLs"
-COM_CONFIG_FIELD_SERVER_TIMEZONE_LABEL="Server Time Zone"
+COM_CONFIG_FIELD_SERVER_TIMEZONE_LABEL="Website Time Zone"
 COM_CONFIG_FIELD_FILESYSTEM_PATH_DESC="The filesystem path where session data will be stored.<br>If empty, the system's temporary directory will be used."
 COM_CONFIG_FIELD_FILESYSTEM_PATH_LABEL="Session Save Path"
 COM_CONFIG_FIELD_SESSION_HANDLER_LABEL="Session Handler"
@@ -156,6 +161,9 @@ COM_CONFIG_SAVE_SUCCESS="Configuration saved."
 COM_CONFIG_SENDMAIL_ACTION_BUTTON="Send Test Mail"
 COM_CONFIG_SENDMAIL_BODY="This is a test mail sent using \"%s\". Your email settings are correct!"
 COM_CONFIG_SENDMAIL_ERROR="Test mail could not be sent."
+COM_CONFIG_SENDMAIL_METHOD_MAIL="PHP Mail"
+COM_CONFIG_SENDMAIL_METHOD_SENDMAIL="Sendmail"
+COM_CONFIG_SENDMAIL_METHOD_SMTP="SMTP"
 COM_CONFIG_SENDMAIL_SUBJECT="Test mail from %s"
 COM_CONFIG_SENDMAIL_SUCCESS="The email was sent to <strong>%s</strong> using <strong>%s</strong>. You should check that you've received the test email."
 COM_CONFIG_SENDMAIL_SUCCESS_FALLBACK="The email was sent to <strong>%s</strong> but using <strong>%s</strong> as fallback. You should check that you've received the test email."
diff --git a/administrator/language/en-GB/en-GB.com_config.sys.ini b/administrator/language/en-GB/en-GB.com_config.sys.ini
index 154319070b5a4..d1c001e9e417c 100644
--- a/administrator/language/en-GB/en-GB.com_config.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_config.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_contact.ini b/administrator/language/en-GB/en-GB.com_contact.ini
index 4f099bcf8e21f..019418160b425 100644
--- a/administrator/language/en-GB/en-GB.com_contact.ini
+++ b/administrator/language/en-GB/en-GB.com_contact.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -127,6 +127,7 @@ COM_CONTACT_FIELD_VALUE_NAME="Name"
 COM_CONTACT_FIELD_VALUE_NO_LINK="Show Without Link"
 COM_CONTACT_FIELD_VALUE_NONE="None"
 COM_CONTACT_FIELD_VALUE_ORDERING="Ordering"
+COM_CONTACT_FIELD_VALUE_ORDERING_FEATURED="Featured Contacts Ordering"
 COM_CONTACT_FIELD_VALUE_PLAIN="Plain"
 COM_CONTACT_FIELD_VALUE_SLIDERS="Sliders"
 COM_CONTACT_FIELD_VALUE_SORT_NAME="Sort Name"
@@ -171,6 +172,7 @@ COM_CONTACT_N_ITEMS_UNPUBLISHED="%d contacts unpublished."
 COM_CONTACT_N_ITEMS_UNPUBLISHED_1="%d contact unpublished."
 COM_CONTACT_NEW_CONTACT="New Contact"
 COM_CONTACT_NO_ITEM_SELECTED="No contacts selected."
+COM_CONTACT_NUMBER_CONTACTS_LIST_LABEL="# Contacts to List"
 COM_CONTACT_SAVE_SUCCESS="Contact saved."
 COM_CONTACT_SEARCH_IN_NAME="Search contacts by name"
 COM_CONTACT_SELECT_A_CONTACT="Select a Contact"
diff --git a/administrator/language/en-GB/en-GB.com_contact.sys.ini b/administrator/language/en-GB/en-GB.com_contact.sys.ini
index c7e4820a281e1..89c3d2977f9c0 100644
--- a/administrator/language/en-GB/en-GB.com_contact.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_contact.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_content.ini b/administrator/language/en-GB/en-GB.com_content.ini
index ad13c66cc51b5..3d2b640116928 100644
--- a/administrator/language/en-GB/en-GB.com_content.ini
+++ b/administrator/language/en-GB/en-GB.com_content.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -70,6 +70,7 @@ COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL="Position of Article Info"
 COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL="Article Info Title"
 COM_CONTENT_FIELD_INTROTEXT="Intro Text"
 COM_CONTENT_FIELD_INTRO_LABEL="Intro Image"
+COM_CONTENT_FIELD_NOTE_LABEL="Note"
 COM_CONTENT_FIELD_OPTION_ABOVE="Above"
 COM_CONTENT_FIELD_OPTION_BELOW="Below"
 COM_CONTENT_FIELD_OPTION_SPLIT="Split"
@@ -90,7 +91,9 @@ COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS="Use Article Settings"
 COM_CONTENT_FIELD_VERSION_LABEL="Revision"
 COM_CONTENT_FIELD_XREFERENCE_DESC="An optional reference used to link to external data sources."
 COM_CONTENT_FIELD_XREFERENCE_LABEL="External Reference"
-COM_CONTENT_FILTER_SEARCH_DESC="Search in title and alias. Prefix with ID: or AUTHOR: to search for an article ID or article author."
+COM_CONTENT_FILTER_FEATURED_NO="Unfeatured Articles"
+COM_CONTENT_FILTER_FEATURED_YES="Featured Articles"
+COM_CONTENT_FILTER_SEARCH_DESC="Search in title, alias and note. Prefix with ID: or AUTHOR: or CONTENT: to search for an article ID, article author or search in article content."
 COM_CONTENT_FILTER_SEARCH_LABEL="Search Articles"
 COM_CONTENT_FLOAT_FULLTEXT_LABEL="Full Text Image Float"
 COM_CONTENT_FLOAT_INTRO_LABEL="Intro Image Float"
@@ -143,6 +146,7 @@ COM_CONTENT_RUN_TRANSITIONS="Run Transitions"
 COM_CONTENT_SAVE_SUCCESS="Article saved."
 COM_CONTENT_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the article to customise the alias."
 COM_CONTENT_SELECT_AN_ARTICLE="Select an Article"
+COM_CONTENT_SELECT_FEATURED="- Select Featured -"
 COM_CONTENT_SHARED_DESC="These settings apply for Shared Options in List, Blog and Featured unless they are changed by the menu settings."
 COM_CONTENT_SHARED_LABEL="Shared"
 COM_CONTENT_SHOW_ARTICLE_OPTIONS_LABEL="Article Options"
diff --git a/administrator/language/en-GB/en-GB.com_content.sys.ini b/administrator/language/en-GB/en-GB.com_content.sys.ini
index 8a0bc2631b320..60080652b7cf2 100644
--- a/administrator/language/en-GB/en-GB.com_content.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_content.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_contenthistory.ini b/administrator/language/en-GB/en-GB.com_contenthistory.ini
index 461b1d9b99ef3..b26d51caa911c 100644
--- a/administrator/language/en-GB/en-GB.com_contenthistory.ini
+++ b/administrator/language/en-GB/en-GB.com_contenthistory.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini b/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini
index dcdc1dd7e1fcd..1f1d6f62e22da 100644
--- a/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_cpanel.ini b/administrator/language/en-GB/en-GB.com_cpanel.ini
index 5a0badc921fee..5352801fa9eb8 100644
--- a/administrator/language/en-GB/en-GB.com_cpanel.ini
+++ b/administrator/language/en-GB/en-GB.com_cpanel.ini
@@ -1,11 +1,12 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 COM_CPANEL="Control Panel"
-COM_CPANEL_MESSAGES_BODY_NOCLOSE="There are important post-installation messages that require your attention."
+COM_CPANEL_ERROR_DASHBOARD_TYPE_NOT_SUPPORTED="This dashboard type is not supported."
 COM_CPANEL_MESSAGES_BODYMORE_NOCLOSE="This information area won't appear when you have hidden all the messages."
+COM_CPANEL_MESSAGES_BODY_NOCLOSE="There are important post-installation messages that require your attention."
 COM_CPANEL_MESSAGES_REVIEW="Read Messages"
 COM_CPANEL_MESSAGES_TITLE="You have post-installation messages"
 COM_CPANEL_MSG_EACCELERATOR_BODY="eAccelerator is not compatible with Joomla! By selecting the Change to File Caching button below we will change the cache handler to file. If you want to use a different cache handler, please change it in the Global Configuration page."
@@ -13,16 +14,18 @@ COM_CPANEL_MSG_EACCELERATOR_BUTTON="Change to File."
 COM_CPANEL_MSG_EACCELERATOR_TITLE="eAccelerator is not compatible with Joomla!"
 COM_CPANEL_MSG_HTACCESS_BODY="A change to the default .htaccess and web.config files was made in Joomla! 3.4 to disallow folder listings by default.  Users are recommended to implement this change in their files.  Please see <a href=\"https://docs.joomla.org/Special:MyLanguage/Preconfigured_htaccess\">this page</a> for more information."
 COM_CPANEL_MSG_HTACCESS_TITLE=".htaccess & web.config Update"
-COM_CPANEL_MSG_LANGUAGEACCESS340_TITLE="You have possible issues with your multilingual settings"
 COM_CPANEL_MSG_LANGUAGEACCESS340_BODY="Since Joomla! 3.4.0 you may have issues with the System - Language Filter plugin on your website. To fix them please open the <a href=\"index.php?option=com_languages&view=languages\">Language Manager</a> and save each content language manually to make sure an Access level is saved."
-COM_CPANEL_MSG_ROBOTS_TITLE="robots.txt Update"
+COM_CPANEL_MSG_LANGUAGEACCESS340_TITLE="You have possible issues with your multilingual settings"
 COM_CPANEL_MSG_ROBOTS_BODY="A change to the default robots.txt files was made in Joomla! 3.3 to allow Google to access templates and media files by default to improve SEO. This change is not applied automatically on upgrades and users are recommended to review the changes in the robots.txt.dist file and implement these changes in their own robots.txt file."
+COM_CPANEL_MSG_ROBOTS_TITLE="robots.txt Update"
 COM_CPANEL_MSG_STATS_COLLECTION_BODY="<p>Since Joomla! 3.5 a statistics plugin will submit anonymous data to the Joomla Project. This will only submit the Joomla version, PHP version, database engine and version, and server operating system.</p><p>This data is collected to ensure that future versions of Joomla can take advantage of the latest database and PHP features without affecting significant numbers of users. The need for this became clear when a minimum of PHP 5.3.10 was required when Joomla! 3.3 implemented the more secure Bcrypt passwords.</p><p>In the interest of full transparency and to help developers <a href=\"https://developer.joomla.org/about/stats.html\">this data is publicly available.</a> An API and graphs will show the Joomla version, PHP versions and database engines in use.</p><p>If you do not wish to provide the Joomla Project with this information you can disable the plugin called System - Joomla Statistics.</p>"
 COM_CPANEL_MSG_STATS_COLLECTION_TITLE="Stats Collection in Joomla"
-COM_CPANEL_SYSTEM_SETUP="Setup"
-COM_CPANEL_TITLE_SYSTEM_PANEL="System Panel"
 COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_BODY="<p>As part of our security team's review, we have made some changes to the default settings in a new Joomla installation. As these changes are only applied to new installations, we strongly recommend that you review these changes and update your site.</p><p>The changed settings are:</p><ul><li>Global Configuration > Text Filters: The default \"Administrator\" user group has changed from \"No Filtering\" to \"Default Blacklist\"</li><li>Users > Send Password: The option to send a user their password in plain text when an account is created is now disabled by default</li><li>Media Manager: Flash files (\"swf\" file extension and \"application/x-shockwave-flash\" MIME Type) are not allowed to be uploaded</li><li>Articles > Show Email: The option to show an email icon with articles is disabled by default</li></ul><p>We have created a <a href=\"https://docs.joomla.org/Special:MyLanguage/J3.x:Joomla_3.8.8_notes_about_the_changed_default_settings\">dedicated documentation page</a> explaining these changes.</p>"
 COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_TITLE="Updated site security recommendations"
+COM_CPANEL_SYSTEM_SETUP="Setup"
+COM_CPANEL_TITLE_SYSTEM_PANEL="System Panel"
+COM_CPANEL_UNPUBLISH_MODULE_ERROR="Error unpublishing the module"
+COM_CPANEL_UNPUBLISH_MODULE_SUCCESS="Module unpublished"
 COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="<p>Community resources are available for new users.</p><ul><li><a href=\"https://docs.joomla.org/Special:MyLanguage/Portal:Beginners\">Joomla! Beginners Guide</a></li><li><a href=\"https://forum.joomla.org/viewforum.php?f=706\">New to Joomla! Forum</a></li></ul>"
 COM_CPANEL_WELCOME_BEGINNERS_TITLE="Welcome to Joomla!"
 COM_CPANEL_XML_DESCRIPTION="Control Panel component"
diff --git a/administrator/language/en-GB/en-GB.com_cpanel.sys.ini b/administrator/language/en-GB/en-GB.com_cpanel.sys.ini
index b8a55976eb8da..62c0acd245a6e 100644
--- a/administrator/language/en-GB/en-GB.com_cpanel.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_cpanel.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_csp.ini b/administrator/language/en-GB/en-GB.com_csp.ini
index c3a8ea21ed3a5..8a34e00460600 100644
--- a/administrator/language/en-GB/en-GB.com_csp.ini
+++ b/administrator/language/en-GB/en-GB.com_csp.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_csp.sys.ini b/administrator/language/en-GB/en-GB.com_csp.sys.ini
index a65a70547ec31..617dd23eeee85 100644
--- a/administrator/language/en-GB/en-GB.com_csp.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_csp.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_fields.ini b/administrator/language/en-GB/en-GB.com_fields.ini
index d340c45b70caa..61290e172cef4 100644
--- a/administrator/language/en-GB/en-GB.com_fields.ini
+++ b/administrator/language/en-GB/en-GB.com_fields.ini
@@ -1,14 +1,16 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 COM_FIELDS="Fields"
 COM_FIELDS_BATCH_GROUP_LABEL="To Move or Copy your selection please select a group."
 COM_FIELDS_BATCH_GROUP_OPTION_NONE="- No Group -"
-COM_FIELDS_ERROR_UNIQUE_NAME="Another Field has the same name (remember it may be a trashed item)."
+COM_FIELDS_ERROR_UNIQUE_NAME="Another Field has the same name (remember it may be a trashed item or it may be already present as a custom field in another extension)."
 COM_FIELDS_FIELD_CLASS_DESC="The class attributes of the field in the edit form. If multiple classes are needed, list them with spaces."
-COM_FIELDS_FIELD_CLASS_LABEL="Edit Class"
+COM_FIELDS_FIELD_CLASS_LABEL="Field Class"
+COM_FIELDS_FIELD_FORMOPTIONS_HEADING="Form Options"
+COM_FIELDS_FIELD_RENDEROPTIONS_HEADING="Render Options"
 COM_FIELDS_FIELD_SHOWLABEL_DESC="Show or Hide the label when the field renders."
 COM_FIELDS_FIELD_SHOWLABEL_LABEL="Label"
 COM_FIELDS_FIELD_DEFAULT_VALUE_LABEL="Default Value"
@@ -18,6 +20,8 @@ COM_FIELDS_FIELD_DISPLAY_BEFORE_DISPLAY="Before Display"
 COM_FIELDS_FIELD_DISPLAY_LABEL="Automatic Display"
 COM_FIELDS_FIELD_DISPLAY_NO_DISPLAY="Do not automatically display"
 COM_FIELDS_FIELD_GROUP_LABEL="Field Group"
+COM_FIELDS_FIELD_LAYOUT_DESC="Choose an alternate layout."
+COM_FIELDS_FIELD_LAYOUT_LABEL="Layout"
 COM_FIELDS_FIELD_PLACEHOLDER_DESC="Placeholder text which will appear inside the field as a hint to the user for the required input."
 COM_FIELDS_FIELD_PLACEHOLDER_LABEL="Placeholder"
 COM_FIELDS_FIELD_IMAGE_ALT_DESC="Alternative text used for visitors without access to images."
@@ -25,7 +29,9 @@ COM_FIELDS_FIELD_IMAGE_ALT_LABEL="Alt Text"
 COM_FIELDS_FIELD_IMAGE_DESC="Image label."
 COM_FIELDS_FIELD_IMAGE_LABEL="Image"
 COM_FIELDS_FIELD_INVALID_DEFAULT_VALUE="The default value is invalid."
+COM_FIELDS_FIELD_LABEL_FORM_CLASS_LABEL="Label Class (Form)"
 COM_FIELDS_FIELD_LABEL_LABEL="Label"
+COM_FIELDS_FIELD_LABEL_RENDER_CLASS_LABEL="Label Class (Output)"
 COM_FIELDS_FIELD_NOTE_LABEL="Note"
 COM_FIELDS_FIELD_RENDER_CLASS_DESC="The class attributes of the field when the field is rendered. If multiple classes are needed, list them with spaces."
 COM_FIELDS_FIELD_RENDER_CLASS_LABEL="Render Class"
diff --git a/administrator/language/en-GB/en-GB.com_fields.sys.ini b/administrator/language/en-GB/en-GB.com_fields.sys.ini
index 7363e71d64c42..1083837dbd805 100644
--- a/administrator/language/en-GB/en-GB.com_fields.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_fields.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_finder.ini b/administrator/language/en-GB/en-GB.com_finder.ini
index 9d7a1e1588d53..674242f3c9bfb 100644
--- a/administrator/language/en-GB/en-GB.com_finder.ini
+++ b/administrator/language/en-GB/en-GB.com_finder.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_finder.sys.ini b/administrator/language/en-GB/en-GB.com_finder.sys.ini
index 82e4efce4713b..4d7ecca042fd5 100644
--- a/administrator/language/en-GB/en-GB.com_finder.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_finder.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_installer.ini b/administrator/language/en-GB/en-GB.com_installer.ini
index d21143959af3e..b4fc691d016ea 100644
--- a/administrator/language/en-GB/en-GB.com_installer.ini
+++ b/administrator/language/en-GB/en-GB.com_installer.ini
@@ -1,11 +1,20 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 COM_INSTALLER="Installer"
 COM_INSTALLER_AUTHOR_INFORMATION="Author Information"
 COM_INSTALLER_CACHETIMEOUT_LABEL="Updates Caching (in hours)"
+COM_INSTALLER_CHANGELOG="Changelog"
+COM_INSTALLER_CHANGELOG_ADDITION="New Features"
+COM_INSTALLER_CHANGELOG_CHANGE="Changes"
+COM_INSTALLER_CHANGELOG_FIX="Bug Fixes"
+COM_INSTALLER_CHANGELOG_LANGUAGE="Language"
+COM_INSTALLER_CHANGELOG_NOTE="Notes"
+COM_INSTALLER_CHANGELOG_REMOVE="Removed Features"
+COM_INSTALLER_CHANGELOG_SECURITY="Security Fixes"
+COM_INSTALLER_CHANGELOG_TITLE="Changelog - %s - %s"
 COM_INSTALLER_CONFIGURATION="Installer: Options"
 COM_INSTALLER_CONFIRM_UNINSTALL="Are you sure you want to uninstall? Confirming will permanently delete the selected item(s)!"
 COM_INSTALLER_CURRENT_VERSION="Installed"
@@ -70,6 +79,7 @@ COM_INSTALLER_HEADING_UPDATESITE_NAME_ASC="Update Site ascending"
 COM_INSTALLER_HEADING_UPDATESITE_NAME_DESC="Update Site descending"
 COM_INSTALLER_HEADING_UPDATESITEID="ID"
 COM_INSTALLER_INSTALL_BUTTON="Install"
+COM_INSTALLER_INSTALL_CHECKSUM_WRONG="The checksum verification failed. Please make sure you are using the correct update server!"
 COM_INSTALLER_INSTALL_DIRECTORY="Install Folder"
 COM_INSTALLER_INSTALL_ERROR="Error installing %s"
 COM_INSTALLER_INSTALL_FROM_DIRECTORY="Install from Folder"
@@ -177,9 +187,9 @@ COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSETDESC="The PHP temporary folder is the
 COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLE="The PHP temporary folder is not writeable."
 COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLEDESC="The PHP temporary folder is not writeable by the Joomla! instance, which may cause issues when trying to upload extensions to Joomla. If you are having issues uploading extensions, check the '%s' and set it to be writeable and see if this fixes the issue."
 COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZE="Small PHP maximum POST size."
-COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZEDESC="The maximum POST size sets the most amount of data that can be sent via POST to the server. This includes form submissions for articles, media (images, videos) and packages. This value is less than 8MB which may impact on uploading large packages. This is set in the php.ini under post_max_size."
+COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZEDESC="The maximum POST size sets the most amount of data that can be sent via POST to the server. This includes form submissions for articles, media (images, videos) and extensions. This value is less than 8MB which may impact on uploading large extensions. This is set in the php.ini under post_max_size."
 COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE="Maximum PHP file upload size is too small: This is set in php.ini in both upload_max_filesize and post_max_size settings of your PHP settings (located in php.ini and/or .htaccess file)."
-COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZEDESC="The maximum file size for uploads is set to less than 8MB which may impact on uploading large packages."
+COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZEDESC="The maximum file size for uploads is set to less than 8MB which may impact on uploading large extensions."
 COM_INSTALLER_MSG_WARNINGS_UPDATE_NOTICE="Before updating ensure that the update is compatible with your Joomla! installation."
 COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOST="PHP Upload Size bigger than POST size."
 COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOSTDESC="The value of the upload_max_filesize in the php.ini file is greater than the post_max_size variable. The post_max_size variable will take precedence and block requests larger than it. This is generally a server misconfiguration when trying to increase upload sizes. Please increase the upload_max_filesize to at least match the post_max_size variable or vice versa."
@@ -200,13 +210,6 @@ COM_INSTALLER_PACKAGE_FILE="Package File"
 COM_INSTALLER_PREFERENCES_DESCRIPTION="Fine tune how extensions installation and updates work."
 COM_INSTALLER_PREFERENCES_LABEL="Preferences"
 COM_INSTALLER_REINSTALL_BUTTON="Reinstall"
-COM_INSTALLER_SUBMENU_DATABASE="Database"
-COM_INSTALLER_SUBMENU_DISCOVER="Discover"
-COM_INSTALLER_SUBMENU_INSTALL="Install"
-COM_INSTALLER_SUBMENU_LANGUAGES="Install Languages"
-COM_INSTALLER_SUBMENU_MANAGE="Manage"
-COM_INSTALLER_SUBMENU_UPDATE="Update"
-COM_INSTALLER_SUBMENU_UPDATESITES="Update Sites"
 COM_INSTALLER_SUBMENU_WARNINGS="Warnings"
 COM_INSTALLER_TITLE_DATABASE="Extensions: Database"
 COM_INSTALLER_TITLE_DISCOVER="Extensions: Discover"
diff --git a/administrator/language/en-GB/en-GB.com_installer.sys.ini b/administrator/language/en-GB/en-GB.com_installer.sys.ini
index a4159dce4e121..177d43359ac0b 100644
--- a/administrator/language/en-GB/en-GB.com_installer.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_installer.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
index def807391d368..271264b1abef0 100644
--- a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
+++ b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -83,6 +83,7 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_TESTING="You are on the &quot;%s&quot
 COM_JOOMLAUPDATE_VIEW_DEFAULT_UPLOAD_INTRO="You can use this feature to update Joomla if your server is behind a firewall or otherwise unable to contact the update servers. First download the Joomla <em>Upgrade Package</em> in ZIP format from <a class=\"alert-link\" href=\"%s\">the official Joomla download page</a>. Then use the fields below to upload and install it."
 COM_JOOMLAUPDATE_VIEW_UPDATE_BYTESEXTRACTED="Bytes extracted"
 COM_JOOMLAUPDATE_VIEW_UPDATE_BYTESREAD="Bytes read"
+COM_JOOMLAUPDATE_VIEW_UPDATE_CHECKSUM_WRONG="File Checksum Failed"
 COM_JOOMLAUPDATE_VIEW_UPDATE_DOWNLOADFAILED="Download of update package failed."
 COM_JOOMLAUPDATE_VIEW_UPDATE_FILESEXTRACTED="Files extracted"
 COM_JOOMLAUPDATE_VIEW_UPDATE_FINALISE_CONFIRM_AND_CONTINUE="Confirm & Continue"
diff --git a/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini b/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini
index 28a9ca998fc01..00f3acf732721 100644
--- a/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_languages.ini b/administrator/language/en-GB/en-GB.com_languages.ini
index ca91f5ede1835..659ea6bbd8730 100644
--- a/administrator/language/en-GB/en-GB.com_languages.ini
+++ b/administrator/language/en-GB/en-GB.com_languages.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -56,7 +56,8 @@ COM_LANGUAGES_INSTALL="Install Languages"
 COM_LANGUAGES_INSTALLED_FILTER_SEARCH_DESC="Search in title and language tag."
 COM_LANGUAGES_INSTALLED_FILTER_SEARCH_LABEL="Search Installed Languages"
 COM_LANGUAGES_INSTALLED_TABLE_CAPTION="Table of Installed Languages"
-COM_LANGUAGES_MSG_DEFAULT_LANGUAGE_SAVED="Default Language Saved. This does not affect users that have chosen a specific language on their profile or on the login page.<br><strong class=\"red\">Warning!</strong> When using the multilingual functionality (ie when the plugin System - Language Filter is enabled) the Site Default Language also has to be a published Content language."
+COM_LANGUAGES_MSG_DEFAULT_LANGUAGE_SAVED="Default Language Saved. This does not affect users that have chosen a specific language on their profile or on the login page."
+COM_LANGUAGES_MSG_DEFAULT_MULTILANG_SAVED="Default Language Saved. This does not affect users that have chosen a specific language on their profile or on the login page.<br><strong>Warning!</strong> The Site Default Language also has to be a published Content language."
 COM_LANGUAGES_MSG_SWITCH_ADMIN_LANGUAGE_SUCCESS="The Administrator Language has been switched to &quot;<strong>%s</strong>&quot;."
 COM_LANGUAGES_MULTILANGSTATUS_CONTACTS_ERROR="Some of the contacts linked to the user <strong>%s</strong> are incorrect."
 COM_LANGUAGES_MULTILANGSTATUS_CONTACTS_ERROR_TIP="Warning! A user/author should have only one contact to which is assigned language 'All' OR one contact for each published Content Language."
@@ -96,6 +97,8 @@ COM_LANGUAGES_OVERRIDE_FIELD_SEARCHSTRING_LABEL="Search Text"
 COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_CONSTANT="Constant"
 COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_LABEL="Search For"
 COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_TEXT="Value"
+COM_LANGUAGES_OVERRIDE_FIRST_SELECT_MESSAGE="To create a new override, please first select a language and client."
+COM_LANGUAGES_OVERRIDE_SELECT_LANGUAGE="- Select Language & Client -"
 COM_LANGUAGES_SAVE_SUCCESS="Content Language saved."
 COM_LANGUAGES_SEARCH_IN_TITLE="Search in title."
 COM_LANGUAGES_SUBMENU_CONTENT="Content Languages"
@@ -107,8 +110,12 @@ COM_LANGUAGES_VIEW_INSTALLED_SITE_TITLE="Languages: Installed (Site)"
 COM_LANGUAGES_VIEW_LANGUAGES_TITLE="Languages: Content"
 COM_LANGUAGES_VIEW_LANGUAGE_EDIT_EDIT_TITLE="Languages: Edit Content Language"
 COM_LANGUAGES_VIEW_LANGUAGE_EDIT_NEW_TITLE="Languages: New Content Language"
+COM_LANGUAGES_VIEW_OVERRIDES_CONSTANT_ASC="Constant ascending"
+COM_LANGUAGES_VIEW_OVERRIDES_CONSTANT_DESC="Constant descending"
 COM_LANGUAGES_VIEW_OVERRIDES_FILTER_SEARCH_DESC="Search constant or text."
 COM_LANGUAGES_VIEW_OVERRIDES_KEY="Constant"
+COM_LANGUAGES_VIEW_OVERRIDES_KEY_ASC="Text ascending"
+COM_LANGUAGES_VIEW_OVERRIDES_KEY_DESC="Text descending"
 COM_LANGUAGES_VIEW_OVERRIDES_LANGUAGES_BOX_ITEM="%1$s - %2$s"
 COM_LANGUAGES_VIEW_OVERRIDES_NO_ITEM_SELECTED="You haven't selected any overrides."
 COM_LANGUAGES_VIEW_OVERRIDES_N_ITEMS_DELETED="%d language overrides were deleted."
@@ -118,6 +125,7 @@ COM_LANGUAGES_VIEW_OVERRIDES_PURGE_SUCCESS="Overrider cache table cleared."
 COM_LANGUAGES_VIEW_OVERRIDES_TEXT="Text"
 COM_LANGUAGES_VIEW_OVERRIDES_TITLE="Languages: Overrides"
 COM_LANGUAGES_VIEW_OVERRIDE_CLIENT_SITE="Site"
+COM_LANGUAGES_VIEW_OVERRIDE_CLIENT_ADMINISTRATOR="Administrator"
 COM_LANGUAGES_VIEW_OVERRIDE_EDIT_EDIT_OVERRIDE_LEGEND="Edit this Override"
 COM_LANGUAGES_VIEW_OVERRIDE_EDIT_NEW_OVERRIDE_LEGEND="Create a New Override"
 COM_LANGUAGES_VIEW_OVERRIDE_EDIT_TITLE="Languages: Edit Override"
@@ -132,4 +140,4 @@ COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_BUTTON="Search"
 COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_LEGEND="Search text you want to change."
 COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_TIP="A language string is composed of two parts: a specific language constant and its value.<br>For example, in the string: COM_CONTENT_READ_MORE=&quot;Read more: &quot;<br>'<u>COM_CONTENT_READ_MORE</u>' is the constant and '<u>Read more: </u>' is the value.<br>You have to use the specific language constant to create an override of the value.<br>Therefore, you can search for the constant or the value you want to change with the search field below.<br>By selecting the desired result the correct constant will automatically be inserted into the form."
 COM_LANGUAGES_XML_DESCRIPTION="Component for language management"
-JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
\ No newline at end of file
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/administrator/language/en-GB/en-GB.com_languages.sys.ini b/administrator/language/en-GB/en-GB.com_languages.sys.ini
index a4dd305a41481..523502d87ce8c 100644
--- a/administrator/language/en-GB/en-GB.com_languages.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_languages.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_login.ini b/administrator/language/en-GB/en-GB.com_login.ini
index fbc2839a77044..e0054f7d0410d 100644
--- a/administrator/language/en-GB/en-GB.com_login.ini
+++ b/administrator/language/en-GB/en-GB.com_login.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_login.sys.ini b/administrator/language/en-GB/en-GB.com_login.sys.ini
index e2c8c849bbebf..b60476b8be488 100644
--- a/administrator/language/en-GB/en-GB.com_login.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_login.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_mailto.sys.ini b/administrator/language/en-GB/en-GB.com_mailto.sys.ini
index bce4aebaa4c3b..41e7b4860750b 100644
--- a/administrator/language/en-GB/en-GB.com_mailto.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_mailto.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_media.ini b/administrator/language/en-GB/en-GB.com_media.ini
index f4be2db3fb22e..425abc83cf6b8 100644
--- a/administrator/language/en-GB/en-GB.com_media.ini
+++ b/administrator/language/en-GB/en-GB.com_media.ini
@@ -1,24 +1,26 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 COM_MEDIA="Media"
-COM_MEDIA_ACTIN_RENAME="Rename item"
 COM_MEDIA_ACTION_DELETE="Delete item"
+COM_MEDIA_ACTION_DOWNLOAD="Download item"
 COM_MEDIA_ACTION_EDIT="Edit item"
 COM_MEDIA_ACTION_PREVIEW="Preview item"
+COM_MEDIA_ACTION_RENAME="Rename item"
 COM_MEDIA_ACTION_SHARE="Get a sharable link"
+COM_MEDIA_BREADCRUMB_LABEL="Breadcrumb"
 COM_MEDIA_CONFIGURATION="Media: Options"
-COM_MEDIA_CONFIRM_DELETE_MODEL_DESC="Are you sure you want to delete this item?"
-COM_MEDIA_CONFIRM_DELETE_MODEL_HEADING="Confirm Delete"
-COM_MEDIA_CONFIRM_DELETE_MODEL="Delete"
+COM_MEDIA_CONFIRM_DELETE_MODAL="Delete"
+COM_MEDIA_CONFIRM_DELETE_MODAL_HEADING="Confirm Delete"
 COM_MEDIA_CREATE_NEW_FOLDER="Create New Folder"
-COM_MEDIA_CREATE_NEW_FOLDER_SUCCESS="Folder created."
 COM_MEDIA_CREATE_NEW_FOLDER_ERROR="Error creating folder."
+COM_MEDIA_CREATE_NEW_FOLDER_SUCCESS="Folder created."
 COM_MEDIA_DECREASE_GRID="Decrease grid size"
 COM_MEDIA_DELETE_ERROR="Error deleting the item."
 COM_MEDIA_DELETE_SUCCESS="Item deleted."
+COM_MEDIA_DROP_FILE="Drop file(s) to Upload"
 COM_MEDIA_EDIT="Media Edit"
 COM_MEDIA_ERROR="An error occurred."
 COM_MEDIA_ERROR_NO_PROVIDERS="No filesystem providers have been found. Please enable at least one <a href=\"%s\">filesystem plugin</a>."
@@ -48,18 +50,21 @@ COM_MEDIA_FIELD_RESTRICT_UPLOADS_LABEL="Restrict Uploads"
 COM_MEDIA_FIELDSET_OPTIONS_LABEL="Media"
 COM_MEDIA_FILE_EXISTS_AND_OVERRIDE="%s already exists. Do you want to replace it?"
 COM_MEDIA_FOLDER="Folder"
+COM_MEDIA_FOLDER_NAME="Folder Name"
 COM_MEDIA_FOLDERS="Media Folders"
 COM_MEDIA_FOLDERS_PATH_LABEL="<strong>Warning! Path Folder</strong><br>Changing the 'Path to files folder' from the default of 'images' may break your links.<br>The 'Path to images' folder has to be the same or a subfolder of 'Path to files'."
-COM_MEDIA_MEDIA_CREATED_AT="Created at"
+COM_MEDIA_INCREASE_GRID="Increase grid size"
+COM_MEDIA_MEDIA_DATE_CREATED="Date created"
+COM_MEDIA_MEDIA_DATE_MODIFIED="Date modified"
 COM_MEDIA_MEDIA_DIMENSION="Dimensions"
 COM_MEDIA_MEDIA_EXTENSION="Extension"
 COM_MEDIA_MEDIA_MIME_TYPE="MIME Type"
-COM_MEDIA_MEDIA_MODIFIED_AT="Modified at"
 COM_MEDIA_MEDIA_NAME="Name"
 COM_MEDIA_MEDIA_SIZE="Size"
 COM_MEDIA_MEDIA_TYPE="Type"
 COM_MEDIA_NAME="Name"
 COM_MEDIA_OPEN_ITEM_ACTIONS="Open item actions"
+COM_MEDIA_PLEASE_SELECT_ITEM="Please select item."
 COM_MEDIA_RENAME="Rename"
 COM_MEDIA_RENAME_ERROR="Error renaming item."
 COM_MEDIA_RENAME_SUCCESS="Item renamed."
@@ -68,9 +73,11 @@ COM_MEDIA_SEARCH="Search..."
 COM_MEDIA_SELECT_ALL="Toggle select all"
 COM_MEDIA_SERVER_ERROR="Internal server error"
 COM_MEDIA_SHARE="Share the file"
-COM_MEDIA_SHARE_DESC="Share the file with others. Anyone with link can view the file"
+COM_MEDIA_SHARE_COPY="Copy to clipboard"
 COM_MEDIA_SHARE_COPY_FAILED_ERROR="Error copying to clipboard"
+COM_MEDIA_SHARE_DESC="Share the file with others. Anyone with link can view the file"
 COM_MEDIA_TOGGLE_INFO="Toggle item info"
 COM_MEDIA_TOGGLE_LIST_VIEW="Toggle between grid and table views"
 COM_MEDIA_TOGGLE_SELECT_ITEM="Toggle select item"
-COM_MEDIA_UPDLOAD_SUCCESS="Item uploaded."
+COM_MEDIA_TOOLBAR_LABEL="Media Manager"
+COM_MEDIA_UPLOAD_SUCCESS="Item uploaded."
diff --git a/administrator/language/en-GB/en-GB.com_media.sys.ini b/administrator/language/en-GB/en-GB.com_media.sys.ini
index 7138cb9e1ab1e..0b18d37fb7533 100644
--- a/administrator/language/en-GB/en-GB.com_media.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_media.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_menus.ini b/administrator/language/en-GB/en-GB.com_menus.ini
index 10c0b22950fe6..71609bcb0e2e4 100644
--- a/administrator/language/en-GB/en-GB.com_menus.ini
+++ b/administrator/language/en-GB/en-GB.com_menus.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -9,6 +9,20 @@ COM_MENUS_ACTION_DESELECT="Deselect"
 COM_MENUS_ACTION_EXPAND="Expand"
 COM_MENUS_ACTION_SELECT="Select"
 COM_MENUS_ADD_MENU_MODULE="Add a module for this menu"
+COM_MENUS_ADMIN_ACCESS_DESC="Filter by viewing access level."
+COM_MENUS_ADMIN_ACCESS_LABEL="Access"
+COM_MENUS_ADMIN_AUTHOR_DESC="Filter by author."
+COM_MENUS_ADMIN_AUTHOR_LABEL="Author"
+COM_MENUS_ADMIN_CATEGORY_DESC="Filter by category."
+COM_MENUS_ADMIN_CATEGORY_LABEL="Category"
+COM_MENUS_ADMIN_FILTER_DESC="Apply filters to the menu item."
+COM_MENUS_ADMIN_FILTER_LABEL="Filter"
+COM_MENUS_ADMIN_LANGUAGE_DESC="Filter by language."
+COM_MENUS_ADMIN_LANGUAGE_LABEL="Language"
+COM_MENUS_ADMIN_LEVEL_DESC="The number of subcategory levels to display."
+COM_MENUS_ADMIN_LEVEL_LABEL="Subcategory Levels"
+COM_MENUS_ADMIN_TAGS_DESC="Filter by tags."
+COM_MENUS_ADMIN_TAGS_LABEL="Tags"
 COM_MENUS_BASIC_FIELDSET_LABEL="Options"
 COM_MENUS_BATCH_MENU_ITEM_CANNOT_CREATE="You are not allowed to create new menu items."
 COM_MENUS_BATCH_MENU_ITEM_CANNOT_EDIT="You are not allowed to edit menu items."
diff --git a/administrator/language/en-GB/en-GB.com_menus.sys.ini b/administrator/language/en-GB/en-GB.com_menus.sys.ini
index af384cc159684..caf1d10c62587 100644
--- a/administrator/language/en-GB/en-GB.com_menus.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_menus.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_messages.ini b/administrator/language/en-GB/en-GB.com_messages.ini
index 1223cae8aeef3..da73d864d5d61 100644
--- a/administrator/language/en-GB/en-GB.com_messages.ini
+++ b/administrator/language/en-GB/en-GB.com_messages.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -16,6 +16,9 @@ COM_MESSAGES_ERROR_INVALID_MESSAGE="Invalid message content"
 COM_MESSAGES_ERROR_INVALID_SUBJECT="Invalid subject"
 COM_MESSAGES_ERROR_INVALID_TO_USER="Invalid recipient"
 COM_MESSAGES_ERROR_MAIL_FAILED="The email could not be sent."
+COM_MESSAGES_ERROR_MISSING_ROOT_ASSET_GROUPS="Missing root asset groups to send notification."
+COM_MESSAGES_ERROR_NO_GROUPS_SET_AS_SUPER_USER="There are no groups set with super user permissions."
+COM_MESSAGES_ERROR_NO_USERS_SET_AS_SUPER_USER="There are no users set with super user permissions."
 COM_MESSAGES_FIELD_AUTO_PURGE_LABEL="Auto-delete Messages (days)"
 COM_MESSAGES_FIELD_DATE_TIME_LABEL="Posted"
 COM_MESSAGES_FIELD_LOCK_LABEL="Lock Inbox"
diff --git a/administrator/language/en-GB/en-GB.com_messages.sys.ini b/administrator/language/en-GB/en-GB.com_messages.sys.ini
index b70ced0e7cca6..ae8c455521de0 100644
--- a/administrator/language/en-GB/en-GB.com_messages.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_messages.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_modules.ini b/administrator/language/en-GB/en-GB.com_modules.ini
index 831041ec38ca4..57b4e71afb78b 100644
--- a/administrator/language/en-GB/en-GB.com_modules.ini
+++ b/administrator/language/en-GB/en-GB.com_modules.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_modules.sys.ini b/administrator/language/en-GB/en-GB.com_modules.sys.ini
index 00427b53a2670..c6695e925312e 100644
--- a/administrator/language/en-GB/en-GB.com_modules.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_modules.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_newsfeeds.ini b/administrator/language/en-GB/en-GB.com_newsfeeds.ini
index 6ead3ff872a0b..6c83b65574ff6 100644
--- a/administrator/language/en-GB/en-GB.com_newsfeeds.ini
+++ b/administrator/language/en-GB/en-GB.com_newsfeeds.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini b/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini
index 181a23134ab31..5d2e256cd57b8 100644
--- a/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_plugins.ini b/administrator/language/en-GB/en-GB.com_plugins.ini
index 9ec578e4ca5b8..367e210a4a8c3 100644
--- a/administrator/language/en-GB/en-GB.com_plugins.ini
+++ b/administrator/language/en-GB/en-GB.com_plugins.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -27,6 +27,7 @@ COM_PLUGINS_N_ITEMS_UNPUBLISHED="%d plugins disabled."
 COM_PLUGINS_N_ITEMS_UNPUBLISHED_1="Plugin disabled."
 COM_PLUGINS_NAME_HEADING="Plugin Name"
 COM_PLUGINS_NO_ITEM_SELECTED="No plugins selected."
+COM_PLUGINS_OPTION_ELEMENT="- Select Element -"
 COM_PLUGINS_OPTION_FOLDER="- Select Type -"
 COM_PLUGINS_PLUGIN="Plugin"
 COM_PLUGINS_SAVE_SUCCESS="Plugin saved."
diff --git a/administrator/language/en-GB/en-GB.com_plugins.sys.ini b/administrator/language/en-GB/en-GB.com_plugins.sys.ini
index 65abe9dca35e1..6221872f49b27 100644
--- a/administrator/language/en-GB/en-GB.com_plugins.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_plugins.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_postinstall.ini b/administrator/language/en-GB/en-GB.com_postinstall.ini
index 7a35ad9e23a0e..48d1a4c9c15a7 100644
--- a/administrator/language/en-GB/en-GB.com_postinstall.ini
+++ b/administrator/language/en-GB/en-GB.com_postinstall.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_postinstall.sys.ini b/administrator/language/en-GB/en-GB.com_postinstall.sys.ini
index 90113f0b1deff..49cc72c937196 100644
--- a/administrator/language/en-GB/en-GB.com_postinstall.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_postinstall.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_privacy.ini b/administrator/language/en-GB/en-GB.com_privacy.ini
new file mode 100644
index 0000000000000..dc3f58e49a449
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.com_privacy.ini
@@ -0,0 +1,160 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_PRIVACY="Privacy"
+COM_PRIVACY_ACTION_DELETE_DATA="Delete Data"
+COM_PRIVACY_ACTION_EMAIL_EXPORT_DATA="Email Data Export"
+COM_PRIVACY_ACTION_EXPORT_DATA="Export Data"
+COM_PRIVACY_ACTION_LOG_ADMIN_COMPLETED_REQUEST="User <a href='{accountlink}'>{username}</a> completed <a href='{itemlink}'>request #{id}</a> for {subjectemail}"
+COM_PRIVACY_ACTION_LOG_ADMIN_CREATED_REQUEST="User <a href='{accountlink}'>{username}</a> created <a href='{itemlink}'>request #{id}</a> for {subjectemail}"
+COM_PRIVACY_ACTION_LOG_ADMIN_INVALIDATED_REQUEST="User <a href='{accountlink}'>{username}</a> invalidated <a href='{itemlink}'>request #{id}</a> for {subjectemail}"
+COM_PRIVACY_ACTION_LOG_CONFIRMED_REQUEST="{subjectemail} has confirmed <a href='{itemlink}'>request #{id}</a>"
+COM_PRIVACY_ACTION_LOG_CREATED_REQUEST="{subjectemail} has submitted <a href='{itemlink}'>request #{id}</a>"
+COM_PRIVACY_ACTION_LOG_EXPORT="User <a href='{accountlink}'>{username}</a> exported the data for <a href='{itemlink}'>request #{id}</a>"
+COM_PRIVACY_ACTION_LOG_EXPORT_EMAILED="User <a href='{accountlink}'>{username}</a> emailed the data export for <a href='{itemlink}'>request #{id}</a> to the recipient"
+COM_PRIVACY_ACTION_LOG_REMOVE="User <a href='{accountlink}'>{username}</a> removed the data for <a href='{itemlink}'>request #{id}</a>"
+COM_PRIVACY_ACTION_LOG_REMOVE_BLOCKED="User <a href='{accountlink}'>{username}</a> attempted to remove the data for <a href='{itemlink}'>request #{id}</a> however this action was blocked"
+COM_PRIVACY_ACTION_VIEW="View Request"
+COM_PRIVACY_BADGE_URGENT_REQUEST="Urgent"
+COM_PRIVACY_CONFIGURATION="Privacy: Options"
+COM_PRIVACY_CONSENTS_FILTER_STATE="State of Consents"
+COM_PRIVACY_CONSENTS_FILTER_SUBJECT="Subject"
+COM_PRIVACY_CONSENTS_INVALIDATED_ALL="All consents of this subject have been invalidated."
+COM_PRIVACY_CONSENTS_STATE_INVALIDATED="Invalidated Consent"
+COM_PRIVACY_CONSENTS_STATE_OBSOLETE="Obsolete Consent"
+COM_PRIVACY_CONSENTS_STATE_VALID="Valid Consent"
+COM_PRIVACY_CONSENTS_SUBJECT_DEFAULT="All Subjects"
+COM_PRIVACY_CONSENTS_TOOLBAR_INVALIDATE_ALL="Invalidate all Consents"
+COM_PRIVACY_CONSENTS_TOOLBAR_INVALIDATE_ALL_CONFIRM_MSG="Do you really want to invalidate all consents of the selected subject? This will force users to have to give their consent again."
+COM_PRIVACY_CONSENTS_TOOLBAR_INVALIDATE="Invalidate Consent"
+COM_PRIVACY_CONSENTS_TOOLBAR_INVALIDATE_CONFIRM_MSG="Do you really want to invalidate the selected consents? This will force users to  have to give their consent again."
+COM_PRIVACY_CORE_CAPABILITY_COMMUNICATION_WITH_JOOMLA_ORG="When a network connection is available, a Joomla installation will attempt to communicate with the joomla.org servers for various capabilities, to include:<ul><li>Checking for updates for the Joomla application</li><li>Help screens for core Joomla extensions</li><li>The Install from Web service (opt-in)</li><li>The statistics collection server (opt-in)</li></ul>As with all HTTP requests, the IP address of your server will be transmitted as part of the request. For information on how Joomla processes data on its servers, please review our <a href=\"https://www.joomla.org/privacy-policy.html\" target=\"_blank\" rel=\"noopener noreferrer\">privacy policy</a>."
+; The placeholder for this key is the configured log path for the site.
+COM_PRIVACY_CORE_CAPABILITY_LOGGING_IP_ADDRESS="Joomla's logging system records the IP address of the visitor which led to a message being written to its log files. These log files are used to record various activity on a Joomla site, including information related to core updates, invalid login attempts, unhandled errors, and development information such as the use of deprecated APIs. The format of these log files may be customised by any extension which configures a logger, therefore you are encouraged to download and review the log files for your website which may be found at `%s`."
+COM_PRIVACY_CORE_CAPABILITY_SESSION_IP_ADDRESS_AND_COOKIE="All requests to a Joomla website start a session which stores the IP address in the session data and creates a session cookie in the user's browser. The IP address is used as a security measure to help protect against potential session hijacking attacks and this information is deleted once the session has expired and its data purged. The session cookie's name is based on a randomly generated hash and therefore does not have a constant identifier. The session cookie is destroyed once the session has expired or the user has exited their browser."
+COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS_0="<span class=\"badge badge-info\">%d</span> Active Requests"
+COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS_1="<span class=\"badge badge-warning\">%d</span> Active Request"
+COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS_MORE="<span class=\"badge badge-warning\">%d</span> Active Requests"
+COM_PRIVACY_DASHBOARD_BADGE_TOTAL_REQUESTS_0="<span class=\"badge badge-info\">%d</span> Total Requests"
+COM_PRIVACY_DASHBOARD_BADGE_TOTAL_REQUESTS_1="<span class=\"badge badge-info\">%d</span> Total Request"
+COM_PRIVACY_DASHBOARD_BADGE_TOTAL_REQUESTS_MORE="<span class=\"badge badge-info\">%d</span> Total Requests"
+COM_PRIVACY_DASHBOARD_HEADING_CHECK="Check"
+COM_PRIVACY_DASHBOARD_HEADING_REQUEST_COUNT="# of Requests"
+COM_PRIVACY_DASHBOARD_HEADING_REQUEST_STATUS="Status"
+COM_PRIVACY_DASHBOARD_HEADING_REQUEST_TYPE="Request Type"
+COM_PRIVACY_DASHBOARD_HEADING_STATUS="Status"
+COM_PRIVACY_DASHBOARD_HEADING_STATUS_CHECK="Status Check"
+COM_PRIVACY_DASHBOARD_HEADING_TOTAL_REQUEST_COUNT="Total Request Count"
+COM_PRIVACY_DASHBOARD_NO_REQUESTS="There are no requests."
+COM_PRIVACY_DASHBOARD_VIEW_REQUESTS="View Requests"
+COM_PRIVACY_DATA_REMOVED="Data removed"
+COM_PRIVACY_EDIT_PRIVACY_POLICY="Edit Privacy Policy"
+COM_PRIVACY_EXTENSION_CAPABILITY_PERSONAL_INFO="In order to process information requests, information about the user must be collected and logged for the purposes of retaining an audit log. The request system is based on an individual's email address which will be used to link the request to an existing site user if able."
+; You can use the following merge codes for all COM_PRIVACY_EMAIL strings:
+; [SITENAME]  Site name, as set in Global Configuration.
+; [URL]       URL of the site's frontend page.
+; [TOKENURL]  URL of the confirm page with the token prefilled.
+; [FORMURL]   URL of the confirm page where the user can paste their token.
+; [TOKEN]     The confirmation token.
+; \n          Newline character. Use it to start a new line in the email.
+COM_PRIVACY_EMAIL_ADMIN_REQUEST_BODY_EXPORT_REQUEST="An administrator for [URL] has created a request to export personal information related to this email address. As a security measure, you must confirm that this is a valid request for your personal information from this website.\n\nIn order to confirm this request, you can complete one of the following tasks:\n\n1. Visit the following URL: [TOKENURL]\n\n2. Copy your token from this email, visit the referenced URL, and paste your token into the form.\nURL: [FORMURL]\nToken: [TOKEN]\n\nPlease note that this token is only valid for 24 hours from the time this email was sent."
+COM_PRIVACY_EMAIL_ADMIN_REQUEST_BODY_REMOVE_REQUEST="An administrator for [URL] has created a request to remove all personal information related to this email address. As a security measure, you must confirm that this is a valid request for your personal information to be removed from this website.\n\nIn order to confirm this request, you can complete one of the following tasks:\n\n1. Visit the following URL: [TOKENURL]\n\n2. Copy your token from this email, visit the referenced URL, and paste your token into the form.\nURL: [FORMURL]\nToken: [TOKEN]\n\nPlease note that this token is only valid for 24 hours from the time this email was sent."
+COM_PRIVACY_EMAIL_ADMIN_REQUEST_SUBJECT_EXPORT_REQUEST="Information Request Created at [SITENAME]"
+COM_PRIVACY_EMAIL_ADMIN_REQUEST_SUBJECT_REMOVE_REQUEST="Information Deletion Request Created at [SITENAME]"
+COM_PRIVACY_EMAIL_DATA_EXPORT_COMPLETED_BODY="An administrator for [URL] has completed the data export you requested and a copy of the information can be found in the file attached to this message."
+COM_PRIVACY_EMAIL_DATA_EXPORT_COMPLETED_SUBJECT="Data Export for [SITENAME]"
+COM_PRIVACY_ERROR_ACTIVE_REQUEST_FOR_EMAIL="There is already an active information request for this email address, the active request should be completed before starting a new one."
+COM_PRIVACY_ERROR_CANNOT_CREATE_REQUEST_FOR_SELF="You can't create an information request for yourself."
+COM_PRIVACY_ERROR_CANNOT_CREATE_REQUEST_WHEN_SENDMAIL_DISABLED="Information requests can't be created when sending mail is disabled."
+COM_PRIVACY_ERROR_CANNOT_EXPORT_UNCONFIRMED_REQUEST="The data for an unconfirmed request can't be exported."
+COM_PRIVACY_ERROR_CANNOT_REMOVE_DATA="The data for this request can't be removed."
+COM_PRIVACY_ERROR_CANNOT_REMOVE_UNCONFIRMED_REQUEST="The data for an unconfirmed request can't be removed."
+COM_PRIVACY_ERROR_COMPLETE_TRANSITION_NOT_PERMITTED="This record can't be updated to \"Completed\" status."
+COM_PRIVACY_ERROR_EXPORT_EMAIL_FAILED="Export failed with the following error: %s"
+COM_PRIVACY_ERROR_INVALID_TRANSITION_NOT_PERMITTED="This record can't be updated to \"Invalid\" status."
+COM_PRIVACY_ERROR_REMOVE_DATA_FAILED="Removal failed with the following error: %s"
+COM_PRIVACY_ERROR_REQUEST_ID_REQUIRED_FOR_EXPORT="A request ID is required to export data."
+COM_PRIVACY_ERROR_REQUEST_ID_REQUIRED_FOR_REMOVE="A request ID is required to remove data."
+COM_PRIVACY_ERROR_REQUEST_TYPE_NOT_EXPORT="Only export requests may be exported."
+COM_PRIVACY_ERROR_REQUEST_TYPE_NOT_REMOVE="Only removal requests may have their data removed."
+COM_PRIVACY_ERROR_UNKNOWN_REQUEST_TYPE="Unknown information request type."
+COM_PRIVACY_EXPORT_EMAILED="The data export has been emailed."
+COM_PRIVACY_FIELD_REQUESTED_AT_LABEL="Date Requested"
+COM_PRIVACY_FIELD_REQUEST_TYPE_DESC="The type of information request."
+COM_PRIVACY_FIELD_REQUEST_TYPE_LABEL="Request Type"
+COM_PRIVACY_FIELD_STATUS_DESC="The status of the information request."
+COM_PRIVACY_FILTER_SEARCH_LABEL="Search Requests"
+COM_PRIVACY_HEADING_ACTION_LOG="Action Log"
+COM_PRIVACY_HEADING_ACTIONS="Actions"
+COM_PRIVACY_HEADING_CONSENTS_BODY="Body"
+COM_PRIVACY_HEADING_CONSENTS_CREATED="Created"
+COM_PRIVACY_HEADING_CONSENTS_SUBJECT="Subject"
+COM_PRIVACY_HEADING_CORE_CAPABILITIES="Joomla Core Capabilities"
+COM_PRIVACY_HEADING_CREATED_ASC="Created ascending"
+COM_PRIVACY_HEADING_CREATED_DESC="Created descending"
+COM_PRIVACY_HEADING_EMAIL_ASC="Email ascending"
+COM_PRIVACY_HEADING_EMAIL_DESC="Email descending"
+COM_PRIVACY_HEADING_REQUEST_INFORMATION="Request Information"
+COM_PRIVACY_HEADING_REQUEST_TYPE="Request Type"
+COM_PRIVACY_HEADING_REQUEST_TYPE_ASC="Request Type ascending"
+COM_PRIVACY_HEADING_REQUEST_TYPE_DESC="Request Type descending"
+COM_PRIVACY_HEADING_REQUEST_TYPE_TYPE_EXPORT="Export"
+COM_PRIVACY_HEADING_REQUEST_TYPE_TYPE_REMOVE="Remove"
+COM_PRIVACY_HEADING_REQUESTED_AT="Requested"
+COM_PRIVACY_HEADING_REQUESTED_AT_ASC="Requested ascending"
+COM_PRIVACY_HEADING_REQUESTED_AT_DESC="Requested descending"
+COM_PRIVACY_HEADING_STATUS_ASC="Status ascending"
+COM_PRIVACY_HEADING_STATUS_DESC="Status descending"
+COM_PRIVACY_HEADING_USERID="User ID"
+COM_PRIVACY_HEADING_USERID_ASC="User ID ascending"
+COM_PRIVACY_HEADING_USERID_DESC="User ID descending"
+COM_PRIVACY_HEADING_USERNAME_ASC="Username ascending"
+COM_PRIVACY_HEADING_USERNAME_DESC="Username descending"
+COM_PRIVACY_MSG_CAPABILITIES_ABOUT_THIS_INFORMATION="About This Information"
+COM_PRIVACY_MSG_CAPABILITIES_INTRODUCTION="The information on this screen is collected from extensions which report their privacy related capabilities to this system. It is intended to help site owners be aware of the capabilities of installed extensions and provide information to help owners create local site policies such as a privacy policy. As this screen requires extensions to support its reporting system, and only displays information from enabled extensions, this should not be considered a complete list and you are encouraged to consult each extension's documentation for more information."
+COM_PRIVACY_MSG_CAPABILITIES_NO_CAPABILITIES="There are no reported extension capabilities."
+COM_PRIVACY_MSG_CONFIRM_EMAIL_SENT_TO_USER="A confirmation email for this request has been sent to the user."
+COM_PRIVACY_MSG_CONSENTS_NO_CONSENTS="There are no stored consents."
+COM_PRIVACY_MSG_EXTENSION_NO_CAPABILITIES="This extension does not report any capabilities."
+COM_PRIVACY_MSG_REQUESTS_NO_REQUESTS="There are no information requests matching your query."
+COM_PRIVACY_N_CONSENTS_INVALIDATED="%s consents were invalidated."
+COM_PRIVACY_NOTIFY_DESC="Show a notification when there are requests older than the specified number of days."
+COM_PRIVACY_NOTIFY_LABEL="Days To Consider Request Urgent"
+COM_PRIVACY_OPTION_LABEL="Options"
+COM_PRIVACY_POSTINSTALL_TITLE="Increased Management Of Users Privacy"
+COM_PRIVACY_POSTINSTALL_BODY="<p>With the introduction of GDPR for EU citizens and similar regulations elsewhere in the world it may be necessary for you to request consent before storing any <strong>Personal Information</strong> of a user.</p><p>Joomla 3.9 introduces new capabilities to assist you in creating site privacy policies and collecting user consent. In addition a workflow is available to help you manage user information requests such as requests for removing their personal data from your site.</p><p>For further information on this new feature read the <a href='https://docs.joomla.org/J3.x:Privacy' target='_new'>Privacy documentation</a>.</p>"
+COM_PRIVACY_REQUEST_COMPLETED="The request has been completed."
+COM_PRIVACY_REQUEST_INVALIDATED="The request has been invalidated."
+COM_PRIVACY_SELECT_REQUEST_TYPE="- Select Request Type -"
+COM_PRIVACY_SHOW_URGENT_REQUESTS="Show Urgent Requests"
+COM_PRIVACY_STATUS_CHECK_NOT_AVAILABLE="Not Available"
+COM_PRIVACY_STATUS_CHECK_OUTSTANDING_URGENT_REQUESTS="Outstanding Urgent Requests"
+COM_PRIVACY_STATUS_CHECK_OUTSTANDING_URGENT_REQUESTS_DESCRIPTION="Requests which are older than %d days, as set in the component configuration."
+COM_PRIVACY_STATUS_CHECK_PRIVACY_POLICY_PUBLISHED="Published Privacy Policy"
+COM_PRIVACY_STATUS_CHECK_REQUEST_FORM_MENU_ITEM_PUBLISHED="Published Request Form Menu Item"
+COM_PRIVACY_STATUS_CHECK_SENDMAIL_DISABLED="Mail Sending Disabled"
+COM_PRIVACY_STATUS_CHECK_SENDMAIL_DISABLED_DESCRIPTION="Mail Sending must be enabled, it is a requirement to use the request system"
+COM_PRIVACY_STATUS_CHECK_SENDMAIL_ENABLED="Mail Sending Enabled"
+COM_PRIVACY_STATUS_COMPLETED="Completed"
+COM_PRIVACY_STATUS_CONFIRMED="Confirmed"
+COM_PRIVACY_STATUS_INVALID="Invalid"
+COM_PRIVACY_STATUS_PENDING="Pending"
+COM_PRIVACY_SEARCH_IN_EMAIL="Search in requestor email address. Prefix with ID: to search for a request ID."
+COM_PRIVACY_SEARCH_IN_USERNAME="Search in username. Prefix with ID: to search for a consent ID. Prefix with UID: to search for a User ID."
+COM_PRIVACY_SUBMENU_CAPABILITIES="Capabilities"
+COM_PRIVACY_SUBMENU_CONSENTS="Consents"
+COM_PRIVACY_SUBMENU_DASHBOARD="Dashboard"
+COM_PRIVACY_SUBMENU_REQUESTS="Requests"
+COM_PRIVACY_TOOLBAR_COMPLETE="Complete"
+COM_PRIVACY_TOOLBAR_INVALIDATE="Invalidate"
+COM_PRIVACY_USER_FIELD_EMAIL_DESC="The email address of the individual owning the information being requested."
+COM_PRIVACY_VIEW_CAPABILITIES="Privacy: Extension Capabilities"
+COM_PRIVACY_VIEW_CONSENTS="Privacy: Consents"
+COM_PRIVACY_VIEW_DASHBOARD="Privacy: Dashboard"
+COM_PRIVACY_VIEW_REQUEST_ADD_REQUEST="Privacy: New Information Request"
+COM_PRIVACY_VIEW_REQUEST_SHOW_REQUEST="Privacy: Review Information Request"
+COM_PRIVACY_VIEW_REQUESTS="Privacy: Information Requests"
+COM_PRIVACY_WARNING_CANNOT_CREATE_REQUEST_WHEN_SENDMAIL_DISABLED="Information requests can't be created when sending mail is disabled."
+COM_PRIVACY_XML_DESCRIPTION="Component for managing privacy related actions."
diff --git a/administrator/language/en-GB/en-GB.com_privacy.sys.ini b/administrator/language/en-GB/en-GB.com_privacy.sys.ini
new file mode 100644
index 0000000000000..a2bf34df661e4
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.com_privacy.sys.ini
@@ -0,0 +1,21 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_PRIVACY="Privacy"
+COM_PRIVACY_CONFIRM_VIEW_DEFAULT_DESC="Displays a form to confirm an information request."
+COM_PRIVACY_CONFIRM_VIEW_DEFAULT_OPTION="Default"
+COM_PRIVACY_CONFIRM_VIEW_DEFAULT_TITLE="Confirm Request"
+COM_PRIVACY_CONSENTS_VIEW_DEFAULT_DESC="Shows a list of user consents"
+COM_PRIVACY_CONSENTS_VIEW_DEFAULT_TITLE="Privacy: Consents"
+COM_PRIVACY_DASHBOARD_VIEW_DEFAULT_DESC="A dashboard related to the site's privacy settings and information requests."
+COM_PRIVACY_DASHBOARD_VIEW_DEFAULT_TITLE="Privacy: Dashboard"
+COM_PRIVACY_REMIND_VIEW_DEFAULT_DESC="Displays a form to extend the privacy consent"
+COM_PRIVACY_REMIND_VIEW_DEFAULT_TITLE="Extend Consent"
+COM_PRIVACY_REQUEST_VIEW_DEFAULT_DESC="Displays a form to submit an information request."
+COM_PRIVACY_REQUEST_VIEW_DEFAULT_OPTION="Default"
+COM_PRIVACY_REQUEST_VIEW_DEFAULT_TITLE="Create Request"
+COM_PRIVACY_REQUESTS_VIEW_DEFAULT_DESC="Shows a list of user information requests"
+COM_PRIVACY_REQUESTS_VIEW_DEFAULT_TITLE="Privacy: Information Requests"
+COM_PRIVACY_XML_DESCRIPTION="Component for managing privacy related actions."
diff --git a/administrator/language/en-GB/en-GB.com_redirect.ini b/administrator/language/en-GB/en-GB.com_redirect.ini
index 37c2a1efedc57..b7502b452518c 100644
--- a/administrator/language/en-GB/en-GB.com_redirect.ini
+++ b/administrator/language/en-GB/en-GB.com_redirect.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_redirect.sys.ini b/administrator/language/en-GB/en-GB.com_redirect.sys.ini
index ee153a727499e..d7a92a5dcb46a 100644
--- a/administrator/language/en-GB/en-GB.com_redirect.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_redirect.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_search.ini b/administrator/language/en-GB/en-GB.com_search.ini
index f7ad82030f52a..fa6bf247ecd38 100644
--- a/administrator/language/en-GB/en-GB.com_search.ini
+++ b/administrator/language/en-GB/en-GB.com_search.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_search.sys.ini b/administrator/language/en-GB/en-GB.com_search.sys.ini
index 4e17169d46e6b..0d5b533644f41 100644
--- a/administrator/language/en-GB/en-GB.com_search.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_search.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_tags.ini b/administrator/language/en-GB/en-GB.com_tags.ini
index 81134fde657a4..4d71ec3f75dc3 100644
--- a/administrator/language/en-GB/en-GB.com_tags.ini
+++ b/administrator/language/en-GB/en-GB.com_tags.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_tags.sys.ini b/administrator/language/en-GB/en-GB.com_tags.sys.ini
index a3bcadfccf7bd..e4b3484741239 100644
--- a/administrator/language/en-GB/en-GB.com_tags.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_tags.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index 2397b13aa79fd..afc34401bf36b 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -179,20 +179,21 @@ COM_TEMPLATES_NEW_FILE_TYPE="File Type"
 COM_TEMPLATES_NO_TEMPLATE_SELECTED="No template selected."
 COM_TEMPLATES_OPTION_NONE=":: None ::"
 COM_TEMPLATES_OPTION_SELECT_MENU_ITEM="- Select Menu Item -"
-COM_TEMPLATES_OVERRIDE_ACTION="Update Action"
 COM_TEMPLATES_OVERRIDE_CHECKED="Checked"
 COM_TEMPLATES_OVERRIDE_CREATED="Override created in "
 COM_TEMPLATES_OVERRIDE_CREATED_DATE="Added to the list"
 COM_TEMPLATES_OVERRIDE_CORE_REMOVED="Original file removed"
 COM_TEMPLATES_OVERRIDE_FAILED="Failed to create override."
 COM_TEMPLATES_OVERRIDE_MODIFIED_DATE="Last change via Update"
+COM_TEMPLATES_OVERRIDE_SOURCE="Update Source"
 COM_TEMPLATES_OVERRIDE_SUCCESS="Successfully created the override."
 COM_TEMPLATES_OVERRIDE_TEMPLATE_FILE="Template File"
 COM_TEMPLATES_OVERRIDE_UPTODATE="Overridden files are up to date. Nothing has been changed in the last extension or Joomla update."
 COM_TEMPLATES_OVERRIDES="Override files"
 COM_TEMPLATES_OVERRIDES_COMPONENTS="Components"
-COM_TEMPLATES_OVERRIDES_MODULES="Modules"
 COM_TEMPLATES_OVERRIDES_LAYOUTS="Layouts"
+COM_TEMPLATES_OVERRIDES_MODULES="Modules"
+COM_TEMPLATES_OVERRIDES_PLUGINS="Plugins"
 COM_TEMPLATES_PREVIEW="Preview"
 COM_TEMPLATES_RENAME_FILE="Rename file %s"
 COM_TEMPLATES_RESIZE_IMAGE="Resize Image"
@@ -224,7 +225,6 @@ COM_TEMPLATES_TEMPLATE_FILES="Template Files"
 COM_TEMPLATES_TEMPLATE_NEW_NAME_DESC="Enter the name of the new template. Please use letters, numbers and underscore only."
 COM_TEMPLATES_TEMPLATE_NEW_NAME_LABEL="New Template Name"
 COM_TEMPLATES_TEMPLATE_NO_PREVIEW="No preview available. You can enable preview in the options."
-COM_TEMPLATES_TEMPLATE_NO_PREVIEW_ADMIN="No preview available for Administrator templates"
 COM_TEMPLATES_TEMPLATE_NO_PREVIEW_DESC="To enable template previews, enable the Preview Module Positions option in Template Options."
 COM_TEMPLATES_TEMPLATE_NOT_SPECIFIED="Template not specified."
 COM_TEMPLATES_TEMPLATE_PREVIEW="Preview"
diff --git a/administrator/language/en-GB/en-GB.com_templates.sys.ini b/administrator/language/en-GB/en-GB.com_templates.sys.ini
index 7cf330abfb7a0..d3bc83b26b0c6 100644
--- a/administrator/language/en-GB/en-GB.com_templates.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_users.ini b/administrator/language/en-GB/en-GB.com_users.ini
index e8f56f3960191..fe31645f99868 100644
--- a/administrator/language/en-GB/en-GB.com_users.ini
+++ b/administrator/language/en-GB/en-GB.com_users.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -14,9 +14,18 @@ COM_USERS_BATCH_OPTIONS="Batch process the selected users"
 COM_USERS_BATCH_SET="Set To Group"
 COM_USERS_CATEGORIES_TITLE="User Notes: Categories"
 COM_USERS_CATEGORY_HEADING="Category"
+COM_USERS_CONFIG_DOMAIN_OPTIONS="Email Domain Options"
 COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_LABEL="Allow User Registration"
 COM_USERS_CONFIG_FIELD_CAPTCHA_LABEL="Captcha"
 COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_LABEL="Change Username"
+COM_USERS_CONFIG_FIELD_DOMAIN_NAME_DESC="Enter a domain name. Wildcards (*) are supported. For example:<br /><strong>*</strong> allows or disallows all domains;<br /><strong>*.com</strong> allows or disallows all .com domains;<br /><strong>*.joomla.org</strong> allows or disallows all joomla.org subdomains."
+COM_USERS_CONFIG_FIELD_DOMAIN_NAME_LABEL="Domain Name"
+COM_USERS_CONFIG_FIELD_DOMAIN_RULE_DESC="Select whether to allow or disallow the domain."
+COM_USERS_CONFIG_FIELD_DOMAIN_RULE_LABEL="Rule"
+COM_USERS_CONFIG_FIELD_DOMAIN_RULE_OPTION_ALLOW="Allow"
+COM_USERS_CONFIG_FIELD_DOMAIN_RULE_OPTION_DISALLOW="Disallow"
+COM_USERS_CONFIG_FIELD_DOMAINS_DESC="Enter a list of allowed and disallowed email domains. By default, all domains are allowed."
+COM_USERS_CONFIG_FIELD_DOMAINS_LABEL="Email Domains"
 COM_USERS_CONFIG_FIELD_FRONTEND_LANG_LABEL="Frontend Language"
 COM_USERS_CONFIG_FIELD_FRONTEND_RESET_COUNT_LABEL="Maximum Reset Count"
 COM_USERS_CONFIG_FIELD_FRONTEND_RESET_TIME_LABEL="Reset Time"
@@ -72,6 +81,7 @@ COM_USERS_FIELD_LOGIN_REDIRECT_CHOICE_LABEL="Choose Login Redirect Type"
 COM_USERS_FIELD_LOGIN_REDIRECT_ERROR="Only one of the login redirect fields should have a value."
 COM_USERS_FIELD_LOGIN_REDIRECTMENU_LABEL="Menu Item Login Redirect"
 COM_USERS_FIELD_LOGIN_URL="Internal URL"
+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_LOGOUT_REDIRECTMENU_LABEL="Menu Item Logout Redirect"
diff --git a/administrator/language/en-GB/en-GB.com_users.sys.ini b/administrator/language/en-GB/en-GB.com_users.sys.ini
index e99cc7c55b9d1..5b18dc2c2e12b 100644
--- a/administrator/language/en-GB/en-GB.com_users.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_users.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_workflow.ini b/administrator/language/en-GB/en-GB.com_workflow.ini
index e0d414de52564..8f4f62c03de71 100644
--- a/administrator/language/en-GB/en-GB.com_workflow.ini
+++ b/administrator/language/en-GB/en-GB.com_workflow.ini
@@ -1,4 +1,4 @@
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; Joomla! Project
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
diff --git a/administrator/language/en-GB/en-GB.com_workflow.sys.ini b/administrator/language/en-GB/en-GB.com_workflow.sys.ini
index 12c5c4b40bfd5..ccfdd6b56dc86 100644
--- a/administrator/language/en-GB/en-GB.com_workflow.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_workflow.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_wrapper.ini b/administrator/language/en-GB/en-GB.com_wrapper.ini
index 365caca95c5ec..2c563a0043a37 100644
--- a/administrator/language/en-GB/en-GB.com_wrapper.ini
+++ b/administrator/language/en-GB/en-GB.com_wrapper.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_wrapper.sys.ini b/administrator/language/en-GB/en-GB.com_wrapper.sys.ini
index e1ef05b74b660..6710fb19356aa 100644
--- a/administrator/language/en-GB/en-GB.com_wrapper.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_wrapper.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini
index 00466b05c74f0..f8b050e1ed27d 100644
--- a/administrator/language/en-GB/en-GB.ini
+++ b/administrator/language/en-GB/en-GB.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -90,9 +90,10 @@ JINVALID_TOKEN="The most recent request was denied because it had an invalid sec
 JINVALID_TOKEN_NOTICE="The security token did not match. The request was aborted to prevent any security breach. Please try again."
 JLOGIN="Log in"
 JLOGOUT="Log out"
-JMONTH="Month"
 JMENU_MULTILANG_WARNING_MISSING_MODULES="An administrator menu module for <strong>%s</strong> does not exist. <br>Create a custom administrator menu and module for each administrator language or publish a menu module set to All languages."
 JMODIFY="Modify"
+JMONTH="Month"
+JMONTH_PUBLISHED="Month (published)"
 JNEVER="Never"
 JNEXT="Next"
 JNEXT_TITLE="Next article: %s"
@@ -110,7 +111,6 @@ JPUBLISHED="Published"
 JRECORD_NUMBER="Record Number"
 JREGISTER="Register"
 JORDERINGDISABLED="Please sort by order to enable reordering"
-
 JSAVE="Save &amp; Close"
 JSELECT="Select"
 JSTATUS="Status"
@@ -120,7 +120,6 @@ JSHOW="Show"
 JSITE="Site"
 JSUBMIT="Submit"
 JTAG="Tags"
-JTAG_DESC="Assign tags to content items. You may select a tag from the pre-defined list or enter a new tag by typing the name in the field and pressing enter."
 JTAG_FIELD_SELECT_DESC="Select the tag to use."
 JTOOLBAR="Toolbar"
 JTRASH="Trash"
@@ -146,10 +145,12 @@ JACTION_EDITVALUE="Edit Custom Field Value"
 JACTION_EDITSTATE="Edit State"
 JACTION_EXECUTETRANSITION="Execute transition"
 JACTION_LOGIN_ADMIN="Administrator Login"
+JACTION_LOGIN_API="Web Services Login"
 JACTION_LOGIN_OFFLINE="Offline Access"
 JACTION_LOGIN_SITE="Site Login"
 JACTION_MANAGE="Access Administration Interface"
 JACTION_OPTIONS="Configure Options Only"
+JACTION_UNPUBLISH="Unpublish"
 
 JBROWSERTARGET_MODAL="Modal"
 JBROWSERTARGET_NEW="Open in new window"
@@ -168,7 +169,6 @@ JERROR_LAYOUT_PREVIOUS_ERROR="Previous Error"
 JERROR_LOADFILE_FAILED="Error loading form file"
 JERROR_LOADING_MENUS="Error loading Menus: %s"
 JERROR_LOGIN_DENIED="You do not have access to the Administrator section of this site."
-JERROR_MAGIC_QUOTES="Your host needs to disable magic_quotes_gpc to run this version of Joomla!"
 JERROR_NO_ITEMS_SELECTED="No item(s) selected."
 JERROR_NOLOGIN_BLOCKED="Login denied! Your account has either been blocked or you have not activated it yet."
 JERROR_SENDING_EMAIL="Email could not be sent."
@@ -260,7 +260,6 @@ JFIELD_VERSION_HISTORY_LABEL="Prior Versions"
 JFIELD_VERSION_HISTORY_SELECT="View Prior Versions"
 JFIELD_XREFERENCE_DESC="An optional field to allow this record to be cross-referenced to an external data system if required."
 JFIELD_XREFERENCE_LABEL="External Reference"
-JGLOBAL_ACROSS="Across"
 JGLOBAL_ACTION_PERMISSIONS_LABEL="Permissions"
 JGLOBAL_ADD_CUSTOM_CATEGORY="Add new Category"
 JGLOBAL_ALL_ARTICLE="Max Levels Articles"
@@ -280,6 +279,13 @@ JGLOBAL_ARTICLE_ORDER_DESC="The order that articles will show in."
 JGLOBAL_ARTICLE_ORDER_LABEL="Article Order"
 JGLOBAL_ARTICLES="Articles"
 JGLOBAL_ASSOC_NOT_POSSIBLE="To define associations, please make sure the item language is not set to 'All'."
+JGLOBAL_ASSOCIATIONS_NEW_ITEM_WARNING="To create associations, first save the item."
+JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON="Propagate"
+JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED="Failed propagating associations. You may have to select or create them manually."
+JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_ALL="All existing associations have been set."
+JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_NONE="No associations exist to propagate."
+JGLOBAL_ASSOCIATIONS_PROPAGATE_MESSAGE_SOME="Associations have been set for: %s"
+JGLOBAL_ASSOCIATIONS_PROPAGATE_TIP="Propagates this item's existing associations."
 JGLOBAL_ASSOCIATIONS_RESET_WARNING="The language has been changed. If you save this item again it will reset the available associations. If this was not intended, close the item."
 JGLOBAL_AUTH_ACCESS_DENIED="Access Denied"
 JGLOBAL_AUTH_ACCESS_GRANTED="Access Granted"
@@ -292,9 +298,6 @@ JGLOBAL_AUTH_FAILED="Failed to authenticate: %s"
 JGLOBAL_AUTH_INCORRECT="Incorrect username/password"
 JGLOBAL_AUTH_INVALID_PASS="Username and password do not match or you do not have an account yet."
 JGLOBAL_AUTH_INVALID_SECRETKEY="The two factor authentication Secret Key is invalid."
-; The following 2 strings are deprecated and will be removed with 4.0.
-JGLOBAL_AUTH_NO_BIND="Unable to bind to LDAP"
-JGLOBAL_AUTH_NO_CONNECT="Unable to connect to LDAP server"
 JGLOBAL_AUTH_NO_REDIRECT="Could not redirect to server: %s"
 JGLOBAL_AUTH_NO_USER="Username and password do not match or you do not have an account yet."
 JGLOBAL_AUTH_NOT_CONNECT="Unable to connect to authentication service."
@@ -343,10 +346,10 @@ JGLOBAL_DESCRIPTION="Description"
 JGLOBAL_DISPLAY_NUM="Display #"
 JGLOBAL_DISPLAY_SELECT_DESC="Show or hide the Display Select dropdown listbox."
 JGLOBAL_DISPLAY_SELECT_LABEL="Display Select"
-JGLOBAL_DOWN="Down"
 JGLOBAL_EDIT_ITEM="Edit item"
 JGLOBAL_EDIT_PREFERENCES="Edit Preferences"
 JGLOBAL_EMAIL="Email"
+JGLOBAL_EMAIL_DOMAIN_NOT_ALLOWED="The email domain <strong>%s</strong> is not allowed. Please enter another email address."
 JGLOBAL_EMPTY_CATEGORIES_DESC="Show or hide categories that have no articles and no subcategories."
 JGLOBAL_EMPTY_CATEGORIES_LABEL="Empty Categories"
 JGLOBAL_ERROR_INSUFFICIENT_BATCH_INFORMATION="Insufficient information to perform the batch operation"
@@ -466,8 +469,6 @@ JGLOBAL_MODIFIED="Modified"
 JGLOBAL_MODIFIED_DATE="Modified Date"
 JGLOBAL_MOST_HITS="Most Hits"
 JGLOBAL_MOST_RECENT_FIRST="Most Recent First"
-JGLOBAL_MULTI_COLUMN_ORDER_DESC="Order articles down or across columns."
-JGLOBAL_MULTI_COLUMN_ORDER_LABEL="Multi Column Order"
 JGLOBAL_MULTI_LEVEL="Multi Level"
 JGLOBAL_NEWITEMSFIRST_DESC="New items default to the first position. The ordering can be changed after this item is saved."
 JGLOBAL_NEWITEMSLAST_DESC="New items default to the last position. The ordering can be changed after this item is saved."
@@ -475,8 +476,7 @@ JGLOBAL_NO_ITEM_SELECTED="No items selected"
 JGLOBAL_NO_ORDER="No Order"
 JGLOBAL_NOINDEX_FOLLOW="No index, follow"
 JGLOBAL_NOINDEX_NOFOLLOW="No index, no follow"
-JGLOBAL_NUM_COLUMNS_DESC="The number of columns in which to show Intro Articles. Normally 1, 2, or 3."
-JGLOBAL_NUM_COLUMNS_LABEL="# Columns"
+JGLOBAL_NONAPPLICABLE="N/A"
 JGLOBAL_NUM_INTRO_ARTICLES_DESC="Number of articles to show after the leading article. Articles will be shown in columns."
 JGLOBAL_NUM_INTRO_ARTICLES_LABEL="# Intro Articles"
 JGLOBAL_NUM_LEADING_ARTICLES_DESC="Number of leading articles to display as full-width at the beginning of the page."
@@ -510,6 +510,8 @@ JGLOBAL_RANDOM_ORDER="Random Order"
 JGLOBAL_RATINGS="Ratings"
 JGLOBAL_RATINGS_ASC="Ratings ascending"
 JGLOBAL_RATINGS_DESC="Ratings descending"
+JGLOBAL_RECORD_HITS_DESC="Record the number of hits."
+JGLOBAL_RECORD_HITS_LABEL="Record Hits"
 JGLOBAL_RECORD_NUMBER="Record ID: %d"
 JGLOBAL_REMEMBER_ME="Remember Me"
 JGLOBAL_REVERSE_ORDERING="Article Reverse Order"
@@ -602,9 +604,6 @@ JGLOBAL_STAGE_PROCESS="Process"
 JGLOBAL_START_PUBLISH_AFTER_FINISH="Item start publishing date must be before finish publishing date"
 JGLOBAL_SUBHEADING_DESC="Optional text to show as a subheading."
 JGLOBAL_SUBHEADING_LABEL="Page Subheading"
-JGLOBAL_SUBMENU_CHECKIN="Check-in"
-JGLOBAL_SUBMENU_CLEAR_CACHE="Clear Cache"
-JGLOBAL_SUBMENU_PURGE_EXPIRED_CACHE="Clear Expired Cache"
 JGLOBAL_SUBSLIDER_BLOG_EXTENDED_LABEL="The option below gives the ability to include articles from subcategories in the Blog layout."
 JGLOBAL_SUBSLIDER_BLOG_LAYOUT_LABEL="If a field is left blank, global settings will be used."
 JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL="These options are also used when you select <br>one of the category links, on the first page and/or thereafter,<br>unless they are changed for a specific menu item."
@@ -646,6 +645,7 @@ JGRID_HEADING_ORDERING="Ordering"
 JGRID_HEADING_ORDERING_ASC="Ordering ascending"
 JGRID_HEADING_ORDERING_DESC="Ordering descending"
 
+JHELP_COMPONENTS_ACTIONLOGS="Components_Actionlogs"
 JHELP_COMPONENTS_ASSOCIATIONS="Components_Associations"
 JHELP_COMPONENTS_ASSOCIATIONS_EDIT="Components_Associations_Edit"
 JHELP_COMPONENTS_BANNERS_BANNERS_EDIT="Components_Banners_Banners_Edit"
@@ -658,12 +658,14 @@ JHELP_COMPONENTS_BANNERS_CLIENTS="Components_Banners_Clients"
 JHELP_COMPONENTS_BANNERS_TRACKS="Components_Banners_Tracks"
 JHELP_COMPONENTS_CACHE_MANAGER_SETTINGS="Components_Cache_Manager_Settings"
 JHELP_COMPONENTS_CHECK-IN_CONFIGURATION="Components_Check-in_Configuration"
-JHELP_COMPONENTS_COM_BANNERS_OPTIONS="Components_Banner_Manager_Options"
+JHELP_COMPONENTS_COM_ACTIONLOGS_OPTIONS="Components_Actionlogs"
 JHELP_COMPONENTS_COM_ASSOCIATIONS_OPTIONS="Components_Associations_Options"
+JHELP_COMPONENTS_COM_BANNERS_OPTIONS="Components_Banner_Manager_Options"
 JHELP_COMPONENTS_COM_CACHE_OPTIONS="Components_Cache_Manager_Settings"
 JHELP_COMPONENTS_COM_CHECKIN_OPTIONS="Components_Check_in_Configuration"
 JHELP_COMPONENTS_COM_CONTACT_OPTIONS="Components_Contact_Manager_Options"
 JHELP_COMPONENTS_COM_CONTENT_OPTIONS="Components_Article_Manager_Options"
+JHELP_COMPONENTS_COM_CSP_OPTIONS="Components_CSP_Reports_Options"
 JHELP_COMPONENTS_COM_FINDER_OPTIONS="Components_Smart_Search_Configuration"
 JHELP_COMPONENTS_COM_INSTALLER_OPTIONS="Components_Installer_Configuration"
 JHELP_COMPONENTS_COM_JOOMLAUPDATE_OPTIONS="Components_Joomla_Update_Configuration"
@@ -674,6 +676,7 @@ JHELP_COMPONENTS_COM_MESSAGES_OPTIONS="Components_Messages_Configuration"
 JHELP_COMPONENTS_COM_MODULES_OPTIONS="Components_Module_Manager_Options"
 JHELP_COMPONENTS_COM_NEWSFEEDS_OPTIONS="Components_News_Feed_Manager_Options"
 JHELP_COMPONENTS_COM_PLUGINS_OPTIONS="Components_Plugin_Manager_Options"
+JHELP_COMPONENTS_COM_PRIVACY_OPTIONS="Components_Privacy_Options"
 JHELP_COMPONENTS_COM_POSTINSTALL_OPTIONS="Components_Post_installation_Messages_Configuration"
 JHELP_COMPONENTS_COM_REDIRECT_OPTIONS="Components_Redirect_Manager_Options"
 JHELP_COMPONENTS_COM_SEARCH_OPTIONS="Components_Search_Manager_Options"
@@ -688,7 +691,7 @@ JHELP_COMPONENTS_CONTACTS_CONTACTS="Components_Contacts_Contacts"
 JHELP_COMPONENTS_CONTENT_CATEGORIES="Components_Content_Categories"
 JHELP_COMPONENTS_CONTENT_CATEGORY_ADD="Components_Content_Categories_Edit"
 JHELP_COMPONENTS_CONTENT_CATEGORY_EDIT="Components_Content_Categories_Edit"
-JHELP_COMPONENTS_CSP_REPORTS="Components_Csp_Reports"
+JHELP_COMPONENTS_CSP_REPORTS="Components_CSP_Reports"
 JHELP_COMPONENTS_FIELDS_FIELDS="Components_Fields_Fields"
 JHELP_COMPONENTS_FIELDS_FIELDS_EDIT="Components_Fields_Fields_Edit"
 JHELP_COMPONENTS_FIELDS_FIELD_GROUPS="Components_Fields_Field_Groups"
@@ -711,6 +714,12 @@ JHELP_COMPONENTS_NEWSFEEDS_CATEGORY_EDIT="Components_Newsfeeds_Categories_Edit"
 JHELP_COMPONENTS_NEWSFEEDS_FEEDS_EDIT="Components_Newsfeeds_Feeds_Edit"
 JHELP_COMPONENTS_NEWSFEEDS_FEEDS="Components_Newsfeeds_Feeds"
 JHELP_COMPONENTS_POST_INSTALLATION_MESSAGES="Components_Post_installation_Messages"
+JHELP_COMPONENTS_PRIVACY_CAPABILITIES="Components_Privacy_Capabilities"
+JHELP_COMPONENTS_PRIVACY_CONSENTS="Components_Privacy_Consents"
+JHELP_COMPONENTS_PRIVACY_DASHBOARD="Components_Privacy_Dashboard"
+JHELP_COMPONENTS_PRIVACY_REQUEST="Components_Privacy_Request"
+JHELP_COMPONENTS_PRIVACY_REQUEST_EDIT="Components_Privacy_Request_Edit"
+JHELP_COMPONENTS_PRIVACY_REQUESTS="Components_Privacy_Requests"
 JHELP_COMPONENTS_REDIRECT_MANAGER_EDIT="Components_Redirect_Manager_Edit"
 JHELP_COMPONENTS_REDIRECT_MANAGER="Components_Redirect_Manager"
 JHELP_COMPONENTS_SEARCH="Components_Search"
@@ -741,12 +750,14 @@ JHELP_EXTENSIONS_MODULE_MANAGER="Extensions_Module_Manager"
 JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_CUSTOM="Extensions_Module_Manager_Admin_Custom"
 JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_FEED="Extensions_Module_Manager_Admin_Feed"
 JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LATEST="Extensions_Module_Manager_Admin_Latest"
+JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LATESTACTIONS="Extensions_Module_Manager_Admin_Latestactions"
 JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGGED="Extensions_Module_Manager_Admin_Logged"
 JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGIN="Extensions_Module_Manager_Admin_Login"
 JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MENU="Extensions_Module_Manager_Admin_Menu"
 JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MULTILANG="Extensions_Module_Manager_Admin_Multilang"
 JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_ONLINE="Extensions_Module_Manager_Admin_Online"
 JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_POPULAR="Extensions_Module_Manager_Admin_Popular"
+JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_PRIVACY_DASHBOARD="Extensions_Module_Manager_Admin_Privacy_Dashboard"
 JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_QUICKICON="Extensions_Module_Manager_Admin_Quickicon"
 JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_STATUS="Extensions_Module_Manager_Admin_Status"
 JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_SUBMENU="Extensions_Module_Manager_Admin_Submenu"
@@ -809,6 +820,9 @@ JHELP_MENUS_MENU_ITEM_MENU_ITEM_HEADING="Menus_Menu_Item_Menu_Item_Heading"
 JHELP_MENUS_MENU_ITEM_NEWSFEED_CATEGORIES="Menus_Menu_Item_Newsfeed_Categories"
 JHELP_MENUS_MENU_ITEM_NEWSFEED_CATEGORY="Menus_Menu_Item_Newsfeed_Category"
 JHELP_MENUS_MENU_ITEM_NEWSFEED_SINGLE_NEWSFEED="Menus_Menu_Item_Newsfeed_Single_Newsfeed"
+JHELP_MENUS_MENU_ITEM_PRIVACY_CONFIRM_REQUEST="Menus_Menu_Item_Privacy_Confirm_Request"
+JHELP_MENUS_MENU_ITEM_PRIVACY_CREATE_REQUEST="Menus_Menu_Item_Privacy_Create_Request"
+JHELP_MENUS_MENU_ITEM_PRIVACY_REMIND_REQUEST="Menus_Menu_Item_Privacy_Remind_Request"
 JHELP_MENUS_MENU_ITEM_SEARCH_RESULTS="Menus_Menu_Item_Search_Results"
 JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_COMPACT_LIST="Menus_Menu_Item_Tags_Items_Compact_List"
 JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_LIST="Menus_Menu_Item_Tags_Items_List"
@@ -907,13 +921,13 @@ JTOGGLE_SHOW_SIDEBAR="Show the sidebar"
 JTOOLBAR_APPLY="Save"
 JTOOLBAR_ARCHIVE="Archive"
 JTOOLBAR_ASSIGN="Assign"
+JTOOLBAR_ASSOCIATIONS="Associations"
 JTOOLBAR_BACK="Back"
 JTOOLBAR_BATCH="Batch"
 JTOOLBAR_BULK_IMPORT="Bulk Import"
 JTOOLBAR_CANCEL="Cancel"
 JTOOLBAR_CHANGE_STATUS="Change Status"
 JTOOLBAR_CHECKIN="Check-in"
-JTOOLBAR_CHANGE_STATUS="Change Status"
 JTOOLBAR_CLOSE="Close"
 JTOOLBAR_DEFAULT="Default"
 JTOOLBAR_DELETE="Delete"
@@ -1051,5 +1065,6 @@ POSTGRESQL="PostgreSQL"
 SQLITE="SQLite"
 
 ; Search tools
+JFILTER_OPTIONS="Filter Options"
 JTABLE_OPTIONS="Table Options"
 JTABLE_OPTIONS_ORDERING="Order by:"
diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini
index 5760b8781a74e..4ea8fa9c573fb 100644
--- a/administrator/language/en-GB/en-GB.lib_joomla.ini
+++ b/administrator/language/en-GB/en-GB.lib_joomla.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -168,7 +168,7 @@ JLIB_DATABASE_ERROR_DATABASE_UPGRADE_FAILED="MySQL Database Upgrade failed. Plea
 JLIB_DATABASE_ERROR_DELETE_CATEGORY="Left-Right data inconsistency. Can't delete category."
 JLIB_DATABASE_ERROR_DELETE_FAILED="%s: :delete failed - %s"
 JLIB_DATABASE_ERROR_DELETE_ROOT_CATEGORIES="Root categories can't be deleted."
-JLIB_DATABASE_ERROR_EMAIL_INUSE="This email address is already registered."
+JLIB_DATABASE_ERROR_EMAIL_INUSE="The email address you entered is already in use. Please enter another email address."
 JLIB_DATABASE_ERROR_EMPTY_ROW_RETURNED="The database row is empty."
 JLIB_DATABASE_ERROR_FUNCTION_FAILED="DB function failed with error number %s <br><span style=\"color: red;\">%s</span>"
 JLIB_DATABASE_ERROR_GET_NEXT_ORDER_FAILED="%s: :getNextOrder failed - %s"
@@ -228,7 +228,7 @@ JLIB_DATABASE_ERROR_USERLEVEL_NAME_EXISTS="Level with the name &quot;%s&quot; al
 JLIB_DATABASE_ERROR_USERNAME_CANNOT_CHANGE="Can't use this username."
 JLIB_DATABASE_ERROR_USERNAME_INUSE="Username in use."
 JLIB_DATABASE_ERROR_VALID_AZ09="Please enter a valid username. No space at beginning or end, at least %d characters and must <strong>not</strong> have the following characters: < > \ &quot; ' &#37; ; ( ) &."
-JLIB_DATABASE_ERROR_VALID_MAIL="Please enter a valid email address."
+JLIB_DATABASE_ERROR_VALID_MAIL="The email address you entered is invalid. Please enter another email address."
 JLIB_DATABASE_ERROR_VIEWLEVEL="Viewlevel must have a title."
 JLIB_DATABASE_FUNCTION_NOERROR="DB function reports no errors."
 JLIB_DATABASE_QUERY_FAILED="Database query failed (error # %s): %s"
@@ -742,7 +742,7 @@ JLIB_USER_ERROR_ID_NOT_EXISTS="JUser: :_load: User %s does not exist."
 JLIB_USER_ERROR_NOT_SUPERADMIN="Only users with Super User permissions can change other Super User user accounts."
 JLIB_USER_ERROR_PASSWORD_NOT_MATCH="Passwords do not match. Please re-enter password."
 JLIB_USER_ERROR_UNABLE_TO_FIND_USER="Unable to find a user with given activation string."
-JLIB_USER_ERROR_UNABLE_TO_LOAD_USER="JUser: :_load: Unable to load user with ID: %s"
+JLIB_USER_ERROR_UNABLE_TO_LOAD_USER="Unable to find a user with the ID: %s"
 JLIB_USER_EXCEPTION_ACCESS_USERGROUP_INVALID="User group does not exist."
 JLIB_UTIL_ERROR_APP_INSTANTIATION="Application Startup Error."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Could not connect to database <br>joomla.library: %1$s - %2$s"
diff --git a/administrator/language/en-GB/en-GB.localise.php b/administrator/language/en-GB/en-GB.localise.php
index db62e563de244..77e11be263a8b 100644
--- a/administrator/language/en-GB/en-GB.localise.php
+++ b/administrator/language/en-GB/en-GB.localise.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Language
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/language/en-GB/en-GB.mod_custom.ini b/administrator/language/en-GB/en-GB.mod_custom.ini
index 273bc50cb58d5..3ab60cf439ad8 100644
--- a/administrator/language/en-GB/en-GB.mod_custom.ini
+++ b/administrator/language/en-GB/en-GB.mod_custom.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_custom.sys.ini b/administrator/language/en-GB/en-GB.mod_custom.sys.ini
index 311fe1dc591f1..1bd76c62d1b9f 100644
--- a/administrator/language/en-GB/en-GB.mod_custom.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_custom.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_feed.ini b/administrator/language/en-GB/en-GB.mod_feed.ini
index a48f21b8e5526..cbcb922a9f52b 100644
--- a/administrator/language/en-GB/en-GB.mod_feed.ini
+++ b/administrator/language/en-GB/en-GB.mod_feed.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -7,8 +7,10 @@ MOD_FEED="Feed Display"
 MOD_FEED_ERR_CACHE="Please make cache folder writable."
 MOD_FEED_ERR_NO_URL="No feed URL specified."
 MOD_FEED_ERR_FEED_NOT_RETRIEVED="Feed not found."
+MOD_FEED_FIELD_DATE_LABEL="Feed Date"
 MOD_FEED_FIELD_DESCRIPTION_LABEL="Feed Description"
 MOD_FEED_FIELD_IMAGE_LABEL="Feed Image"
+MOD_FEED_FIELD_ITEMDATE_LABEL="Publication Date"
 MOD_FEED_FIELD_ITEMDESCRIPTION_LABEL="Item Description"
 MOD_FEED_FIELD_ITEMS_LABEL="Items to Display"
 MOD_FEED_FIELD_RSSTITLE_LABEL="Feed Title"
diff --git a/administrator/language/en-GB/en-GB.mod_feed.sys.ini b/administrator/language/en-GB/en-GB.mod_feed.sys.ini
index 506dc3a26cb55..4df717a6e5e85 100644
--- a/administrator/language/en-GB/en-GB.mod_feed.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_feed.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_latest.ini b/administrator/language/en-GB/en-GB.mod_latest.ini
index 7dddc749d21ae..1d9fb316094f0 100644
--- a/administrator/language/en-GB/en-GB.mod_latest.ini
+++ b/administrator/language/en-GB/en-GB.mod_latest.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_latest.sys.ini b/administrator/language/en-GB/en-GB.mod_latest.sys.ini
index e73364c12b9bb..4549a5eff78b3 100644
--- a/administrator/language/en-GB/en-GB.mod_latest.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_latest.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_latestactions.ini b/administrator/language/en-GB/en-GB.mod_latestactions.ini
new file mode 100644
index 0000000000000..093c175dca254
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.mod_latestactions.ini
@@ -0,0 +1,11 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_LATESTACTIONS="Action Logs - Latest"
+MOD_LATESTACTIONS_FIELD_COUNT_LABEL="Count"
+MOD_LATESTACTIONS_FIELD_COUNT_DESC="The number of items to display (default 5)."
+MOD_LATESTACTIONS_LAYOUT_DEFAULT="Default"
+MOD_LATEST_ACTIONS_NO_MATCHING_RESULTS="No Matching Results"
+MOD_LATESTACTIONS_XML_DESCRIPTION="This module shows a list of the most recent actions."
diff --git a/administrator/language/en-GB/en-GB.mod_latestactions.sys.ini b/administrator/language/en-GB/en-GB.mod_latestactions.sys.ini
new file mode 100644
index 0000000000000..2535518ba3835
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.mod_latestactions.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+
+MOD_LATESTACTIONS="Action Logs - Latest"
+MOD_LATESTACTIONS_XML_DESCRIPTION="This module shows a list of the most recent actions."
+
diff --git a/administrator/language/en-GB/en-GB.mod_logged.ini b/administrator/language/en-GB/en-GB.mod_logged.ini
index 825a2a16d7ceb..f72ace8c84325 100644
--- a/administrator/language/en-GB/en-GB.mod_logged.ini
+++ b/administrator/language/en-GB/en-GB.mod_logged.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_logged.sys.ini b/administrator/language/en-GB/en-GB.mod_logged.sys.ini
index da1a83315c7d5..e9c82d68cbd0f 100644
--- a/administrator/language/en-GB/en-GB.mod_logged.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_logged.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_login.ini b/administrator/language/en-GB/en-GB.mod_login.ini
index 365ea688e1515..143382a3969aa 100644
--- a/administrator/language/en-GB/en-GB.mod_login.ini
+++ b/administrator/language/en-GB/en-GB.mod_login.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_login.sys.ini b/administrator/language/en-GB/en-GB.mod_login.sys.ini
index fc0003ce8626c..83fe9b5067f10 100644
--- a/administrator/language/en-GB/en-GB.mod_login.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_login.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_menu.ini b/administrator/language/en-GB/en-GB.mod_menu.ini
index 10a93ddb1e9d0..4be7045736a50 100644
--- a/administrator/language/en-GB/en-GB.mod_menu.ini
+++ b/administrator/language/en-GB/en-GB.mod_menu.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -12,6 +12,7 @@ MOD_MENU_ACCESS_TEXT_FILTERS="Text Filters"
 MOD_MENU_ARIA_CLOSE_SUBMENU="Close Sub Menu"
 MOD_MENU_ARIA_MAIN_MENU="Main Menu"
 MOD_MENU_CLEAR_CACHE="Clear Cache"
+MOD_MENU_COM_ACTIONLOGS="User Actions Log"
 MOD_MENU_COM_CONTENT="Content"
 MOD_MENU_COM_CONTENT_ARTICLE_MANAGER="Articles"
 MOD_MENU_COM_CONTENT_CATEGORY_MANAGER="Categories"
@@ -23,6 +24,7 @@ MOD_MENU_COM_CONTENT_WORKFLOW_MANAGER="Workflows"
 MOD_MENU_COM_LANGUAGES_SUBMENU_CONTENT="Content Languages"
 MOD_MENU_COM_LANGUAGES_SUBMENU_INSTALLED="Installed"
 MOD_MENU_COM_LANGUAGES_SUBMENU_OVERRIDES="Overrides"
+MOD_MENU_COM_PRIVACY="Privacy"
 MOD_MENU_COM_USERS="Users"
 MOD_MENU_COM_USERS_ADD_GROUP="Add New Group"
 MOD_MENU_COM_USERS_ADD_LEVEL="Add New Access Level"
diff --git a/administrator/language/en-GB/en-GB.mod_menu.sys.ini b/administrator/language/en-GB/en-GB.mod_menu.sys.ini
index c0dcc32978936..424da42a719d7 100644
--- a/administrator/language/en-GB/en-GB.mod_menu.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_menu.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_multilangstatus.ini b/administrator/language/en-GB/en-GB.mod_multilangstatus.ini
index 38bae3fed1da7..0ce75b51dc76a 100644
--- a/administrator/language/en-GB/en-GB.mod_multilangstatus.ini
+++ b/administrator/language/en-GB/en-GB.mod_multilangstatus.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini b/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini
index a9bef39c209eb..ab8e6b91737b4 100644
--- a/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_popular.ini b/administrator/language/en-GB/en-GB.mod_popular.ini
index e43c8f0189314..90d0bdbe2726c 100644
--- a/administrator/language/en-GB/en-GB.mod_popular.ini
+++ b/administrator/language/en-GB/en-GB.mod_popular.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_popular.sys.ini b/administrator/language/en-GB/en-GB.mod_popular.sys.ini
index 5ce33361731a1..85c6fb0affb42 100644
--- a/administrator/language/en-GB/en-GB.mod_popular.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_popular.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_privacy_dashboard.ini b/administrator/language/en-GB/en-GB.mod_privacy_dashboard.ini
new file mode 100644
index 0000000000000..fde5ee95b941d
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.mod_privacy_dashboard.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_PRIVACY_DASHBOARD="Privacy Dashboard"
+MOD_PRIVACY_DASHBOARD_XML_DESCRIPTION="The Privacy Dashboard Module shows information about privacy requests."
diff --git a/administrator/language/en-GB/en-GB.mod_privacy_dashboard.sys.ini b/administrator/language/en-GB/en-GB.mod_privacy_dashboard.sys.ini
new file mode 100644
index 0000000000000..22ea11c29cc1f
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.mod_privacy_dashboard.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_PRIVACY_DASHBOARD="Privacy Dashboard"
+MOD_PRIVACY_DASHBOARD_XML_DESCRIPTION="The Privacy Dashboard Module shows information about privacy requests."
+MOD_PRIVACY_DASHBOARD_LAYOUT_DEFAULT="Default"
+
diff --git a/administrator/language/en-GB/en-GB.mod_quickicon.ini b/administrator/language/en-GB/en-GB.mod_quickicon.ini
index f194a3a8681d9..17e8176ec6461 100644
--- a/administrator/language/en-GB/en-GB.mod_quickicon.ini
+++ b/administrator/language/en-GB/en-GB.mod_quickicon.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini b/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini
index 6eca5f74247d6..9efd6202cd615 100644
--- a/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_sampledata.ini b/administrator/language/en-GB/en-GB.mod_sampledata.ini
index 72d502709d474..4f2b43d0188eb 100644
--- a/administrator/language/en-GB/en-GB.mod_sampledata.ini
+++ b/administrator/language/en-GB/en-GB.mod_sampledata.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_sampledata.sys.ini b/administrator/language/en-GB/en-GB.mod_sampledata.sys.ini
index cda9aed8750b5..9c813bb63b587 100644
--- a/administrator/language/en-GB/en-GB.mod_sampledata.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_sampledata.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_stats_admin.ini b/administrator/language/en-GB/en-GB.mod_stats_admin.ini
index a3c4782fbe80d..2c5ece481cb1e 100644
--- a/administrator/language/en-GB/en-GB.mod_stats_admin.ini
+++ b/administrator/language/en-GB/en-GB.mod_stats_admin.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini b/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini
index e75343b4096f6..96ff070ffa59e 100644
--- a/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_status.ini b/administrator/language/en-GB/en-GB.mod_status.ini
index 468884337e67b..ed23dbc1a99bf 100644
--- a/administrator/language/en-GB/en-GB.mod_status.ini
+++ b/administrator/language/en-GB/en-GB.mod_status.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_status.sys.ini b/administrator/language/en-GB/en-GB.mod_status.sys.ini
index a65c54f9c1d24..ec499c7b3bdbc 100644
--- a/administrator/language/en-GB/en-GB.mod_status.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_status.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_title.ini b/administrator/language/en-GB/en-GB.mod_title.ini
index ead702d3e8a3f..fbd8e5c5cd994 100644
--- a/administrator/language/en-GB/en-GB.mod_title.ini
+++ b/administrator/language/en-GB/en-GB.mod_title.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_title.sys.ini b/administrator/language/en-GB/en-GB.mod_title.sys.ini
index 92f6d82851f89..a4b682f9a067f 100644
--- a/administrator/language/en-GB/en-GB.mod_title.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_title.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_toolbar.ini b/administrator/language/en-GB/en-GB.mod_toolbar.ini
index f0cf4950dffd4..55ddb451eda51 100644
--- a/administrator/language/en-GB/en-GB.mod_toolbar.ini
+++ b/administrator/language/en-GB/en-GB.mod_toolbar.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini b/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini
index 97ca14d57a5d0..564004e479cb4 100644
--- a/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_version.ini b/administrator/language/en-GB/en-GB.mod_version.ini
index 79bea5d9f3985..d7b61543ee598 100644
--- a/administrator/language/en-GB/en-GB.mod_version.ini
+++ b/administrator/language/en-GB/en-GB.mod_version.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_version.sys.ini b/administrator/language/en-GB/en-GB.mod_version.sys.ini
index 7b3b9455a2837..9034b2b75e1a1 100644
--- a/administrator/language/en-GB/en-GB.mod_version.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_version.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_actionlog_joomla.ini b/administrator/language/en-GB/en-GB.plg_actionlog_joomla.ini
new file mode 100644
index 0000000000000..6a128cc084d3a
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_actionlog_joomla.ini
@@ -0,0 +1,52 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_ACTIONLOG_JOOMLA="Action Log - Joomla"
+PLG_ACTIONLOG_JOOMLA_APPLICATION_ADMINISTRATOR="admin"
+PLG_ACTIONLOG_JOOMLA_APPLICATION_SITE="site"
+PLG_ACTIONLOG_JOOMLA_XML_DESCRIPTION="Record the actions of users on the site for Joomla core extensions so they can be reviewed if required."
+; Content types title
+PLG_ACTIONLOG_JOOMLA_TYPE_ACCESS_LEVEL="access level"
+PLG_ACTIONLOG_JOOMLA_TYPE_APPLICATION_CONFIG="Global Configuration"
+PLG_ACTIONLOG_JOOMLA_TYPE_ARTICLE="article"
+PLG_ACTIONLOG_JOOMLA_TYPE_BANNER="banner"
+PLG_ACTIONLOG_JOOMLA_TYPE_BANNER_CLIENT="banner client"
+PLG_ACTIONLOG_JOOMLA_TYPE_CATEGORY="category"
+PLG_ACTIONLOG_JOOMLA_TYPE_COMPONENT="component"
+PLG_ACTIONLOG_JOOMLA_TYPE_COMPONENT_CONFIG="Component Configuration"
+PLG_ACTIONLOG_JOOMLA_TYPE_CONTACT="contact"
+PLG_ACTIONLOG_JOOMLA_TYPE_FILE="file"
+PLG_ACTIONLOG_JOOMLA_TYPE_LANGUAGE="language"
+PLG_ACTIONLOG_JOOMLA_TYPE_LIBRARY="library"
+PLG_ACTIONLOG_JOOMLA_TYPE_LINK="link redirect"
+PLG_ACTIONLOG_JOOMLA_TYPE_LINK_REDIRECT="link redirect"
+PLG_ACTIONLOG_JOOMLA_TYPE_MEDIA="media"
+PLG_ACTIONLOG_JOOMLA_TYPE_MENU="menu"
+PLG_ACTIONLOG_JOOMLA_TYPE_MENU_ITEM="menu item"
+PLG_ACTIONLOG_JOOMLA_TYPE_MODULE="module"
+PLG_ACTIONLOG_JOOMLA_TYPE_NEWSFEED="newsfeed"
+PLG_ACTIONLOG_JOOMLA_TYPE_PACKAGE="package"
+PLG_ACTIONLOG_JOOMLA_TYPE_PLUGIN="plugin"
+PLG_ACTIONLOG_JOOMLA_TYPE_STYLE="template style"
+PLG_ACTIONLOG_JOOMLA_TYPE_TAG="tag"
+PLG_ACTIONLOG_JOOMLA_TYPE_TEMPLATE="template"
+PLG_ACTIONLOG_JOOMLA_TYPE_USER="user"
+PLG_ACTIONLOG_JOOMLA_TYPE_USER_GROUP="user group"
+PLG_ACTIONLOG_JOOMLA_TYPE_USER_NOTE="user note"
+PLG_ACTIONLOG_JOOMLA_USER_LOGGED_IN="User <a href='{accountlink}'>{username}</a> logged in to {app}"
+PLG_ACTIONLOG_JOOMLA_USER_LOGGED_OUT="User <a href='{accountlink}'>{username}</a> logged out from {app}"
+PLG_ACTIONLOG_JOOMLA_USER_LOGIN_FAILED="User <a href='{accountlink}'>{username}</a> tried to login to {app}"
+PLG_ACTIONLOG_JOOMLA_USER_REGISTERED="User <a href='{accountlink}'>{username}</a> registered for an account"
+PLG_ACTIONLOG_JOOMLA_USER_REMIND="User <a href='{accountlink}'>{username}</a> requested a username reminder for their account"
+PLG_ACTIONLOG_JOOMLA_USER_RESET_COMPLETE="User <a href='{accountlink}'>{username}</a> completed the password reset for their account"
+PLG_ACTIONLOG_JOOMLA_USER_RESET_REQUEST="User <a href='{accountlink}'>{username}</a> requested a password reset for their account"
+; Component
+PLG_ACTIONLOG_JOOMLA_APPLICATION_CONFIG_UPDATED="User <a href='{accountlink}'>{username}</a> changed settings of the application configuration"
+PLG_ACTIONLOG_JOOMLA_COMPONENT_CONFIG_UPDATED="User <a href='{accountlink}'>{username}</a> changed settings of the component {extension_name}"
+; Extensions
+PLG_ACTIONLOG_JOOMLA_EXTENSION_INSTALLED="User <a href='{accountlink}'>{username}</a> installed the {type} {extension_name}"
+PLG_ACTIONLOG_JOOMLA_EXTENSION_UNINSTALLED="User <a href='{accountlink}'>{username}</a> uninstalled the {type} {extension_name}"
+PLG_ACTIONLOG_JOOMLA_EXTENSION_UPDATED="User <a href='{accountlink}'>{username}</a> updated the {type} {extension_name}"
+PLG_ACTIONLOG_JOOMLA_PLUGIN_INSTALLED="User <a href='{accountlink}'>{username}</a> installed the plugin <a href='index.php?option=com_plugins&task=plugin.edit&extension_id={id}'>{extension_name}</a>"
diff --git a/administrator/language/en-GB/en-GB.plg_actionlog_joomla.sys.ini b/administrator/language/en-GB/en-GB.plg_actionlog_joomla.sys.ini
new file mode 100644
index 0000000000000..df2e8d05681ae
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_actionlog_joomla.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_ACTIONLOG_JOOMLA="Action Log - Joomla"
+PLG_ACTIONLOG_JOOMLA_XML_DESCRIPTION="Record the actions of users on the site for Joomla core extensions so they can be reviewed if required."
diff --git a/administrator/language/en-GB/en-GB.plg_api-authentication_basic.ini b/administrator/language/en-GB/en-GB.plg_api-authentication_basic.ini
new file mode 100644
index 0000000000000..cd5f96392cbf1
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_api-authentication_basic.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_API-AUTHENTICATION_BASIC="API Authentication - Basic Auth"
+PLG_AUTH_AUTHENTICATION_BASIC_XML_DESCRIPTION="Used to allow basic authentication to Web Services in Joomla."
diff --git a/administrator/language/en-GB/en-GB.plg_api-authentication_basic.sys.ini b/administrator/language/en-GB/en-GB.plg_api-authentication_basic.sys.ini
new file mode 100644
index 0000000000000..cd5f96392cbf1
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_api-authentication_basic.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_API-AUTHENTICATION_BASIC="API Authentication - Basic Auth"
+PLG_AUTH_AUTHENTICATION_BASIC_XML_DESCRIPTION="Used to allow basic authentication to Web Services in Joomla."
diff --git a/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini b/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini
index 7e7b85f0491a6..83d0baa0c66dd 100644
--- a/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini
+++ b/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini
@@ -1,10 +1,11 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_AUTH_COOKIE_ERROR_LOG_LOGIN_FAILED="Cookie login failed for user %u."
 PLG_AUTH_COOKIE_FIELD_COOKIE_LIFETIME_LABEL="Cookie Lifetime (days)"
 PLG_AUTH_COOKIE_FIELD_KEY_LENGTH_LABEL="Key Length"
+PLG_AUTH_COOKIE_PRIVACY_CAPABILITY_COOKIE="In conjunction with a plugin which supports a \"Remember Me\" feature, such as the \"System - Remember Me\" plugin, this plugin creates a cookie on the user's client if a \"Remember Me\" checkbox is selected when logging into the website. This cookie can be identified with the prefix `joomla_remember_me` and is used to automatically log users into the website when they visit and are not already logged in."
 PLG_AUTH_COOKIE_XML_DESCRIPTION="Handles Joomla's cookie User authentication.<br><strong> Warning! You must have at least one other authentication plugin enabled.</strong> <br>You will also need a plugin such as the System - Remember Me plugin to implement cookie login."
 PLG_AUTHENTICATION_COOKIE="Authentication - Cookie"
diff --git a/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini b/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini
index 6785e69a44071..b45d5e28e31a2 100644
--- a/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini b/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini
index f7ad2450c3cf0..96e4783235531 100644
--- a/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini
+++ b/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini b/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini
index 9ed5f0597a519..c0bacbc85d80f 100644
--- a/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini b/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
index d7717d4bba34b..4edabb8aeb6d0 100644
--- a/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
+++ b/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini b/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini
index d205bfd121d60..2dd138642cc06 100644
--- a/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_behaviour_taggable.ini b/administrator/language/en-GB/en-GB.plg_behaviour_taggable.ini
index b0c6d1d356007..1f8e980448af2 100644
--- a/administrator/language/en-GB/en-GB.plg_behaviour_taggable.ini
+++ b/administrator/language/en-GB/en-GB.plg_behaviour_taggable.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_behaviour_taggable.sys.ini b/administrator/language/en-GB/en-GB.plg_behaviour_taggable.sys.ini
index b0c6d1d356007..1f8e980448af2 100644
--- a/administrator/language/en-GB/en-GB.plg_behaviour_taggable.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_behaviour_taggable.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_behaviour_versionable.ini b/administrator/language/en-GB/en-GB.plg_behaviour_versionable.ini
index c401a63d4e213..8fe03b3ecf4d1 100644
--- a/administrator/language/en-GB/en-GB.plg_behaviour_versionable.ini
+++ b/administrator/language/en-GB/en-GB.plg_behaviour_versionable.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_behaviour_versionable.sys.ini b/administrator/language/en-GB/en-GB.plg_behaviour_versionable.sys.ini
index c401a63d4e213..8fe03b3ecf4d1 100644
--- a/administrator/language/en-GB/en-GB.plg_behaviour_versionable.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_behaviour_versionable.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini
index 76aa1732437d1..532db7a402690 100644
--- a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini
+++ b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -17,9 +17,19 @@ PLG_RECAPTCHA_THEME_DARK="Dark"
 PLG_RECAPTCHA_SIZE_LABEL="Size"
 PLG_RECAPTCHA_THEME_NORMAL="Normal"
 PLG_RECAPTCHA_THEME_COMPACT="Compact"
+PLG_RECAPTCHA_TABINDEX_LABEL="Tabindex"
+PLG_RECAPTCHA_TABINDEX_DESC="The tabindex of the reCAPTCHA widget."
+PLG_RECAPTCHA_CALLBACK_LABEL="Callback"
+PLG_RECAPTCHA_CALLBACK_DESC="(Optional) JavaScript callback, executed after successful reCAPTCHA response."
+PLG_RECAPTCHA_ERROR_CALLBACK_LABEL="Error Callback"
+PLG_RECAPTCHA_ERROR_CALLBACK_DESC="(Optional) JavaScript callback, executed when the reCAPTCHA encounters an error."
+PLG_RECAPTCHA_EXPIRED_CALLBACK_LABEL="Expired Callback"
+PLG_RECAPTCHA_EXPIRED_CALLBACK_DESC="(Optional) JavaScript callback, executed when the reCAPTCHA expired."
 
 ; Error messages
 PLG_RECAPTCHA_ERROR_NO_PRIVATE_KEY="reCAPTCHA plugin needs a secret key to be set in its parameters. Please contact a site administrator."
 PLG_RECAPTCHA_ERROR_NO_PUBLIC_KEY="reCAPTCHA plugin needs a site key to be set in its parameters. Please contact a site administrator."
 PLG_RECAPTCHA_ERROR_EMPTY_SOLUTION="Please complete the CAPTCHA."
 PLG_RECAPTCHA_ERROR_NO_IP="For security reasons, you must pass the remote IP address to reCAPTCHA."
+
+PLG_RECAPTCHA_PRIVACY_CAPABILITY_IP_ADDRESS="The reCAPTCHA plugin integrates with Google's reCAPTCHA system as a spam protection service. As part of this service, the IP address of the user answering the captcha challenge is transmitted to Google."
diff --git a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini
index 929448dc46b01..0e7a5ae23c60a 100644
--- a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini
@@ -1,7 +1,7 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
-PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION="This CAPTCHA plugin uses the reCAPTCHA service to prevent spammers while it helps to digitize books, newspapers and old radio shows. To get a site and secret key for your domain, go to https://www.google.com/recaptcha. To use this for new account registration, go to Options in the User Manager and select Captcha - reCaptcha as the Captcha."
-PLG_CAPTCHA_RECAPTCHA="Captcha - ReCaptcha"
+PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION="This CAPTCHA plugin uses the reCAPTCHA service to prevent spammers while it helps to digitize books, newspapers and old radio shows. To get a site and secret key for your domain, go to <a href="_QQ_"https://www.google.com/recaptcha"_QQ_" target="_QQ_"_blank"_QQ_">https://www.google.com/recaptcha</a>. To use this for new account registration, go to Options in the User Manager and select CAPTCHA - reCAPTCHA as the CAPTCHA."
+PLG_CAPTCHA_RECAPTCHA="CAPTCHA - reCAPTCHA"
diff --git a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha_invisible.ini b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha_invisible.ini
new file mode 100644
index 0000000000000..63ea3c259f1fb
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha_invisible.ini
@@ -0,0 +1,32 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CAPTCHA_RECAPTCHA_INVISIBLE="CAPTCHA - Invisible reCAPTCHA"
+PLG_CAPTCHA_RECAPTCHA_INVISIBLE_XML_DESCRIPTION="This CAPTCHA plugin uses the Invisible reCAPTCHA service. To get a site and secret key for your domain, go to <a href="_QQ_"https://www.google.com/recaptcha"_QQ_" target="_QQ_"_blank"_QQ_">https://www.google.com/recaptcha</a>."
+; Params
+PLG_RECAPTCHA_INVISIBLE_BADGE_BOTTOMLEFT="Bottom left"
+PLG_RECAPTCHA_INVISIBLE_BADGE_BOTTOMRIGHT="Bottom right"
+PLG_RECAPTCHA_INVISIBLE_BADGE_DESC="Positioning of the reCAPTCHA badge."
+PLG_RECAPTCHA_INVISIBLE_BADGE_INLINE="Inline"
+PLG_RECAPTCHA_INVISIBLE_BADGE_LABEL="Badge"
+PLG_RECAPTCHA_INVISIBLE_CALLBACK_DESC="(Optional) JavaScript callback, executed after successful reCAPTCHA response."
+PLG_RECAPTCHA_INVISIBLE_CALLBACK_LABEL="Callback"
+PLG_RECAPTCHA_INVISIBLE_ERROR_CALLBACK_DESC="(Optional) JavaScript callback, executed when the reCAPTCHA encounters an error."
+PLG_RECAPTCHA_INVISIBLE_ERROR_CALLBACK_LABEL="Error Callback"
+PLG_RECAPTCHA_INVISIBLE_EXPIRED_CALLBACK_DESC="(Optional) JavaScript callback, executed when the reCAPTCHA expired."
+PLG_RECAPTCHA_INVISIBLE_EXPIRED_CALLBACK_LABEL="Expired Callback"
+PLG_RECAPTCHA_INVISIBLE_PRIVATE_KEY_DESC="Used in the communication between your server and the reCAPTCHA server. Be sure to keep it a secret."
+PLG_RECAPTCHA_INVISIBLE_PRIVATE_KEY_LABEL="Secret Key"
+PLG_RECAPTCHA_INVISIBLE_PUBLIC_KEY_DESC="Used in the JavaScript code that is served to your users."
+PLG_RECAPTCHA_INVISIBLE_PUBLIC_KEY_LABEL="Site Key"
+PLG_RECAPTCHA_INVISIBLE_TABINDEX_DESC="The tabindex of the challenge."
+PLG_RECAPTCHA_INVISIBLE_TABINDEX_LABEL="Tabindex"
+; Privacy notice
+PLG_RECAPTCHA_INVISIBLE_PRIVACY_CAPABILITY_IP_ADDRESS="The Invisible reCAPTCHA plugin integrates with Google's reCAPTCHA system as a spam protection service. As part of this service, the IP address of the user answering the captcha challenge is transmitted to Google."
+; Error messages
+PLG_RECAPTCHA_INVISIBLE_ERROR_EMPTY_SOLUTION="Empty solution not allowed."
+PLG_RECAPTCHA_INVISIBLE_ERROR_NO_IP="For security reasons, you must pass the remote IP address to reCAPTCHA."
+PLG_RECAPTCHA_INVISIBLE_ERROR_NO_PRIVATE_KEY="reCAPTCHA plugin needs a secret key to be set in its parameters. Please contact a site administrator."
+PLG_RECAPTCHA_INVISIBLE_ERROR_NO_PUBLIC_KEY="reCAPTCHA plugin needs a site key to be set in its parameters. Please contact a site administrator."
diff --git a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha_invisible.sys.ini b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha_invisible.sys.ini
new file mode 100644
index 0000000000000..04e89ed005185
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha_invisible.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CAPTCHA_RECAPTCHA_INVISIBLE="CAPTCHA - Invisible reCAPTCHA"
+PLG_CAPTCHA_RECAPTCHA_INVISIBLE_XML_DESCRIPTION="This CAPTCHA plugin uses the Invisible reCAPTCHA service. To get a site and secret key for your domain, go to <a href="_QQ_"https://www.google.com/recaptcha"_QQ_" target="_QQ_"_blank"_QQ_">https://www.google.com/recaptcha</a>."
diff --git a/administrator/language/en-GB/en-GB.plg_content_confirmconsent.ini b/administrator/language/en-GB/en-GB.plg_content_confirmconsent.ini
new file mode 100644
index 0000000000000..a74a96838529b
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_content_confirmconsent.ini
@@ -0,0 +1,13 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_CONFIRMCONSENT="Content - Confirm Consent"
+PLG_CONTENT_CONFIRMCONSENT_CONSENTBOX_LABEL="Privacy Note"
+PLG_CONTENT_CONFIRMCONSENT_FIELD_ARTICLE_DESC="Select the article from the list or create a new one."
+PLG_CONTENT_CONFIRMCONSENT_FIELD_ARTICLE_LABEL="Privacy Article"
+PLG_CONTENT_CONFIRMCONSENT_FIELD_NOTE_DEFAULT="By submitting this form you agree to the Privacy Policy of this website and the storing of the submitted information."
+PLG_CONTENT_CONFIRMCONSENT_FIELD_NOTE_DESC="A summary of the site's privacy policy. If left blank then the default message will be used."
+PLG_CONTENT_CONFIRMCONSENT_FIELD_NOTE_LABEL="Short Privacy Policy"
+PLG_CONTENT_CONFIRMCONSENT_XML_DESCRIPTION="This plugin adds a required consent checkbox to a form eg the core contact component."
diff --git a/administrator/language/en-GB/en-GB.plg_content_confirmconsent.sys.ini b/administrator/language/en-GB/en-GB.plg_content_confirmconsent.sys.ini
new file mode 100644
index 0000000000000..ef4ab8ac9e238
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_content_confirmconsent.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_CONFIRMCONSENT="Content - Confirm Consent"
+PLG_CONTENT_CONFIRMCONSENT_XML_DESCRIPTION="This plugin adds a required consent checkbox to a form eg the core contact component."
diff --git a/administrator/language/en-GB/en-GB.plg_content_contact.ini b/administrator/language/en-GB/en-GB.plg_content_contact.ini
index 3728451c425f2..0f05037141e38 100644
--- a/administrator/language/en-GB/en-GB.plg_content_contact.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_contact.ini
@@ -1,7 +1,14 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_CONTENT_CONTACT="Content - Contact"
 PLG_CONTENT_CONTACT_XML_DESCRIPTION="Provides a link between the content author and the contact item that can be used for an Author Profile."
+PLG_CONTENT_CONTACT_PARAM_URL_LABEL="Redirection"
+PLG_CONTENT_CONTACT_PARAM_URL_DESCRIPTION="You can link the author name to:<ul><li>Associated contact page.<li>Webpage specified in the associated contact profile.<li>Email specified in the associated contact profile.</ul>"
+PLG_CONTENT_CONTACT_PARAM_URL_URL="Internal contact page"
+PLG_CONTENT_CONTACT_PARAM_URL_WEBPAGE="Webpage from contact"
+PLG_CONTENT_CONTACT_PARAM_URL_EMAIL="Email from contact"
+PLG_CONTENT_CONTACT_PARAM_ALIAS_LABEL="Apply link also to alias name"
+PLG_CONTENT_CONTACT_PARAM_ALIAS_DESCRIPTION="Link to the real user data even if an author alias is set in article options."
diff --git a/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini b/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini
index 3728451c425f2..0a22199b46605 100644
--- a/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini b/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini
index 5b3a129eb4d42..064bc1487f662 100644
--- a/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini b/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini
index c45b5fd857bc9..a07ec04c99236 100644
--- a/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_fields.ini b/administrator/language/en-GB/en-GB.plg_content_fields.ini
index ff7f27a5b962b..8b668fb5bd6e3 100644
--- a/administrator/language/en-GB/en-GB.plg_content_fields.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_fields.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_fields.sys.ini b/administrator/language/en-GB/en-GB.plg_content_fields.sys.ini
index 189d6b52ca986..f4299f7bbe3c2 100644
--- a/administrator/language/en-GB/en-GB.plg_content_fields.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_fields.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_finder.ini b/administrator/language/en-GB/en-GB.plg_content_finder.ini
index 738db4b0a5dcb..5f06c55253d63 100644
--- a/administrator/language/en-GB/en-GB.plg_content_finder.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_finder.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini b/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini
index 2ddda8f673a4f..c229c93c2278e 100644
--- a/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_joomla.ini b/administrator/language/en-GB/en-GB.plg_content_joomla.ini
index 882a9df934f30..24c5acf5e1929 100644
--- a/administrator/language/en-GB/en-GB.plg_content_joomla.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_joomla.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini b/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini
index d806639fc81ef..3fe4ba0451848 100644
--- a/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini b/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini
index 43d7d583dab85..67a3fde36c4fd 100644
--- a/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini b/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini
index a22dc3be5cbff..68511142e09d2 100644
--- a/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini b/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini
index cae8f338de704..062e275d7a41a 100644
--- a/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini b/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini
index 3e36078f300c6..a1ba550faecfc 100644
--- a/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini b/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini
index 8acfebdcde36d..3d1b1b65c9f1a 100644
--- a/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini b/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini
index b1fa4d2a16926..dbba71825aa51 100644
--- a/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_vote.ini b/administrator/language/en-GB/en-GB.plg_content_vote.ini
index 9cf610191131b..2d60da120e3bb 100644
--- a/administrator/language/en-GB/en-GB.plg_content_vote.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_vote.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini b/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini
index 3e702fec80028..92ecc815f1bfd 100644
--- a/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini
index 3347b4903340e..6f8600aaa5a9b 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini
index 75587706df9e1..83138a746eddf 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.ini
index dbd9c666951c2..884126421be14 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.sys.ini
index 7ab09f924fd18..5f2864f509b8d 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.ini
index 394dab980174c..ec5b81069be02 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.sys.ini
index 8cef15ba80187..ccd40dfcb5ae9 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini
index a924f55ecaad4..b6fd63e5beca9 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini
@@ -1,9 +1,9 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_EDITORS-XTD_IMAGE="Button - Image"
 PLG_IMAGE_BUTTON_IMAGE="Image"
+PLG_IMAGE_BUTTON_INSERT="Insert Image"
 PLG_IMAGE_XML_DESCRIPTION="Displays a button to insert images into an Article. Displays a popup allowing you to configure an image's properties and upload new image files."
-
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini
index fc10f7694f8f2..b0d494b335178 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.ini
index bdb50691e1963..baaf8beb95271 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.sys.ini
index 1e5cd11bf1d3b..4efc5877a4ed8 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini
index bbec3352dfc80..57ea971d0e861 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini
index 6b783551b0487..643e79cdd515c 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini
index d4d916852d339..25fe91f4e5fba 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini
index b16632f036b3c..289f5f189814a 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini
index 045e0daaca586..8634a9be4bd6c 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini
index 2ebbdb32b2219..fc4eaa52f0eb5 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini b/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini
index 2dadc90567736..1161bca4fd788 100644
--- a/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini b/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini
index a3c6a26c8d776..f5e38371d9710 100644
--- a/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors_none.ini b/administrator/language/en-GB/en-GB.plg_editors_none.ini
index 82d58c6bc3491..2f7d25c912fde 100644
--- a/administrator/language/en-GB/en-GB.plg_editors_none.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors_none.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini b/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini
index 82d58c6bc3491..2f7d25c912fde 100644
--- a/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
index 21abdaa3aa991..462f8f47a8352 100644
--- a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
@@ -1,10 +1,10 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_EDITORS_TINYMCE="Editor - TinyMCE"
-PLG_TINY_BUTTON_TOGGLE_EDITOR="Toggle editor"
+PLG_TINY_BUTTON_TOGGLE_EDITOR="Toggle Editor"
 PLG_TINY_CONFIG_TEXTFILTER_ACL_LABEL="Use Joomla Text Filter"
 PLG_TINY_CORE_BUTTONS="CMS Content"
 PLG_TINY_ERR_CUSTOMCSSFILENOTPRESENT="The file name %s was entered in the TinyMCE Custom CSS field. This file could not be found in the default template folder. No styles are available."
diff --git a/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini b/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini
index ae9e2d86dd1d8..77516d67b2df6 100644
--- a/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_extension_finder.ini b/administrator/language/en-GB/en-GB.plg_extension_finder.ini
new file mode 100644
index 0000000000000..31c7ad3ac9af9
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_extension_finder.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EXTENSION_FINDER="Extension - Finder"
+PLG_EXTENSION_FINDER_XML_DESCRIPTION="Manage the common words in Smart Search."
diff --git a/administrator/language/en-GB/en-GB.plg_extension_finder.sys.ini b/administrator/language/en-GB/en-GB.plg_extension_finder.sys.ini
new file mode 100644
index 0000000000000..fd715db3aa084
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_extension_finder.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EXTENSION_FINDER="Extension - Finder"
+PLG_EXTENSION_FINDER_XML_DESCRIPTION="Manage the common words in Smart Search."
\ No newline at end of file
diff --git a/administrator/language/en-GB/en-GB.plg_extension_joomla.ini b/administrator/language/en-GB/en-GB.plg_extension_joomla.ini
index 19983aecd418f..7442b533cf21b 100644
--- a/administrator/language/en-GB/en-GB.plg_extension_joomla.ini
+++ b/administrator/language/en-GB/en-GB.plg_extension_joomla.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini b/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini
index 120bae6a7780e..63fb9be5a5fce 100644
--- a/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_extension_namespacemap.ini b/administrator/language/en-GB/en-GB.plg_extension_namespacemap.ini
index 681f7eb2bbc68..3b7118eba2aa6 100644
--- a/administrator/language/en-GB/en-GB.plg_extension_namespacemap.ini
+++ b/administrator/language/en-GB/en-GB.plg_extension_namespacemap.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_extension_namespacemap.sys.ini b/administrator/language/en-GB/en-GB.plg_extension_namespacemap.sys.ini
index 681f7eb2bbc68..3b7118eba2aa6 100644
--- a/administrator/language/en-GB/en-GB.plg_extension_namespacemap.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_extension_namespacemap.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_calendar.ini b/administrator/language/en-GB/en-GB.plg_fields_calendar.ini
index acc43d3623378..84508673cc954 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_calendar.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_calendar.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_calendar.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_calendar.sys.ini
index cb80374601931..acd6e1f6cf387 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_calendar.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_calendar.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_checkboxes.ini b/administrator/language/en-GB/en-GB.plg_fields_checkboxes.ini
index 00ead42218447..d4e80ae205e4d 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_checkboxes.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_checkboxes.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_checkboxes.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_checkboxes.sys.ini
index 9b7a49515a26e..3b4f0daa8ef32 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_checkboxes.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_checkboxes.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_color.ini b/administrator/language/en-GB/en-GB.plg_fields_color.ini
index d2e6c1bdd6dc1..7d9f9d4b835a6 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_color.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_color.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_color.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_color.sys.ini
index bcfc7e0691048..5d442cb8b628a 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_color.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_color.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_editor.ini b/administrator/language/en-GB/en-GB.plg_fields_editor.ini
index 0428f0c9ab8d0..2fa750a2a35c3 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_editor.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_editor.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_editor.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_editor.sys.ini
index 75fbfc8e9850a..e4beb01987d73 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_editor.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_editor.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_image.ini b/administrator/language/en-GB/en-GB.plg_fields_image.ini
index 63e727b7d2bbe..bd3d9ff09a72b 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_image.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_image.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_image.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_image.sys.ini
index 4347b37877d04..f0221258f9b3e 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_image.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_image.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini b/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini
index f37c38cb19055..5e534905aab0a 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_imagelist.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_imagelist.sys.ini
index f21daf57a2846..0bcce9774b916 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_imagelist.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_imagelist.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_integer.ini b/administrator/language/en-GB/en-GB.plg_fields_integer.ini
index 9ab9e04f7ec56..6729c277fe003 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_integer.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_integer.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_integer.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_integer.sys.ini
index 79fd8ce043435..82c25aad40045 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_integer.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_integer.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_list.ini b/administrator/language/en-GB/en-GB.plg_fields_list.ini
index f9bdfbc9b22e5..daec54c63def2 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_list.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_list.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_list.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_list.sys.ini
index 1055c1ece6ccf..4a0da046cf380 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_list.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_list.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_media.ini b/administrator/language/en-GB/en-GB.plg_fields_media.ini
index cc7b0f3b21f6c..afc414eaba38d 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_media.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_media.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_media.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_media.sys.ini
index cc3afe3d86443..20bfd434a4d11 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_media.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_media.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_radio.ini b/administrator/language/en-GB/en-GB.plg_fields_radio.ini
index 78ff40f018593..6db3626816356 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_radio.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_radio.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_radio.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_radio.sys.ini
index edfc7aa4f6fc1..3fdfa13bca81b 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_radio.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_radio.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_repeatable.ini b/administrator/language/en-GB/en-GB.plg_fields_repeatable.ini
new file mode 100644
index 0000000000000..d36a29da709fa
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_fields_repeatable.ini
@@ -0,0 +1,19 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_REPEATABLE="Fields - Repeatable"
+PLG_FIELDS_REPEATABLE_LABEL="Repeatable (%s)"
+PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_NAME_DESC="The name of the field to display in the form"
+PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_NAME_LABEL="Name"
+PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_TYPE_DESC="Set the field type"
+PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_TYPE_EDITOR="Editor"
+PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_TYPE_LABEL="Type"
+PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_TYPE_MEDIA="Media"
+PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_TYPE_NUMBER="Number"
+PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_TYPE_TEXT="Text"
+PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_TYPE_TEXTAREA="Text Area"
+PLG_FIELDS_REPEATABLE_PARAMS_FIELDS_DESC="Add one or more form fields"
+PLG_FIELDS_REPEATABLE_PARAMS_FIELDS_LABEL="Form Fields"
+PLG_FIELDS_REPEATABLE_XML_DESCRIPTION="Plugin to create a repeatable form with customizable fields."
diff --git a/administrator/language/en-GB/en-GB.plg_fields_repeatable.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_repeatable.sys.ini
new file mode 100644
index 0000000000000..c488fa57b040c
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_fields_repeatable.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_REPEATABLE="Fields - Repeatable"
+PLG_FIELDS_REPEATABLE_XML_DESCRIPTION="Plugin to create a repeatable form with customisable fields."
diff --git a/administrator/language/en-GB/en-GB.plg_fields_sql.ini b/administrator/language/en-GB/en-GB.plg_fields_sql.ini
index 8e8c93c444226..cb31641a2cbd6 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_sql.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_sql.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_sql.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_sql.sys.ini
index a400989f589cf..df9951116736b 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_sql.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_sql.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_text.ini b/administrator/language/en-GB/en-GB.plg_fields_text.ini
index 9fcbf1a2fac5d..2be39838fe7cd 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_text.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_text.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_text.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_text.sys.ini
index cccdd8636892d..1b5ee37c8ecb9 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_text.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_text.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_textarea.ini b/administrator/language/en-GB/en-GB.plg_fields_textarea.ini
index 92a286a90bf11..31c874bd1645b 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_textarea.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_textarea.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_textarea.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_textarea.sys.ini
index a312cf565f3b6..5a374e6155e83 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_textarea.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_textarea.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_url.ini b/administrator/language/en-GB/en-GB.plg_fields_url.ini
index 54226d17319c3..81c1d914ed8ac 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_url.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_url.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_url.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_url.sys.ini
index 316f43a579d11..68c5bf80aba79 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_url.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_url.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_user.ini b/administrator/language/en-GB/en-GB.plg_fields_user.ini
index 3a68374d893ba..16ad90501f38a 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_user.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_user.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_user.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_user.sys.ini
index cd0882392cea1..f4e6c9b046af6 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_user.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_user.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini b/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini
index 0bfa19bc8bfc4..d0bf6479961c1 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.sys.ini
index 5200b4ebdedf2..77707a2ef3856 100644
--- a/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_filesystem_local.ini b/administrator/language/en-GB/en-GB.plg_filesystem_local.ini
index 6f33c7dfac757..25a8a13944cb5 100644
--- a/administrator/language/en-GB/en-GB.plg_filesystem_local.ini
+++ b/administrator/language/en-GB/en-GB.plg_filesystem_local.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -7,4 +7,4 @@ PLG_FILESYSTEM_LOCAL="FileSystem - Local"
 PLG_FILESYSTEM_LOCAL_DEFAULT_NAME="Local"
 PLG_FILESYSTEM_LOCAL_DIRECTORIES_DIRECTORY_LABEL="Select directories"
 PLG_FILESYSTEM_LOCAL_DIRECTORIES_LABEL="Directories"
-PLG_FILESYSTEM_LOCAL_XML_DESCRIPTION="Filesystem plugin to define one or multiple local repositories to store your media files."
+PLG_FILESYSTEM_LOCAL_XML_DESCRIPTION="Filesystem plugin to define one or multiple local directories to store your media files."
diff --git a/administrator/language/en-GB/en-GB.plg_filesystem_local.sys.ini b/administrator/language/en-GB/en-GB.plg_filesystem_local.sys.ini
index ab57762e81ec4..ce8be91e0965a 100644
--- a/administrator/language/en-GB/en-GB.plg_filesystem_local.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_filesystem_local.sys.ini
@@ -1,7 +1,7 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_FILESYSTEM_LOCAL="FileSystem - Local"
-PLG_FILESYSTEM_LOCAL_XML_DESCRIPTION="Filesystem plugin to define one or multiple local repositories to store your media files."
+PLG_FILESYSTEM_LOCAL_XML_DESCRIPTION="Filesystem plugin to define one or multiple local directories to store your media files."
diff --git a/administrator/language/en-GB/en-GB.plg_finder_categories.ini b/administrator/language/en-GB/en-GB.plg_finder_categories.ini
index 35d19da91fab9..cef2180e8a87f 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_categories.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_categories.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini
index 17e4de302eea2..e5a04872933c7 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_contacts.ini b/administrator/language/en-GB/en-GB.plg_finder_contacts.ini
index 80aa8b8662071..52e1f8a9caa50 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_contacts.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_contacts.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini
index 81096d6c915f0..795e367d54d63 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_content.ini b/administrator/language/en-GB/en-GB.plg_finder_content.ini
index 13508bae8090c..2817da743802b 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_content.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_content.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini
index 8cd359314a1cd..b33f0352e73ca 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini b/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini
index eb97acf5694cf..40e29cfa8ddf9 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini
index 750ad43a72c3a..405813b9e889e 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_tags.ini b/administrator/language/en-GB/en-GB.plg_finder_tags.ini
index 6a230584fdcb3..a9cb8339ee08c 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_tags.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_tags.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini
index 8bf3b7922de6b..11afaae7b4874 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.ini b/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.ini
index a9d19b36c0454..05886d204ae7c 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.ini
@@ -1,9 +1,9 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_INSTALLER_FOLDERINSTALLER_TEXT="Install from Folder"
 PLG_INSTALLER_FOLDERINSTALLER_BUTTON="Check and Install"
 PLG_INSTALLER_FOLDERINSTALLER_NO_INSTALL_PATH="Please enter a Folder."
-PLG_INSTALLER_FOLDERINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install packages from a folder."
+PLG_INSTALLER_FOLDERINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install extensions from a folder."
diff --git a/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.sys.ini b/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.sys.ini
index e13df44da72a1..2a7e295810892 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.sys.ini
@@ -1,7 +1,7 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_INSTALLER_FOLDERINSTALLER="Installer - Install from Folder"
-PLG_INSTALLER_FOLDERINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install packages from a folder."
+PLG_INSTALLER_FOLDERINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install extensions from a folder."
diff --git a/administrator/language/en-GB/en-GB.plg_installer_override.ini b/administrator/language/en-GB/en-GB.plg_installer_override.ini
index 772b6d0506b0e..3d18f039b91a7 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_override.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_override.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini b/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini
index dd8e2244f22f6..a1839cfba33c7 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.ini b/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.ini
index f2747e0d4f9aa..75a9f4b9ebd55 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.ini
@@ -1,12 +1,12 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_INSTALLER_PACKAGEINSTALLER_DRAG_FILE_HERE="Drag and drop file here to upload."
 PLG_INSTALLER_PACKAGEINSTALLER_EXTENSION_PACKAGE_FILE="Extension package file"
 PLG_INSTALLER_PACKAGEINSTALLER_NO_PACKAGE="Please select a package to upload"
-PLG_INSTALLER_PACKAGEINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install packages from your local computer."
+PLG_INSTALLER_PACKAGEINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install extensions from your local computer."
 PLG_INSTALLER_PACKAGEINSTALLER_SELECT_FILE="Or browse for file"
 PLG_INSTALLER_PACKAGEINSTALLER_UPLOAD_INSTALL_JOOMLA_EXTENSION="Upload & Install Joomla Extension"
 PLG_INSTALLER_PACKAGEINSTALLER_UPLOAD_PACKAGE_FILE="Upload Package File"
diff --git a/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.sys.ini b/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.sys.ini
index 0be372c2ba5dc..3b5fc21fc101f 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.sys.ini
@@ -1,7 +1,7 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_INSTALLER_PACKAGEINSTALLER="Installer - Install from Upload"
-PLG_INSTALLER_PACKAGEINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install packages from your local computer."
+PLG_INSTALLER_PACKAGEINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install extensions from your local computer."
diff --git a/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.ini b/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.ini
index c2cee64013400..5b0aa12bdee69 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.ini
@@ -1,9 +1,9 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_INSTALLER_URLINSTALLER_BUTTON="Check and Install"
 PLG_INSTALLER_URLINSTALLER_NO_URL="Please enter a URL."
-PLG_INSTALLER_URLINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install packages from a URL."
+PLG_INSTALLER_URLINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install extensions from a URL."
 PLG_INSTALLER_URLINSTALLER_TEXT="Install from URL"
diff --git a/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.sys.ini b/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.sys.ini
index bf75762a8154e..bf98b8c0821ca 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.sys.ini
@@ -1,7 +1,7 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
-PLG_INSTALLER_URLINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install packages from a URL."
+PLG_INSTALLER_URLINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install extensions from a URL."
 PLG_INSTALLER_URLINSTALLER="Installer - Install from URL"
diff --git a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini
index edbdd8cee7fbf..1b837bdb545ed 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini
index 1d168780533e4..5f1e96e912cb4 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_media-action_crop.ini b/administrator/language/en-GB/en-GB.plg_media-action_crop.ini
index e01618c865de3..7ac677eb929aa 100644
--- a/administrator/language/en-GB/en-GB.plg_media-action_crop.ini
+++ b/administrator/language/en-GB/en-GB.plg_media-action_crop.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_media-action_crop.sys.ini b/administrator/language/en-GB/en-GB.plg_media-action_crop.sys.ini
index e42e5458cb7cc..657894ebd9768 100644
--- a/administrator/language/en-GB/en-GB.plg_media-action_crop.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_media-action_crop.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_media-action_resize.ini b/administrator/language/en-GB/en-GB.plg_media-action_resize.ini
index f95b14660d45d..2b7cf40ae24cf 100644
--- a/administrator/language/en-GB/en-GB.plg_media-action_resize.ini
+++ b/administrator/language/en-GB/en-GB.plg_media-action_resize.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_media-action_resize.sys.ini b/administrator/language/en-GB/en-GB.plg_media-action_resize.sys.ini
index 9bcb3d19d9f4d..96cbaa403219b 100644
--- a/administrator/language/en-GB/en-GB.plg_media-action_resize.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_media-action_resize.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_media-action_rotate.ini b/administrator/language/en-GB/en-GB.plg_media-action_rotate.ini
index 6de686440a3b3..ba1b79a519860 100644
--- a/administrator/language/en-GB/en-GB.plg_media-action_rotate.ini
+++ b/administrator/language/en-GB/en-GB.plg_media-action_rotate.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_media-action_rotate.sys.ini b/administrator/language/en-GB/en-GB.plg_media-action_rotate.sys.ini
index 061e274a0efe9..7d4a3d5fded24 100644
--- a/administrator/language/en-GB/en-GB.plg_media-action_rotate.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_media-action_rotate.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_privacy_actionlogs.ini b/administrator/language/en-GB/en-GB.plg_privacy_actionlogs.ini
new file mode 100644
index 0000000000000..e6faefd882185
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_privacy_actionlogs.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_PRIVACY_ACTIONLOGS="Privacy - Action Logs"
+PLG_PRIVACY_ACTIONLOGS_XML_DESCRIPTION="Responsible for exporting the action log data for a user's privacy request. Since the action logs are an audit log, these can not be deleted from the system."
diff --git a/administrator/language/en-GB/en-GB.plg_privacy_actionlogs.sys.ini b/administrator/language/en-GB/en-GB.plg_privacy_actionlogs.sys.ini
new file mode 100644
index 0000000000000..e6faefd882185
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_privacy_actionlogs.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_PRIVACY_ACTIONLOGS="Privacy - Action Logs"
+PLG_PRIVACY_ACTIONLOGS_XML_DESCRIPTION="Responsible for exporting the action log data for a user's privacy request. Since the action logs are an audit log, these can not be deleted from the system."
diff --git a/administrator/language/en-GB/en-GB.plg_privacy_consents.ini b/administrator/language/en-GB/en-GB.plg_privacy_consents.ini
new file mode 100644
index 0000000000000..e58e22c95d83a
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_privacy_consents.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_PRIVACY_CONSENTS="Privacy - Consents"
+PLG_PRIVACY_CONSENTS_XML_DESCRIPTION="Responsible for processing privacy related requests for the core Joomla privacy consents data."
diff --git a/administrator/language/en-GB/en-GB.plg_privacy_consents.sys.ini b/administrator/language/en-GB/en-GB.plg_privacy_consents.sys.ini
new file mode 100644
index 0000000000000..e58e22c95d83a
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_privacy_consents.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_PRIVACY_CONSENTS="Privacy - Consents"
+PLG_PRIVACY_CONSENTS_XML_DESCRIPTION="Responsible for processing privacy related requests for the core Joomla privacy consents data."
diff --git a/administrator/language/en-GB/en-GB.plg_privacy_contact.ini b/administrator/language/en-GB/en-GB.plg_privacy_contact.ini
new file mode 100644
index 0000000000000..190cbd446351a
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_privacy_contact.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_PRIVACY_CONTACT="Privacy - Contacts"
+PLG_PRIVACY_CONTACT_XML_DESCRIPTION="Responsible for processing privacy related requests for the core Joomla contact data."
diff --git a/administrator/language/en-GB/en-GB.plg_privacy_contact.sys.ini b/administrator/language/en-GB/en-GB.plg_privacy_contact.sys.ini
new file mode 100644
index 0000000000000..190cbd446351a
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_privacy_contact.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_PRIVACY_CONTACT="Privacy - Contacts"
+PLG_PRIVACY_CONTACT_XML_DESCRIPTION="Responsible for processing privacy related requests for the core Joomla contact data."
diff --git a/administrator/language/en-GB/en-GB.plg_privacy_content.ini b/administrator/language/en-GB/en-GB.plg_privacy_content.ini
new file mode 100644
index 0000000000000..5d50613c7019e
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_privacy_content.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_PRIVACY_CONTENT="Privacy - Content"
+PLG_PRIVACY_CONTENT_XML_DESCRIPTION="Responsible for processing privacy related requests for the core Joomla content data."
diff --git a/administrator/language/en-GB/en-GB.plg_privacy_content.sys.ini b/administrator/language/en-GB/en-GB.plg_privacy_content.sys.ini
new file mode 100644
index 0000000000000..5d50613c7019e
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_privacy_content.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_PRIVACY_CONTENT="Privacy - Content"
+PLG_PRIVACY_CONTENT_XML_DESCRIPTION="Responsible for processing privacy related requests for the core Joomla content data."
diff --git a/administrator/language/en-GB/en-GB.plg_privacy_message.ini b/administrator/language/en-GB/en-GB.plg_privacy_message.ini
new file mode 100644
index 0000000000000..c67d1908f89aa
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_privacy_message.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_PRIVACY_MESSAGE="Privacy - User Messages"
+PLG_PRIVACY_MESSAGE_XML_DESCRIPTION="Responsible for processing privacy related requests for the core Joomla user messages data."
diff --git a/administrator/language/en-GB/en-GB.plg_privacy_message.sys.ini b/administrator/language/en-GB/en-GB.plg_privacy_message.sys.ini
new file mode 100644
index 0000000000000..c67d1908f89aa
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_privacy_message.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_PRIVACY_MESSAGE="Privacy - User Messages"
+PLG_PRIVACY_MESSAGE_XML_DESCRIPTION="Responsible for processing privacy related requests for the core Joomla user messages data."
diff --git a/administrator/language/en-GB/en-GB.plg_privacy_user.ini b/administrator/language/en-GB/en-GB.plg_privacy_user.ini
new file mode 100644
index 0000000000000..d1f733954efba
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_privacy_user.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_PRIVACY_USER="Privacy - User Accounts"
+PLG_PRIVACY_USER_ERROR_CANNOT_REMOVE_SUPER_USER="Cannot remove a super user account."
+PLG_PRIVACY_USER_XML_DESCRIPTION="Responsible for processing privacy related requests for the core Joomla user data."
diff --git a/administrator/language/en-GB/en-GB.plg_privacy_user.sys.ini b/administrator/language/en-GB/en-GB.plg_privacy_user.sys.ini
new file mode 100644
index 0000000000000..ba043e9af9d9b
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_privacy_user.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_PRIVACY_USER="Privacy - User Accounts"
+PLG_PRIVACY_USER_XML_DESCRIPTION="Responsible for processing privacy related requests for the core Joomla user data."
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
index 8d51820bd8c15..4c30c1934f25b 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini
index 3625c7b5e4857..63a03314ba651 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
index 60599f7abce7e..062fa872c8be9 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini
index 03ae8301ba4ad..2cd00648fe674 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
index 83f535b2cb816..e52db082896ae 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.sys.ini b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.sys.ini
index b48f637a51985..ee4cb255345dd 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.ini b/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.ini
index c4fe47d52ddac..7d33c95740a4a 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.ini
@@ -1,11 +1,11 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_QUICKICON_PHPVERSIONCHECK="Quick Icon - PHP Version Check"
 ; Key 1 is the server's current PHP version, key 2 is the date at which support will end for the current PHP version
-PLG_QUICKICON_PHPVERSIONCHECK_SECURITY_ONLY="Your PHP version, %1$s, is only receiving security fixes at this time from the PHP project. This means your PHP version will soon no longer be supported. We recommend planning to upgrade to a newer PHP version before it reaches end of support on %2$s. Joomla will be faster and more secure if you upgrade to a newer PHP version (PHP 7.x is recommended). Please contact your host for upgrade instructions."
+PLG_QUICKICON_PHPVERSIONCHECK_SECURITY_ONLY="Your PHP version, %1$s, is only receiving security fixes from the PHP project at this time. This means your PHP version will soon no longer be supported. We recommend planning to upgrade to a newer PHP version before it reaches end of support on %2$s. Joomla will be faster and more secure if you upgrade to a newer PHP version. Please contact your host for upgrade instructions."
 ; Key 1 is the server's current PHP version, key 2 is the recommended PHP version, and key 3 is the date at which support will end for the recommended PHP version
 PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED="We have detected that your server is using PHP %1$s which is obsolete and no longer receives official security updates by its developers. The Joomla! Project recommends upgrading your site to PHP %2$s or later which will receive security updates at least until %3$s. Please ask your host to make PHP %2$s or a later version the default version for your site. If your host is already PHP %2$s ready please enable PHP %2$s on your site's root and 'administrator' directories – typically you can do this yourself through a tool in your hosting control panel, but it's best to ask your host if you are unsure."
 PLG_QUICKICON_PHPVERSIONCHECK_XML_DESCRIPTION="Checks the support status of your installation's PHP version and raises a warning if not fully supported."
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.sys.ini b/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.sys.ini
index 605dc09a9e030..b55a634cf1b33 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_privacycheck.ini b/administrator/language/en-GB/en-GB.plg_quickicon_privacycheck.ini
new file mode 100644
index 0000000000000..4ea2634846cfd
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_privacycheck.ini
@@ -0,0 +1,15 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_QUICKICON_PRIVACYCHECK="Quick Icon - Joomla! Privacy Requests Notification"
+PLG_QUICKICON_PRIVACYCHECK_CHECKING="Checking requests ..."
+PLG_QUICKICON_PRIVACYCHECK_ERROR="Unknown requests ..."
+PLG_QUICKICON_PRIVACYCHECK_GROUP_DESC="The group of this plugin (this value is compared with the group value used in <strong>Quick Icons</strong> modules to inject icons)."
+PLG_QUICKICON_PRIVACYCHECK_GROUP_LABEL="Group"
+PLG_QUICKICON_PRIVACYCHECK_REQUESTFOUND="Urgent Privacy Requests"
+PLG_QUICKICON_PRIVACYCHECK_REQUESTFOUND_BUTTON="View Requests"
+PLG_QUICKICON_PRIVACYCHECK_REQUESTFOUND_MESSAGE="Urgent Privacy Request(s) to manage."
+PLG_QUICKICON_PRIVACYCHECK_NOREQUEST="No Urgent Requests."
+PLG_QUICKICON_PRIVACYCHECK_XML_DESCRIPTION="Checks for privacy requests that need to be handled and notifies you when you visit the Control Panel page."
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_privacycheck.sys.ini b/administrator/language/en-GB/en-GB.plg_quickicon_privacycheck.sys.ini
new file mode 100644
index 0000000000000..f00ff9298b984
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_privacycheck.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_QUICKICON_PRIVACYCHECK="Quick Icon - Joomla! Privacy Requests Notification"
+PLG_QUICKICON_PRIVACYCHECK_XML_DESCRIPTION="Checks for privacy requests that need to be handled and notifies you when you visit the Control Panel page."
diff --git a/administrator/language/en-GB/en-GB.plg_sampledata_blog.ini b/administrator/language/en-GB/en-GB.plg_sampledata_blog.ini
index bc7651c8b227b..acf847c1d9f0d 100644
--- a/administrator/language/en-GB/en-GB.plg_sampledata_blog.ini
+++ b/administrator/language/en-GB/en-GB.plg_sampledata_blog.ini
@@ -1,16 +1,16 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_SAMPLEDATA_BLOG="Sample Data - Blog"
 PLG_SAMPLEDATA_BLOG_OVERVIEW_DESC="Sample data which will set up a blog site.<br>If the site is multilingual, the data will be tagged to the active backend language."
-PLG_SAMPLEDATA_BLOG_OVERVIEW_TITLE="Blog Sample data"
+PLG_SAMPLEDATA_BLOG_OVERVIEW_TITLE="Blog Sample Data"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_0_FULLTEXT=""
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_0_INTROTEXT="<p>This tells you a bit about this blog and the person who writes it. </p><p>When you are logged in you will be able to edit this page by selecting the edit icon.</p>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_0_TITLE="About"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_FULLTEXT=""
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_INTROTEXT="<p>Here are some basic tips for working on your site.</p><ul><li>Joomla! has a 'front end' that you are looking at now and an 'administrator' or back end' which is where you do the more advanced work of creating your site such as setting up the menus and deciding what modules to show. You need to login to the administrator separately using the same user name and password that you used to login to this part of the site.</li><li>One of the first things you will probably want to do is change the site title and tag line and to add a logo. To do this select the Template Settings link in the top menu. To change your site description, browser title, default email and other items, select Site Settings. More advanced configuration options are available in the administrator.</li><li>To totally change the look of your site you will probably want to install a new template. In the Extensions menu select Extensions Manager and then go to the Install tab. There are many free and commercial templates available for Joomla.</li><li>As you have already seen, you can control who can see different parts of you site. When you work with modules, articles or weblinks setting the Access level to Registered will mean that only logged in users can see them</li><li>When you create a new article or other kind of content you also can save it as Published or Unpublished. If it is Unpublished site visitors will not be able to see it but you will.</li><li>You can learn much more about working with Joomla from the <a href='https://docs.joomla.org/'>Joomla documentation site</a> and get help from other users at the <a href='https://forum.joomla.org/'>Joomla forums</a>. In the administrator there are help buttons on every page that provide detailed information about the functions on that page.</li></ul>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_INTROTEXT="<p>Here are some basic tips for working on your site.</p><ul><li>Joomla! has a 'front end' that you are looking at now and an 'administrator' or 'back end' which is where you do the more advanced work of creating your site such as setting up the menus and deciding what modules to show. You need to login to the administrator separately using the same user name and password that you used to login to this part of the site.</li><li>One of the first things you will probably want to do is change the site title and tag line and to add a logo. To do this select the Template Settings link in the top menu. To change your site description, browser title, default email and other items, select Site Settings. More advanced configuration options are available in the administrator.</li><li>To totally change the look of your site you will probably want to install a new template. In the Extensions menu select Extensions Manager and then go to the Install tab. There are many free and commercial templates available for Joomla.</li><li>As you have already seen, you can control who can see different parts of you site. When you work with modules, articles or weblinks setting the Access level to Registered will mean that only logged in users can see them</li><li>When you create a new article or other kind of content you also can save it as Published or Unpublished. If it is Unpublished site visitors will not be able to see it but you will.</li><li>You can learn much more about working with Joomla from the <a href='https://docs.joomla.org/'>Joomla documentation site</a> and get help from other users at the <a href='https://forum.joomla.org/'>Joomla forums</a>. In the administrator there are help buttons on every page that provide detailed information about the functions on that page.</li></ul>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_TITLE="Working on Your Site"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_2_FULLTEXT=""
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_2_INTROTEXT="<p>This is a sample blog posting.</p><p>If you log in to the site (the Author Login link is on the very bottom of this page) you will be able to edit it and all of the other existing articles. You will also be able to create a new article and make other changes to the site.</p><p>As you add and modify articles you will see how your site changes and also how you can customise it in various ways.</p><p>Go ahead, you can't break it.</p>"
diff --git a/administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini b/administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini
index f5b597501eaca..a6cd4db5a93e3 100644
--- a/administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_sampledata_multilang.ini b/administrator/language/en-GB/en-GB.plg_sampledata_multilang.ini
index 3655861fa61ed..0cba907f2c85d 100644
--- a/administrator/language/en-GB/en-GB.plg_sampledata_multilang.ini
+++ b/administrator/language/en-GB/en-GB.plg_sampledata_multilang.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_sampledata_multilang.sys.ini b/administrator/language/en-GB/en-GB.plg_sampledata_multilang.sys.ini
index 3e148e96eb24c..e2da363b025b5 100644
--- a/administrator/language/en-GB/en-GB.plg_sampledata_multilang.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_sampledata_multilang.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_categories.ini b/administrator/language/en-GB/en-GB.plg_search_categories.ini
index add46f4ba4130..df48c6d533374 100644
--- a/administrator/language/en-GB/en-GB.plg_search_categories.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_categories.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini b/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini
index 6d23dbcd38c96..ddca881322303 100644
--- a/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_contacts.ini b/administrator/language/en-GB/en-GB.plg_search_contacts.ini
index 57c67434a3311..f0b3fc96c1102 100644
--- a/administrator/language/en-GB/en-GB.plg_search_contacts.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_contacts.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini b/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini
index 95d672c8e857e..31dd829c98f63 100644
--- a/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_content.ini b/administrator/language/en-GB/en-GB.plg_search_content.ini
index 281f18519b982..a3245eaf7f783 100644
--- a/administrator/language/en-GB/en-GB.plg_search_content.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_content.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_content.sys.ini b/administrator/language/en-GB/en-GB.plg_search_content.sys.ini
index 0ec97e3a49556..909d79dc4b5d7 100644
--- a/administrator/language/en-GB/en-GB.plg_search_content.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_content.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini b/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini
index 28e12699c1587..6317868306412 100644
--- a/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini b/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini
index 918dc80347a6d..6339324881ef8 100644
--- a/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_tags.ini b/administrator/language/en-GB/en-GB.plg_search_tags.ini
index d750e564ff22f..30b7120073468 100644
--- a/administrator/language/en-GB/en-GB.plg_search_tags.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_tags.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini b/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini
index 0b024eaf0ffe3..b5736fc620bc3 100644
--- a/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_actionlogs.ini b/administrator/language/en-GB/en-GB.plg_system_actionlogs.ini
new file mode 100644
index 0000000000000..04b06840c7377
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_system_actionlogs.ini
@@ -0,0 +1,22 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_ACTIONLOGS="System - User Actions Log"
+PLG_SYSTEM_ACTIONLOGS_EXTENSIONS_NOTIFICATIONS="Select events to be notified for"
+PLG_SYSTEM_ACTIONLOGS_EXTENSIONS_NOTIFICATIONS_DESC="Select events to be sent to your email as notifications"
+PLG_SYSTEM_ACTIONLOGS_LOG_DELETE_PERIOD="Days to delete logs after"
+PLG_SYSTEM_ACTIONLOGS_LOG_DELETE_PERIOD_DESC="Enter how many days logs should be kept before they are deleted. Enter 0 if you don't want to delete the logs."
+PLG_SYSTEM_ACTIONLOGS_NOTIFICATIONS="Send notifications for User Actions Log"
+PLG_SYSTEM_ACTIONLOGS_NOTIFICATIONS_DESC="Send a notifications of users' actions log to your email"
+PLG_SYSTEM_ACTIONLOGS_OPTIONS="User Actions Log Options"
+PLG_SYSTEM_ACTIONLOGS_XML_DESCRIPTION="Record the actions of users on the site so they can be reviewed if required."
+; Common content type log messages
+PLG_SYSTEM_ACTIONLOGS_CONTENT_ADDED="User <a href=\"{accountlink}\">{username}</a> added new {type} <a href=\"{itemlink}\">{title}</a>"
+PLG_SYSTEM_ACTIONLOGS_CONTENT_ARCHIVED="User <a href=\"{accountlink}\">{username}</a> archived the {type} <a href=\"{itemlink}\">{title}</a>"
+PLG_SYSTEM_ACTIONLOGS_CONTENT_UPDATED="User <a href=\"{accountlink}\">{username}</a> updated the {type} <a href=\"{itemlink}\">{title}</a>"
+PLG_SYSTEM_ACTIONLOGS_CONTENT_PUBLISHED="User <a href=\"{accountlink}\">{username}</a> published the {type} <a href=\"{itemlink}\">{title}</a>"
+PLG_SYSTEM_ACTIONLOGS_CONTENT_UNPUBLISHED="User <a href=\"{accountlink}\">{username}</a> unpublished the {type} <a href=\"{itemlink}\">{title}</a>"
+PLG_SYSTEM_ACTIONLOGS_CONTENT_TRASHED="User <a href=\"{accountlink}\">{username}</a> trashed the {type} <a href=\"{itemlink}\">{title}</a>"
+PLG_SYSTEM_ACTIONLOGS_CONTENT_DELETED="User <a href=\"{accountlink}\">{username}</a> deleted the {type} {title}"
diff --git a/administrator/language/en-GB/en-GB.plg_system_actionlogs.sys.ini b/administrator/language/en-GB/en-GB.plg_system_actionlogs.sys.ini
new file mode 100644
index 0000000000000..c1fc13da03f1c
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_system_actionlogs.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_ACTIONLOGS="System - User Actions Log"
+PLG_SYSTEM_ACTIONLOGS_XML_DESCRIPTION="To record actions of users within the CMS, to know who to blame when something wrong happens."
diff --git a/administrator/language/en-GB/en-GB.plg_system_cache.ini b/administrator/language/en-GB/en-GB.plg_system_cache.ini
index d8c619ac39ad9..4a2af77500729 100644
--- a/administrator/language/en-GB/en-GB.plg_system_cache.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_cache.ini
@@ -1,10 +1,10 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_CACHE_FIELD_BROWSERCACHE_LABEL="Use Browser Caching"
-PLG_CACHE_FIELD_EXCLUDE_DESC="Specify which URLs you want to exclude from caching, each on a separate line. Regular expressions are supported, eg. <br><strong>about\-[a-z]+</strong> - will exclude all URLs that have 'about-', for example 'about-us', 'about-me', 'about-joomla' etc.<br><strong>\/component\/users\/</strong> - will exclude all URLs that have /component/users/"
+PLG_CACHE_FIELD_EXCLUDE_DESC="Specify which URLs you want to exclude from caching, each on a separate line. Regular expressions are supported, eg. <br><strong>about\-[a-z]+</strong> - will exclude all URLs that have 'about-', for example 'about-us', 'about-me', 'about-joomla' etc.<br><strong>/component/users/</strong> - will exclude all URLs that have /component/users/.<br><strong>com_users</strong> - will exclude all Users component pages."
 PLG_CACHE_FIELD_EXCLUDE_LABEL="Exclude URLs"
 PLG_CACHE_FIELD_EXCLUDE_MENU_ITEMS_LABEL="Exclude Menu Items"
 PLG_CACHE_XML_DESCRIPTION="Provides page caching."
diff --git a/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini b/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini
index f60ac92b0ee83..23f5c34e03fb9 100644
--- a/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_debug.ini b/administrator/language/en-GB/en-GB.plg_system_debug.ini
index d287b3e8cb955..bf493cfa00c32 100644
--- a/administrator/language/en-GB/en-GB.plg_system_debug.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_debug.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini b/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini
index 0df8832981b34..64010ab73cc86 100644
--- a/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_fields.ini b/administrator/language/en-GB/en-GB.plg_system_fields.ini
index b2f9aaca1164f..6b11ff633a8e2 100644
--- a/administrator/language/en-GB/en-GB.plg_system_fields.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_fields.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_fields.sys.ini b/administrator/language/en-GB/en-GB.plg_system_fields.sys.ini
index b2f9aaca1164f..6b11ff633a8e2 100644
--- a/administrator/language/en-GB/en-GB.plg_system_fields.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_fields.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_highlight.ini b/administrator/language/en-GB/en-GB.plg_system_highlight.ini
index 08178bb920c2d..b1a9c28cf6b68 100644
--- a/administrator/language/en-GB/en-GB.plg_system_highlight.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_highlight.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini b/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini
index 08178bb920c2d..b1a9c28cf6b68 100644
--- a/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_httpheaders.ini b/administrator/language/en-GB/en-GB.plg_system_httpheaders.ini
index c0b53d71faef9..77cac53641dbc 100644
--- a/administrator/language/en-GB/en-GB.plg_system_httpheaders.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_httpheaders.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_httpheaders.sys.ini b/administrator/language/en-GB/en-GB.plg_system_httpheaders.sys.ini
index d49dfac17c0ed..91f579fe49cc6 100644
--- a/administrator/language/en-GB/en-GB.plg_system_httpheaders.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_httpheaders.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_languagecode.ini b/administrator/language/en-GB/en-GB.plg_system_languagecode.ini
index 78bad7a92f5f7..10a4f1689c049 100644
--- a/administrator/language/en-GB/en-GB.plg_system_languagecode.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_languagecode.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini b/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini
index f7765e9f1ee79..3d0bca1aabccd 100644
--- a/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini b/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini
index 6391066045f7c..20b7a152095df 100644
--- a/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -16,5 +16,6 @@ PLG_SYSTEM_LANGUAGEFILTER_OPTION_DEFAULT_LANGUAGE="Default frontend language"
 PLG_SYSTEM_LANGUAGEFILTER_FIELD_REMOVE_DEFAULT_PREFIX_LABEL="Remove URL Language Code"
 PLG_SYSTEM_LANGUAGEFILTER_OPTION_SESSION="Session"
 PLG_SYSTEM_LANGUAGEFILTER_OPTION_YEAR="Year"
+PLG_SYSTEM_LANGUAGEFILTER_PRIVACY_CAPABILITY_LANGUAGE_COOKIE="On a site which supports multiple languages, this plugin can be configured to set a cookie on the user's browser which remembers their language preference. This cookie is used to redirect users to their preferred language when visiting the site and creating a new session. The cookie's name is based on a randomly generated hash and therefore does not have a constant identifier."
 PLG_SYSTEM_LANGUAGEFILTER_SITE_LANGUAGE="Site Language"
 PLG_SYSTEM_LANGUAGEFILTER_XML_DESCRIPTION="This plugin filters the displayed content depending on language.<br><strong>This plugin is to be enabled only when the Language Switcher module is published.</strong><br>If this plugin is activated, it is recommended to also publish the Administrator multilingual status module."
diff --git a/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini b/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini
index 5d7950e37df88..d6c5b5100ebd5 100644
--- a/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_log.ini b/administrator/language/en-GB/en-GB.plg_system_log.ini
index 877d4da357de0..ca7b1ad75808f 100644
--- a/administrator/language/en-GB/en-GB.plg_system_log.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_log.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_log.sys.ini b/administrator/language/en-GB/en-GB.plg_system_log.sys.ini
index 086c63af3f0f9..a5bae4710638a 100644
--- a/administrator/language/en-GB/en-GB.plg_system_log.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_log.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_logout.ini b/administrator/language/en-GB/en-GB.plg_system_logout.ini
index e4d57d6a1b8c4..a32d0c7134cd4 100644
--- a/administrator/language/en-GB/en-GB.plg_system_logout.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_logout.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini b/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini
index 6dabe0b0cb5a9..b36e4202ed83f 100644
--- a/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_logrotation.ini b/administrator/language/en-GB/en-GB.plg_system_logrotation.ini
new file mode 100644
index 0000000000000..d25b74b27274c
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_system_logrotation.ini
@@ -0,0 +1,11 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_LOGROTATION="System - Log Rotation"
+PLG_SYSTEM_LOGROTATION_XML_DESCRIPTION="This plugin periodically rotates system log files."
+PLG_SYSTEM_LOGROTATION_CACHETIMEOUT_LABEL="Log Rotation (in days)"
+PLG_SYSTEM_LOGROTATION_CACHETIMEOUT_DESC="How often should the logs be rotated."
+PLG_SYSTEM_LOGROTATION_LOGSTOKEEP_DESC="The maximum number of old logs to keep."
+PLG_SYSTEM_LOGROTATION_LOGSTOKEEP_LABEL="Maximum Logs"
diff --git a/administrator/language/en-GB/en-GB.plg_system_logrotation.sys.ini b/administrator/language/en-GB/en-GB.plg_system_logrotation.sys.ini
new file mode 100644
index 0000000000000..c03ea875d9b6d
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_system_logrotation.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_LOGROTATION="System - Log Rotation"
+PLG_SYSTEM_LOGROTATION_XML_DESCRIPTION="This plugin periodically rotates system log files."
diff --git a/administrator/language/en-GB/en-GB.plg_system_privacyconsent.ini b/administrator/language/en-GB/en-GB.plg_system_privacyconsent.ini
new file mode 100644
index 0000000000000..8c2d4b4ad7360
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_system_privacyconsent.ini
@@ -0,0 +1,43 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_PRIVACYCONSENT="System - Privacy Consent"
+PLG_SYSTEM_PRIVACYCONSENT_BODY="<p>The user consented to storing their user information using the IP address <strong>%s</strong></p><p>The user agent string of the user's browser was:<br/>%s</p><p>This information was automatically recorded when the user submitted their details on the web site and checked the confirm box</p>"
+PLG_SYSTEM_PRIVACYCONSENT_CACHETIMEOUT_DESC="How often the check is performed"
+PLG_SYSTEM_PRIVACYCONSENT_CACHETIMEOUT_LABEL="Periodic check (days)"
+PLG_SYSTEM_PRIVACYCONSENT_CONSENT="User <a href='{accountlink}'>{username}</a> consented to the privacy policy."
+PLG_SYSTEM_PRIVACYCONSENT_CONSENTEXPIRATION_DESC="Number of days after which the privacy consent shall expire."
+PLG_SYSTEM_PRIVACYCONSENT_CONSENTEXPIRATION_LABEL="Expiration"
+; You can use the following merge codes for the EMAIL strings:
+; [SITENAME]  Site name, as set in Global Configuration.
+; [URL]       URL of the site's frontend page.
+; [TOKENURL]  URL of the remind page with the token prefilled.
+; [FORMURL]   URL of the remind page where the user can paste their token.
+; [TOKEN]     The remind token.
+; \n          Newline character. Use it to start a new line in the email.
+PLG_SYSTEM_PRIVACYCONSENT_EMAIL_REMIND_BODY="Your Privacy Consent given at [URL] will expire in few days, you can renew the privacy consent for this website.\n\nIn order to do this, you can complete one of the following tasks:\n\n1. Visit the following URL: [TOKENURL]\n\n2. Copy your token from this email, visit the referenced URL, and paste your token into the form.\nURL: [FORMURL]\nToken: [TOKEN]\n\nPlease note that this token is only valid for this account."
+PLG_SYSTEM_PRIVACYCONSENT_EMAIL_REMIND_SUBJECT="Privacy Consent at [SITENAME]"
+PLG_SYSTEM_PRIVACYCONSENT_EXPIRATION_FIELDSET_LABEL="Expiration"
+PLG_SYSTEM_PRIVACYCONSENT_FIELD_ARTICLE_DESC="Select the article from the list or create a new one."
+PLG_SYSTEM_PRIVACYCONSENT_FIELD_ARTICLE_LABEL="Privacy Article"
+PLG_SYSTEM_PRIVACYCONSENT_FIELD_DESC="Read the full privacy policy"
+PLG_SYSTEM_PRIVACYCONSENT_FIELD_ENABLED_DESC="When enabled it performs checks for consent expiration"
+PLG_SYSTEM_PRIVACYCONSENT_FIELD_ENABLED_LABEL="Enable"
+PLG_SYSTEM_PRIVACYCONSENT_FIELD_ERROR="Agreement to the site's Privacy Policy is required."
+PLG_SYSTEM_PRIVACYCONSENT_FIELD_LABEL="Privacy Policy"
+PLG_SYSTEM_PRIVACYCONSENT_LABEL="Web Site Privacy"
+PLG_SYSTEM_PRIVACYCONSENT_NOTE_FIELD_DEFAULT="By signing up to this web site and agreeing to the Privacy Policy you agree to this web site storing your information."
+PLG_SYSTEM_PRIVACYCONSENT_NOTE_FIELD_DESC="A summary of the site's privacy policy. If left blank then the default message will be used."
+PLG_SYSTEM_PRIVACYCONSENT_NOTE_FIELD_LABEL="Short Privacy Policy"
+PLG_SYSTEM_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_SUBJECT="Privacy Consent Expired"
+PLG_SYSTEM_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_MESSAGE="Privacy consent has expired for %1$s."
+PLG_SYSTEM_PRIVACYCONSENT_OPTION_AGREE="I agree"
+PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_DEFAULT="Please confirm that you consent to this web site storing your information by agreeing to the privacy policy."
+PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_DESC="Custom message to be displayed on redirect. If left blank then the default message will be used."
+PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_LABEL="Redirect Message"
+PLG_SYSTEM_PRIVACYCONSENT_REMINDBEFORE_DESC="Number of days to send a reminder before the expiration of the privacy consent."
+PLG_SYSTEM_PRIVACYCONSENT_REMINDBEFORE_LABEL="Remind"
+PLG_SYSTEM_PRIVACYCONSENT_SUBJECT="Privacy Policy"
+PLG_SYSTEM_PRIVACYCONSENT_XML_DESCRIPTION="Basic plugin to request user's consent to the site's privacy policy. Existing users who have not consented yet will be redirected on login to update their profile."
diff --git a/administrator/language/en-GB/en-GB.plg_system_privacyconsent.sys.ini b/administrator/language/en-GB/en-GB.plg_system_privacyconsent.sys.ini
new file mode 100644
index 0000000000000..9e5e187496742
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_system_privacyconsent.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_PRIVACYCONSENT="System - Privacy Consent"
+PLG_SYSTEM_PRIVACYCONSENT_XML_DESCRIPTION="Basic plugin to request user's consent to the site's privacy policy. Existing users who have not consented yet will be redirected on login to update their profile."
\ No newline at end of file
diff --git a/administrator/language/en-GB/en-GB.plg_system_redirect.ini b/administrator/language/en-GB/en-GB.plg_system_redirect.ini
index 9a882052ed1e0..78eb5f9c7352f 100644
--- a/administrator/language/en-GB/en-GB.plg_system_redirect.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_redirect.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini b/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini
index 1d3978c31226f..67911f4cbc910 100644
--- a/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_remember.ini b/administrator/language/en-GB/en-GB.plg_system_remember.ini
index 6d4aa2addcdfc..f61faad67e13e 100644
--- a/administrator/language/en-GB/en-GB.plg_system_remember.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_remember.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini b/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini
index 5c4868efb301b..93ffe89fba516 100644
--- a/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_sef.ini b/administrator/language/en-GB/en-GB.plg_system_sef.ini
index aaaf8446ee535..03d8ea63ecf3a 100644
--- a/administrator/language/en-GB/en-GB.plg_system_sef.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_sef.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini b/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini
index 26579bdbf36d0..dd2f9af409b90 100644
--- a/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_sessiongc.ini b/administrator/language/en-GB/en-GB.plg_system_sessiongc.ini
index 6f8879115a291..d17445571a160 100644
--- a/administrator/language/en-GB/en-GB.plg_system_sessiongc.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_sessiongc.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_sessiongc.sys.ini b/administrator/language/en-GB/en-GB.plg_system_sessiongc.sys.ini
index 415d42e49971b..75e963cbfb89d 100644
--- a/administrator/language/en-GB/en-GB.plg_system_sessiongc.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_sessiongc.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_skipto.ini b/administrator/language/en-GB/en-GB.plg_system_skipto.ini
new file mode 100644
index 0000000000000..de56fdff67456
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_system_skipto.ini
@@ -0,0 +1,16 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_SKIPTO="System - Skip-To Navigation"
+PLG_SYSTEM_SKIPTO_CONTENT="Content"
+PLG_SYSTEM_SKIPTO_PAGE_OUTLINE="Page Outline"
+PLG_SYSTEM_SKIPTO_SECTION="Site Section"
+PLG_SYSTEM_SKIPTO_SECTION_ADMIN="Administrator (Backend)"
+PLG_SYSTEM_SKIPTO_SECTION_BOTH="Both"
+PLG_SYSTEM_SKIPTO_SECTION_SITE="Site (Frontend)"
+PLG_SYSTEM_SKIPTO_SKIP_TO="Skip To"
+PLG_SYSTEM_SKIPTO_SKIP_TO_AND_PAGE_OUTLINE="Skip To and Page Outline"
+PLG_SYSTEM_SKIPTO_SKIP_TO_KEYBOARD="Skip To Keyboard Navigation"
+PLG_SYSTEM_SKIPTO_XML_DESCRIPTION="The plugin creates a dropdown menu consisting of the links to the important places on a given web page. This makes it easier for keyboard and screen reader users to quickly jump to the desired location by simply choosing it from the list of options."
diff --git a/administrator/language/en-GB/en-GB.plg_system_skipto.sys.ini b/administrator/language/en-GB/en-GB.plg_system_skipto.sys.ini
new file mode 100644
index 0000000000000..e089881a56635
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_system_skipto.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_SKIPTO="System - Skip-To Navigation"
+PLG_SYSTEM_SKIPTO_XML_DESCRIPTION="The plugin creates a dropdown menu consisting of the links to the important places on a given web page. This makes it easier for keyboard and screen reader users to quickly jump to the desired location by simply choosing it from the list of options."
diff --git a/administrator/language/en-GB/en-GB.plg_system_stats.ini b/administrator/language/en-GB/en-GB.plg_system_stats.ini
index 37882eb01bed5..e2a79a7ec3ca1 100644
--- a/administrator/language/en-GB/en-GB.plg_system_stats.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_stats.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini b/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini
index f8d2facf76a62..d6d4a57307afb 100644
--- a/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini b/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini
index b7f997c4b7582..66c786266e14b 100644
--- a/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini b/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini
index 3af36485d5216..63a1fdf44d7c8 100644
--- a/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini b/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini
index cfff5e2fda2ba..d2124318e52cc 100644
--- a/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini
+++ b/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -31,5 +31,5 @@ PLG_TWOFACTORAUTH_TOTP_STEP2_RESET="If you want to change the key, disable the t
 PLG_TWOFACTORAUTH_TOTP_STEP2_TEXT="You will need to enter the following information to Google Authenticator or a compatible app."
 PLG_TWOFACTORAUTH_TOTP_STEP3_HEAD="Step 3 - Activate Two Factor Authentication"
 PLG_TWOFACTORAUTH_TOTP_STEP3_SECURITYCODE="Security Code"
-PLG_TWOFACTORAUTH_TOTP_STEP3_TEXT="To verify that everything is set up properly, please enter the security code displayed in Google Authenticator in the field below and select the button. If the code is correct, the Two Factor Authentication feature will be enabled."
+PLG_TWOFACTORAUTH_TOTP_STEP3_TEXT="To verify that everything is set up properly, please enter the security code displayed in Google Authenticator in the field below. Afterwards, please save your user profile. If the code is correct, the Two Factor Authentication feature will be enabled."
 PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION="Allows users on your site to use two factor authentication using <a href=\"https://en.wikipedia.org/wiki/Google_Authenticator\" target=\"_blank\">Google Authenticator</a> or other compatible time-based One Time Password generators such as <a href=\"https://freeotp.github.io/\" target=\"_blank\">FreeOTP</a>. To use two factor authentication please edit the user profile and enable two factor authentication."
diff --git a/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini b/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini
index d5060282bc847..88ed35ff70a52 100644
--- a/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini b/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini
index 5e51b12ac8077..ff8880aeb4c30 100644
--- a/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini
+++ b/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini b/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini
index 704efa7282e90..91fa771f2707a 100644
--- a/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini b/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini
index f23c6dfd90c03..416d0b0a8ef83 100644
--- a/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini
+++ b/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini b/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini
index 70896265ce5e1..14e97e826e273 100644
--- a/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_user_joomla.ini b/administrator/language/en-GB/en-GB.plg_user_joomla.ini
index c867be2ecc3ac..f667aeb1bc35c 100644
--- a/administrator/language/en-GB/en-GB.plg_user_joomla.ini
+++ b/administrator/language/en-GB/en-GB.plg_user_joomla.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini b/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini
index 6465f62ceaea9..a15b3d880f724 100644
--- a/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_user_profile.ini b/administrator/language/en-GB/en-GB.plg_user_profile.ini
index 3afa21db551ad..9fd6f73d91a02 100644
--- a/administrator/language/en-GB/en-GB.plg_user_profile.ini
+++ b/administrator/language/en-GB/en-GB.plg_user_profile.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -29,5 +29,5 @@ PLG_USER_PROFILE_FILL_FIELD_DESC_SITE="If required, please fill this field."
 PLG_USER_PROFILE_OPTION_AGREE="Agree"
 PLG_USER_PROFILE_SLIDER_LABEL="User Profile"
 ; Adapt the following string to the format you entered in the 'DATE_FORMAT_CALENDAR_DATE'
-PLG_USER_PROFILE_SPACER_DOB="The date of birth entered should use the format Year-Month-Day, ie 0000-00-00"
+PLG_USER_PROFILE_SPACER_DOB="The date of birth entered should use the format Year-Month-Day, eg 2019-01-27."
 PLG_USER_PROFILE_XML_DESCRIPTION="User Profile Plugin"
diff --git a/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini b/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini
index aaa3df4c7b881..eda479d2af495 100644
--- a/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_user_terms.ini b/administrator/language/en-GB/en-GB.plg_user_terms.ini
new file mode 100644
index 0000000000000..7ddb767a6fed8
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_user_terms.ini
@@ -0,0 +1,19 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_USER_TERMS="User - Terms and Conditions"
+PLG_USER_TERMS_FIELD_ARTICLE_DESC="Select the article from the list or create a new one."
+PLG_USER_TERMS_FIELD_ARTICLE_LABEL="Terms & Conditions Article"
+PLG_USER_TERMS_FIELD_DESC="Read the full terms and conditions."
+PLG_USER_TERMS_FIELD_ERROR="Agreement to the site's Terms & Conditions is required."
+PLG_USER_TERMS_FIELD_LABEL="Terms & Conditions"
+PLG_USER_TERMS_LABEL="Terms & Conditions"
+PLG_USER_TERMS_LOGGING_CONSENT_TO_TERMS="User <a href='{accountlink}'>{username}</a> consented to the terms and conditions during registration."
+PLG_USER_TERMS_NOTE_FIELD_DEFAULT="By signing up to this web site you accept the Terms & Conditions."
+PLG_USER_TERMS_NOTE_FIELD_DESC="A summary of the site's terms & conditions. If left blank then the default message will be used."
+PLG_USER_TERMS_NOTE_FIELD_LABEL="Short Terms & Conditions"
+PLG_USER_TERMS_OPTION_AGREE="I agree"
+PLG_USER_TERMS_SUBJECT="Privacy Policy"
+PLG_USER_TERMS_XML_DESCRIPTION="Basic plugin to request user's consent to the site's terms and conditions."
diff --git a/administrator/language/en-GB/en-GB.plg_user_terms.sys.ini b/administrator/language/en-GB/en-GB.plg_user_terms.sys.ini
new file mode 100644
index 0000000000000..334230cb3885f
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_user_terms.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_USER_TERMS="User - Terms and Conditions"
+PLG_USER_TERMS_XML_DESCRIPTION="Basic plugin to request user's consent to the site's terms and conditions."
\ No newline at end of file
diff --git a/administrator/language/en-GB/en-GB.plg_webservices_content.ini b/administrator/language/en-GB/en-GB.plg_webservices_content.ini
new file mode 100644
index 0000000000000..b1693507ed950
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_webservices_content.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_WEBSERVICES_CONTENT="Web Services - Content"
+PLG_WEBSERVICES_CONTENT_XML_DESCRIPTION="Used to add articles routes to the API for your website."
diff --git a/administrator/language/en-GB/en-GB.plg_webservices_content.sys.ini b/administrator/language/en-GB/en-GB.plg_webservices_content.sys.ini
new file mode 100644
index 0000000000000..b1693507ed950
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_webservices_content.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_WEBSERVICES_CONTENT="Web Services - Content"
+PLG_WEBSERVICES_CONTENT_XML_DESCRIPTION="Used to add articles routes to the API for your website."
diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml
index 3c0e391259ea5..ab0dd82bf2b93 100644
--- a/administrator/language/en-GB/en-GB.xml
+++ b/administrator/language/en-GB/en-GB.xml
@@ -2,11 +2,11 @@
 <metafile version="3.9" client="administrator">
 	<name>English (en-GB)</name>
 	<version>4.0.0</version>
-	<creationDate>December 2018</creationDate>
+	<creationDate>March 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description><![CDATA[en-GB administrator language]]></description>
 	<metadata>
diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
index b025673ca64ad..099e1c7eb0c85 100644
--- a/administrator/language/en-GB/install.xml
+++ b/administrator/language/en-GB/install.xml
@@ -3,11 +3,11 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>4.0.0</version>
-	<creationDate>December 2018</creationDate>
+	<creationDate>March 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>en-GB administrator language</description>
 	<files>
diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index 979f947820ec6..006df447eee13 100644
--- a/administrator/manifests/files/joomla.xml
+++ b/administrator/manifests/files/joomla.xml
@@ -4,10 +4,10 @@
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>4.0.0-alpha6</version>
-	<creationDate>December 2018</creationDate>
+	<version>4.0.0-alpha8-dev</version>
+	<creationDate>March 2019</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>
diff --git a/administrator/manifests/libraries/joomla.xml b/administrator/manifests/libraries/joomla.xml
index d7ffb0ea1bb88..536746c66b9e8 100644
--- a/administrator/manifests/libraries/joomla.xml
+++ b/administrator/manifests/libraries/joomla.xml
@@ -5,7 +5,7 @@
 	<version>13.1</version>
 	<description>LIB_JOOMLA_XML_DESCRIPTION</description>
 	<creationDate>2008</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
index 4f2f53e3f71cd..eff82aa029378 100644
--- a/administrator/manifests/packages/pkg_en-GB.xml
+++ b/administrator/manifests/packages/pkg_en-GB.xml
@@ -3,11 +3,11 @@
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
 	<version>4.0.0.1</version>
-	<creationDate>December 2018</creationDate>
+	<creationDate>March 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.</copyright>
 	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<url>https://github.com/joomla/joomla-cms</url>
 	<packager>Joomla! Project</packager>
@@ -15,8 +15,8 @@
 	<description><![CDATA[en-GB language pack]]></description>
 	<blockChildUninstall>true</blockChildUninstall>
 	<files>
-		<folder type="language" client="site" id="en-GB">site_en-GB</folder>
-		<folder type="language" client="administrator" id="en-GB">admin_en-GB</folder>
+		<folder type="language" client="site" id="en-GB">language/en-GB</folder>
+		<folder type="language" client="administrator" id="en-GB">administrator/language/en-GB</folder>
 	</files>
 	<updateservers>
 		<server type="collection" priority="1" name="Accredited Joomla! Translations">
diff --git a/administrator/modules/mod_custom/mod_custom.php b/administrator/modules/mod_custom/mod_custom.php
index 94f6572ef83e1..b3972867e8e6c 100644
--- a/administrator/modules/mod_custom/mod_custom.php
+++ b/administrator/modules/mod_custom/mod_custom.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_custom
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_custom/mod_custom.xml b/administrator/modules/mod_custom/mod_custom.xml
index ad2f6a8f80d6f..b089a0959b6d5 100644
--- a/administrator/modules/mod_custom/mod_custom.xml
+++ b/administrator/modules/mod_custom/mod_custom.xml
@@ -3,7 +3,7 @@
 	<name>mod_custom</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_custom/tmpl/default.php b/administrator/modules/mod_custom/tmpl/default.php
index e2d00403da102..18318125af1c7 100644
--- a/administrator/modules/mod_custom/tmpl/default.php
+++ b/administrator/modules/mod_custom/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_custom
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_feed/Helper/FeedHelper.php b/administrator/modules/mod_feed/Helper/FeedHelper.php
index ffb71aadbdad9..d24e38b7e36a6 100644
--- a/administrator/modules/mod_feed/Helper/FeedHelper.php
+++ b/administrator/modules/mod_feed/Helper/FeedHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_feed
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_feed/mod_feed.php b/administrator/modules/mod_feed/mod_feed.php
index b6d9f948de922..de0906b8b7e3f 100644
--- a/administrator/modules/mod_feed/mod_feed.php
+++ b/administrator/modules/mod_feed/mod_feed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_feed
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_feed/mod_feed.xml b/administrator/modules/mod_feed/mod_feed.xml
index 479a1a864410f..8865934ff70fa 100644
--- a/administrator/modules/mod_feed/mod_feed.xml
+++ b/administrator/modules/mod_feed/mod_feed.xml
@@ -3,7 +3,7 @@
 	<name>mod_feed</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
@@ -45,6 +45,17 @@
 					<option value="1">JYES</option>
 				</field>
 
+				<field
+					name="rssdate"
+					type="radio"
+					label="MOD_FEED_FIELD_DATE_LABEL"
+					class="switcher"
+					default="0"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
 				<field
 					name="rssdesc"
 					type="radio"
@@ -89,6 +100,18 @@
 					<option value="1">JSHOW</option>
 				</field>
 
+				<field
+					name="rssitemdate"
+					type="radio"
+					label="MOD_FEED_FIELD_ITEMDATE_LABEL"
+					class="switcher"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
 			</fieldset>
 			<fieldset name="advanced">
 				<field
diff --git a/administrator/modules/mod_feed/tmpl/default.php b/administrator/modules/mod_feed/tmpl/default.php
index 09d3777842bc9..24b89bb8f9789 100644
--- a/administrator/modules/mod_feed/tmpl/default.php
+++ b/administrator/modules/mod_feed/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_feed
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,8 +11,11 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\OutputFilter;
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
+HTMLHelper::_('bootstrap.framework');
+
 // Check if feed URL has been set
 if (empty ($rssurl))
 {
@@ -65,12 +68,18 @@
 		<div style="direction: <?php echo $rssrtl ? 'rtl' :'ltr'; ?>; text-align: <?php echo $rssrtl ? 'right' :'left'; ?> !important" class="feed<?php echo $moduleclass_sfx; ?>">
 		<?php
 
-		// Feed description
+		// Feed title
 		if (!is_null($feed->title) && $params->get('rsstitle', 1)) : ?>
 			<h2 class="<?php echo $direction; ?>">
 				<a href="<?php echo str_replace('&', '&amp;', $rssurl); ?>" target="_blank">
 				<?php echo $feed->title; ?></a>
 			</h2>
+		<?php endif;
+		// Feed date
+		if ($params->get('rssdate', 1)) : ?>
+			<h3>
+			<?php echo HTMLHelper::_('date', $feed->publishedDate, Text::_('DATE_FORMAT_LC3')); ?>
+			</h3>
 		<?php endif; ?>
 
 		<?php // Feed description ?>
@@ -105,6 +114,12 @@
 						<h5 class="feed-link"><?php echo trim($feed[$i]->title); ?></h5>
 					<?php endif; ?>
 
+					<?php if ($params->get('rssitemdate', 0)) : ?>
+						<div class="feed-item-date">
+							<?php echo HTMLHelper::_('date', $feed[$i]->publishedDate, Text::_('DATE_FORMAT_LC3')); ?>
+						</div>
+					<?php endif; ?>
+
 					<?php if ($params->get('rssitemdesc', 1) && $text !== '') : ?>
 						<div class="feed-item-description">
 						<?php
diff --git a/administrator/modules/mod_latest/Helper/ModLatestHelper.php b/administrator/modules/mod_latest/Helper/ModLatestHelper.php
index d9418be40a029..0d6447906edf4 100644
--- a/administrator/modules/mod_latest/Helper/ModLatestHelper.php
+++ b/administrator/modules/mod_latest/Helper/ModLatestHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_latest
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_latest/mod_latest.php b/administrator/modules/mod_latest/mod_latest.php
index c29a9fc733c95..e3582107f873f 100644
--- a/administrator/modules/mod_latest/mod_latest.php
+++ b/administrator/modules/mod_latest/mod_latest.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_latest
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_latest/mod_latest.xml b/administrator/modules/mod_latest/mod_latest.xml
index 231b44bc5fec9..c30bc58310b34 100644
--- a/administrator/modules/mod_latest/mod_latest.xml
+++ b/administrator/modules/mod_latest/mod_latest.xml
@@ -3,7 +3,7 @@
 	<name>mod_latest</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_latest/tmpl/default.php b/administrator/modules/mod_latest/tmpl/default.php
index 0d245d2f4c2a2..287d6175be8c3 100644
--- a/administrator/modules/mod_latest/tmpl/default.php
+++ b/administrator/modules/mod_latest/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_latest
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,6 +12,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
+HTMLHelper::_('bootstrap.framework');
 ?>
 <table class="table" id="<?php echo str_replace(' ', '', $module->title) . $module->id; ?>">
 	<caption class="sr-only"><?php echo $module->title; ?></caption>
@@ -59,4 +60,4 @@
 		</tr>
 		<?php endif; ?>
 	</tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/administrator/modules/mod_latestactions/helper.php b/administrator/modules/mod_latestactions/helper.php
new file mode 100644
index 0000000000000..8f2fce6a095eb
--- /dev/null
+++ b/administrator/modules/mod_latestactions/helper.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_latestactions
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_latestactions
+ *
+ * @since  3.9.0
+ */
+abstract class ModLatestActionsHelper
+{
+	/**
+	 * Get a list of articles.
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  The module parameters.
+	 *
+	 * @return  mixed  An array of action logs, or false on error.
+	 */
+	public static function getList(&$params)
+	{
+		JLoader::register('ActionlogsModelActionlogs', JPATH_ADMINISTRATOR . '/components/com_actionlogs/models/actionlogs.php');
+		JLoader::register('ActionlogsHelper', JPATH_ADMINISTRATOR . '/components/com_actionlogs/helpers/actionlogs.php');
+
+		/* @var ActionlogsModelActionlogs $model */
+		$model = JModelLegacy::getInstance('Actionlogs', 'ActionlogsModel', array('ignore_request' => true));
+
+		// Set the Start and Limit
+		$model->setState('list.start', 0);
+		$model->setState('list.limit', $params->get('count', 5));
+		$model->setState('list.ordering', 'a.id');
+		$model->setState('list.direction', 'DESC');
+
+		$rows = $model->getItems();
+
+		// Load all actionlog plugins language files
+		ActionlogsHelper::loadActionLogPluginsLanguage();
+
+		foreach ($rows as $row)
+		{
+			$row->message = ActionlogsHelper::getHumanReadableLogMessage($row);
+		}
+
+		return $rows;
+	}
+}
diff --git a/administrator/modules/mod_latestactions/mod_latestactions.php b/administrator/modules/mod_latestactions/mod_latestactions.php
new file mode 100644
index 0000000000000..4a125d42cd665
--- /dev/null
+++ b/administrator/modules/mod_latestactions/mod_latestactions.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_latestactions
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Only super user can view this data
+if (!JFactory::getUser()->authorise('core.admin'))
+{
+	return;
+}
+
+// Include dependencies.
+JLoader::register('ModLatestActionsHelper', __DIR__ . '/helper.php');
+
+$list = ModLatestActionsHelper::getList($params);
+
+if ($params->get('automatic_title', 0))
+{
+	$module->title = ModLatestHelper::getTitle($params);
+}
+
+require JModuleHelper::getLayoutPath('mod_latestactions', $params->get('layout', 'default'));
diff --git a/administrator/modules/mod_latestactions/mod_latestactions.xml b/administrator/modules/mod_latestactions/mod_latestactions.xml
new file mode 100644
index 0000000000000..708aee6b32aa5
--- /dev/null
+++ b/administrator/modules/mod_latestactions/mod_latestactions.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="administrator" method="upgrade">
+	<name>mod_latestactions</name>
+	<author>Joomla! Project</author>
+	<creationDate>May 2018</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>MOD_LATESTACTIONS_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_latestactions">mod_latestactions.php</filename>
+		<filename>helper.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_latestactions.ini</language>
+		<language tag="en-GB">en-GB.mod_latestactions.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LATESTACTIONS" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="count"
+					type="number"
+					label="MOD_LATESTACTIONS_FIELD_COUNT_LABEL"
+					description="MOD_LATESTACTIONS_FIELD_COUNT_DESC"
+					default="5"
+					filter="integer"
+				/>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="automatic_title"
+					type="radio"
+					label="COM_MODULES_FIELD_AUTOMATIC_TITLE_LABEL"
+					description="COM_MODULES_FIELD_AUTOMATIC_TITLE_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+
+				<field
+					name="cachemode"
+					type="hidden"
+					default="static"
+					>
+					<option value="static"></option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/administrator/modules/mod_latestactions/tmpl/default.php b/administrator/modules/mod_latestactions/tmpl/default.php
new file mode 100644
index 0000000000000..31e684ac936d1
--- /dev/null
+++ b/administrator/modules/mod_latestactions/tmpl/default.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_latestactions
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+?>
+<div class="row-striped">
+	<?php if (count($list)) : ?>
+		<?php foreach ($list as $i => $item) : ?>
+			<div class="row-fluid">
+				<div class="span8 truncate">
+					<?php echo $item->message; ?>
+				</div>
+				<div class="span4">
+					<div class="small pull-right hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JGLOBAL_FIELD_CREATED_LABEL'); ?>">
+						<span class="icon-calendar" aria-hidden="true"></span> <?php echo JHtml::_('date', $item->log_date, JText::_('DATE_FORMAT_LC5')); ?>
+					</div>
+				</div>
+			</div>
+		<?php endforeach; ?>
+	<?php else : ?>
+		<div class="row-fluid">
+			<div class="span12">
+				<div class="alert"><?php echo JText::_('MOD_LATEST_ACTIONS_NO_MATCHING_RESULTS');?></div>
+			</div>
+		</div>
+	<?php endif; ?>
+</div>
diff --git a/administrator/modules/mod_logged/Helper/LoggedHelper.php b/administrator/modules/mod_logged/Helper/LoggedHelper.php
index 82aca278a40e5..1aebd21b41b41 100644
--- a/administrator/modules/mod_logged/Helper/LoggedHelper.php
+++ b/administrator/modules/mod_logged/Helper/LoggedHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_logged
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_logged/mod_logged.php b/administrator/modules/mod_logged/mod_logged.php
index 0e5662e470b0b..28074c393866b 100644
--- a/administrator/modules/mod_logged/mod_logged.php
+++ b/administrator/modules/mod_logged/mod_logged.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_logged
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_logged/mod_logged.xml b/administrator/modules/mod_logged/mod_logged.xml
index 277046e155fc4..1e01887fc97bb 100644
--- a/administrator/modules/mod_logged/mod_logged.xml
+++ b/administrator/modules/mod_logged/mod_logged.xml
@@ -3,7 +3,7 @@
 	<name>mod_logged</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_logged/tmpl/default.php b/administrator/modules/mod_logged/tmpl/default.php
index c7eb1276f44f6..ff61cafa1658a 100644
--- a/administrator/modules/mod_logged/tmpl/default.php
+++ b/administrator/modules/mod_logged/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_logged
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,6 +12,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
+HTMLHelper::_('bootstrap.framework');
 ?>
 <table class="table" id="<?php echo str_replace(' ', '', $module->title) . $module->id; ?>">
 	<caption class="sr-only"><?php echo $module->title; ?></caption>
diff --git a/administrator/modules/mod_logged/tmpl/disabled.php b/administrator/modules/mod_logged/tmpl/disabled.php
index 276c8630fdee1..e89e16ea1d919 100644
--- a/administrator/modules/mod_logged/tmpl/disabled.php
+++ b/administrator/modules/mod_logged/tmpl/disabled.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_logged
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_login/Helper/LoginHelper.php b/administrator/modules/mod_login/Helper/LoginHelper.php
index 849b658c2ef43..9c80575593e4f 100644
--- a/administrator/modules/mod_login/Helper/LoginHelper.php
+++ b/administrator/modules/mod_login/Helper/LoginHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_login
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_login/mod_login.php b/administrator/modules/mod_login/mod_login.php
index ec2a50635d551..53445e1b0f54e 100644
--- a/administrator/modules/mod_login/mod_login.php
+++ b/administrator/modules/mod_login/mod_login.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_login
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_login/mod_login.xml b/administrator/modules/mod_login/mod_login.xml
index 559aaddbc285b..4353e6a489c41 100644
--- a/administrator/modules/mod_login/mod_login.xml
+++ b/administrator/modules/mod_login/mod_login.xml
@@ -3,7 +3,7 @@
 	<name>mod_login</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_login/tmpl/default.php b/administrator/modules/mod_login/tmpl/default.php
index 77d34759021ea..7f1c13b9a1f7b 100644
--- a/administrator/modules/mod_login/tmpl/default.php
+++ b/administrator/modules/mod_login/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_login
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_menu/Helper/MenuHelper.php b/administrator/modules/mod_menu/Helper/MenuHelper.php
deleted file mode 100644
index 16632e2b9ad2a..0000000000000
--- a/administrator/modules/mod_menu/Helper/MenuHelper.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  mod_menu
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Module\Menu\Administrator\Menu;
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-
-/**
- * Helper for mod_menu
- *
- * @since  1.5
- */
-abstract class MenuHelper
-{
-	/**
-	 * Get a list of the available menus.
-	 *
-	 * @return  array  An array of the available menus (from the menu types table).
-	 *
-	 * @since   1.6
-	 */
-	public static function getItems()
-	{
-		$db = Factory::getDbo();
-
-		// Search for home menu and language if exists
-		$subQuery = $db->getQuery(true)
-			->select('b.menutype, b.home, b.language, l.image, l.sef, l.title_native')
-			->from('#__menu AS b')
-			->leftJoin('#__languages AS l ON l.lang_code = b.language')
-			->where('b.home != 0')
-			->where('(b.client_id = 0 OR b.client_id IS NULL)');
-
-		// Get all menu types with optional home menu and language
-		$query = $db->getQuery(true)
-			->select('a.id, a.asset_id, a.menutype, a.title, a.description, a.client_id')
-			->select('c.home, c.language, c.image, c.sef, c.title_native')
-			->from('#__menu_types AS a')
-			->leftJoin('(' . (string) $subQuery . ') c ON c.menutype = a.menutype')
-			->order('a.id');
-
-		$db->setQuery($query);
-
-		try
-		{
-			$result = $db->loadObjectList();
-		}
-		catch (\RuntimeException $e)
-		{
-			$result = array();
-			Factory::getApplication()->enqueueMessage(Text::sprintf('JERROR_LOADING_MENUS', $e->getMessage()), 'error');
-		}
-
-		return $result;
-	}
-}
diff --git a/administrator/modules/mod_menu/Menu/CssMenu.php b/administrator/modules/mod_menu/Menu/CssMenu.php
index 9054026f1c5fa..605e5bcb9e081 100644
--- a/administrator/modules/mod_menu/Menu/CssMenu.php
+++ b/administrator/modules/mod_menu/Menu/CssMenu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,9 +14,7 @@
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Menu\MenuHelper;
-use Joomla\CMS\Menu\Node;
-use Joomla\CMS\Menu\Tree;
+use Joomla\CMS\Menu\MenuItem;
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
@@ -31,13 +29,22 @@
 class CssMenu
 {
 	/**
-	 * The Menu tree object
+	 * The root of the menu
 	 *
-	 * @var    Tree
+	 * @var    MenuItem
 	 *
-	 * @since  3.8.0
+	 * @since  4.0.0
+	 */
+	protected $root;
+
+	/**
+	 * An array of MenuItem nodes
+	 *
+	 * @var    MenuItem[]
+	 *
+	 * @since  4.0.0
 	 */
-	protected $tree;
+	protected $nodes = [];
 
 	/**
 	 * The module options
@@ -67,32 +74,25 @@ class CssMenu
 	protected $application;
 
 	/**
-	 * CssMenu constructor.
+	 * A counter for unique IDs
 	 *
-	 * @param   CMSApplication  $application  The application
+	 * @var   int
 	 *
-	 * @since 4.0.0
+	 * @since  4.0.0
 	 */
-	public function __construct(CMSApplication $application)
-	{
-		$this->application = $application;
-	}
+	protected $counter = 0;
 
 	/**
-	 * Get the current menu tree
+	 * CssMenu constructor.
 	 *
-	 * @return  Tree
+	 * @param   CMSApplication  $application  The application
 	 *
-	 * @since   3.8.0
+	 * @since 4.0.0
 	 */
-	public function getTree()
+	public function __construct(CMSApplication $application)
 	{
-		if (!$this->tree)
-		{
-			$this->tree = new Tree;
-		}
-
-		return $this->tree;
+		$this->application = $application;
+		$this->root = new MenuItem;
 	}
 
 	/**
@@ -101,13 +101,12 @@ public function getTree()
 	 * @param   Registry  $params   Menu configuration parameters
 	 * @param   bool      $enabled  Whether the menu should be enabled or disabled
 	 *
-	 * @return  void
+	 * @return  MenuItem  Root node of the menu tree
 	 *
 	 * @since   3.7.0
 	 */
 	public function load($params, $enabled)
 	{
-		$this->tree    = $this->getTree();
 		$this->params  = $params;
 		$this->enabled = $enabled;
 		$menutype      = $this->params->get('menutype', '*');
@@ -115,64 +114,64 @@ public function load($params, $enabled)
 		if ($menutype === '*')
 		{
 			$name   = $this->params->get('preset', 'joomla');
-			$levels = MenuHelper::loadPreset($name);
+			$this->root = MenusHelper::loadPreset($name);
 		}
 		else
 		{
-			$items = MenusHelper::getMenuItems($menutype, true);
+			$this->root = MenusHelper::getMenuItems($menutype, true);
 
-			if ($this->enabled && $this->params->get('check', 1))
+			// Can we access everything important with this menu? Create a recovery menu!
+			if ($this->enabled
+				&& $this->params->get('check', 1)
+				&& $this->check($this->root, $this->params))
 			{
-				if ($this->check($items, $this->params))
-				{
-					$this->params->set('recovery', true);
+				$this->params->set('recovery', true);
 
-					// In recovery mode, load the preset inside a special root node.
-					$this->tree->addChild(new Node\Heading('MOD_MENU_RECOVERY_MENU_ROOT'), true);
+				// In recovery mode, load the preset inside a special root node.
+				$this->root = new MenuItem(['level' => 0]);
+				$heading = new MenuItem(['title' => 'MOD_MENU_RECOVERY_MENU_ROOT', 'type' => 'heading']);
+				$this->root->addChild($heading);
 
-					$levels = MenuHelper::loadPreset('joomla');
-					$levels = $this->preprocess($levels);
+				MenusHelper::loadPreset('joomla', true, $heading);
 
-					$this->populateTree($levels);
+				$this->preprocess($this->root);
 
-					$this->tree->addChild(new Node\Separator);
+				$this->root->addChild(new MenuItem(['type' => 'separator']));
 
-					// Add link to exit recovery mode
-					$uri = clone Uri::getInstance();
-					$uri->setVar('recover_menu', 0);
+				// Add link to exit recovery mode
+				$uri = clone Uri::getInstance();
+				$uri->setVar('recover_menu', 0);
 
-					$this->tree->addChild(new Node\Url('MOD_MENU_RECOVERY_EXIT', $uri->toString()));
+				$this->root->addChild(new MenuItem(['title' => 'MOD_MENU_RECOVERY_EXIT', 'type' => 'url', 'url' => $uri->toString()]));
 
-					$this->tree->getParent();
-				}
+				return $this->root;
 			}
-
-			$levels = MenuHelper::createLevels($items);
 		}
 
-		$levels = $this->preprocess($levels);
+		$this->preprocess($this->root);
 
-		$this->populateTree($levels);
+		return $this->root;
 	}
 
 	/**
 	 * Method to render a given level of a menu using provided layout file
 	 *
-	 * @param   string  $layoutFile  The layout file to be used to render
+	 * @param   string    $layoutFile  The layout file to be used to render
+	 * @param   MenuItem  $node        Node to render the children of
 	 *
 	 * @return  void
 	 *
 	 * @since   3.8.0
 	 */
-	public function renderSubmenu($layoutFile)
+	public function renderSubmenu($layoutFile, $node)
 	{
 		if (is_file($layoutFile))
 		{
-			$children = $this->tree->getCurrent()->getChildren();
+			$children = $node->getChildren();
 
-			foreach ($children as $child)
+			foreach ($children as $current)
 			{
-				$this->tree->setCurrent($child);
+				$current->level = $node->level + 1;
 
 				// This sets the scope to this object for the layout file and also isolates other `include`s
 				require $layoutFile;
@@ -183,14 +182,14 @@ public function renderSubmenu($layoutFile)
 	/**
 	 * Check the flat list of menu items for important links
 	 *
-	 * @param   array     $items   The menu items array
+	 * @param   MenuItem  $node    The menu items array
 	 * @param   Registry  $params  Module options
 	 *
 	 * @return  boolean  Whether to show recovery menu
 	 *
 	 * @since   3.8.0
 	 */
-	protected function check($items, Registry $params)
+	protected function check($node, Registry $params)
 	{
 		$me          = $this->application->getIdentity();
 		$authMenus   = $me->authorise('core.manage', 'com_menus');
@@ -201,6 +200,7 @@ protected function check($items, Registry $params)
 			return false;
 		}
 
+		$items      = $node->getChildren(true);
 		$types      = ArrayHelper::getColumn($items, 'type');
 		$elements   = ArrayHelper::getColumn($items, 'element');
 		$rMenu      = $authMenus && !in_array('com_menus', $elements);
@@ -253,29 +253,34 @@ protected function check($items, Registry $params)
 	/**
 	 * Filter and perform other preparatory tasks for loaded menu items based on access rights and module configurations for display
 	 *
-	 * @param   \stdClass[]  $items  The levelled array of menu item objects
+	 * @param   MenuItem  $parent  A menu item to process
 	 *
 	 * @return  array
 	 *
 	 * @since   3.8.0
 	 */
-	protected function preprocess($items)
+	protected function preprocess($parent)
 	{
-		$result     = array();
 		$user       = $this->application->getIdentity();
 		$language   = $this->application->getLanguage();
 
 		$noSeparator = true;
+		$children = $parent->getChildren();
+
+		/**
+		 * Trigger onPreprocessMenuItems for the current level of backend menu items.
+		 * $children is an array of MenuItem objects. A plugin can traverse the whole tree,
+		 * but new nodes will only be run through this method if their parents have not been processed yet.
+		 */
+		$this->application->triggerEvent('onPreprocessMenuItems', array('com_menus.administrator.module', $children, $this->params, $this->enabled));
 
-		// Call preprocess for the menu items on plugins.
-		// Plugins should normally process the current level only unless their logic needs deep levels too.
-		$this->application->triggerEvent('onPreprocessMenuItems', array('com_menus.administrator.module', &$items, $this->params, $this->enabled));
 
-		foreach ($items as $i => &$item)
+		foreach ($children as $item)
 		{
 			// Exclude item with menu item option set to exclude from menu modules
-			if ($item->params->get('menu_show', 1) == 0)
+			if ($item->getParams()->get('menu_show', 1) == 0)
 			{
+				$parent->removeChild($item);
 				continue;
 			}
 
@@ -285,6 +290,7 @@ protected function preprocess($items)
 			// Whether this scope can be displayed. Applies only to preset items. Db driven items should use un/published state.
 			if (($item->scope === 'help' && $this->params->get('showhelp', 1) == 0) || ($item->scope === 'edit' && !$this->params->get('shownew', 1)))
 			{
+				$parent->removeChild($item);
 				continue;
 			}
 
@@ -305,12 +311,14 @@ protected function preprocess($items)
 			// Exclude item if is not enabled
 			if ($item->element && !ComponentHelper::isEnabled($item->element))
 			{
+				$parent->removeChild($item);
 				continue;
 			}
 
 			// Exclude Mass Mail if disabled in global configuration
 			if ($item->scope === 'massmail' && ($this->application->get('massmailoff', 0) == 1))
 			{
+				$parent->removeChild($item);
 				continue;
 			}
 
@@ -336,6 +344,7 @@ protected function preprocess($items)
 
 				if (!$createFields)
 				{
+					$parent->removeChild($item);
 					continue;
 				}
 
@@ -355,13 +364,21 @@ protected function preprocess($items)
 
 				if (!$workflow)
 				{
+					$parent->removeChild($item);
 					continue;
 				}
 
 				list($assetName) = isset($query['extension']) ? explode('.', $query['extension'], 2) : array('com_workflow');
 			}
-			elseif ($item->element === 'com_config' && !$user->authorise('core.admin'))
+			// Special case for components which only allow super user access
+			elseif (in_array($item->element, array('com_config', 'com_privacy', 'com_actionlogs'), true) && !$user->authorise('core.admin'))
 			{
+				$parent->removeChild($item);
+				continue;
+			}
+			elseif ($item->element === 'com_joomlaupdate' && !$user->authorise('core.admin'))
+			{
+				$parent->removeChild($item);
 				continue;
 			}
 			elseif ($item->element === 'com_admin')
@@ -370,23 +387,29 @@ protected function preprocess($items)
 
 				if (isset($query['view']) && $query['view'] === 'sysinfo' && !$user->authorise('core.admin'))
 				{
+					$parent->removeChild($item);
 					continue;
 				}
 			}
 
 			if ($assetName && !$user->authorise(($item->scope === 'edit') ? 'core.create' : 'core.manage', $assetName))
 			{
+				$parent->removeChild($item);
 				continue;
 			}
 
 			// Exclude if link is invalid
 			if (!in_array($item->type, array('separator', 'heading', 'container')) && trim($item->link) === '')
 			{
+				$parent->removeChild($item);
 				continue;
 			}
 
 			// Process any children if exists
-			$item->submenu = $this->preprocess($item->submenu);
+			if ($item->hasChildren())
+			{
+				$this->preprocess($item);
+			}
 
 			// Populate automatic children for container items
 			if ($item->type === 'container')
@@ -394,20 +417,32 @@ protected function preprocess($items)
 				$exclude    = (array) $item->params->get('hideitems') ?: array();
 				$components = MenusHelper::getMenuItems('main', false, $exclude);
 
-				$item->components = MenuHelper::createLevels($components);
-				$item->components = $this->preprocess($item->components);
-				$item->components = ArrayHelper::sortObjects($item->components, 'text', 1, false, true);
+				// We are adding the nodes first to preprocess them, then sort them and add them again.
+				foreach ($components->getChildren() as $c)
+				{
+					$item->addChild($c);
+				}
+
+				$this->preprocess($item);
+				$children = ArrayHelper::sortObjects($item->getChildren(), 'text', 1, false, true);
+
+				foreach ($children as $c)
+				{
+					$item->addChild($c);
+				}
 			}
 
 			// Exclude if there are no child items under heading or container
-			if (in_array($item->type, array('heading', 'container')) && empty($item->submenu) && empty($item->components))
+			if (in_array($item->type, array('heading', 'container')) && !$item->hasChildren() && empty($item->components))
 			{
+				$parent->removeChild($item);
 				continue;
 			}
 
 			// Exclude help menu item if set such in mod_menu
 			if ($this->params->get('showhelp', 1) == 0 && $item->link == 'index.php?option=com_cpanel&view=help')
 			{
+				$parent->removeChild($item);
 				continue;
 			}
 
@@ -416,6 +451,7 @@ protected function preprocess($items)
 			{
 				if ($noSeparator)
 				{
+					$parent->removeChild($item);
 					continue;
 				}
 
@@ -439,91 +475,70 @@ protected function preprocess($items)
 			}
 
 			$item->text = Text::_($item->title);
-
-			$result[$i] = $item;
 		}
 
 		// If last one was a separator remove it too.
-		if ($noSeparator && isset($i))
+		$last = end($parent->getChildren());
+
+		if ($last && $last->type === 'separator' && $last->getSibling(false) && $last->getSibling(false)->type === 'separator')
 		{
-			unset($result[$i]);
+			$parent->removeChild($last);
 		}
-
-		return $result;
 	}
 
 	/**
-	 * Load the menu items from a hierarchical list of items into the menu tree
+	 * Method to get the CSS class name for an icon identifier or create one if
+	 * a custom image path is passed as the identifier
 	 *
-	 * @param   \stdClass[]  $levels  Menu items as a hierarchical list format
+	 * @param   MenuItem  $node  Node to get icon data from
 	 *
-	 * @return  void
+	 * @return  string	CSS class name
 	 *
 	 * @since   3.8.0
 	 */
-	protected function populateTree($levels)
+	public function getIconClass($node)
 	{
-		foreach ($levels as $item)
+		$identifier = $node->class;
+
+		// Top level is special
+		if (trim($identifier) == '')
 		{
-			$class = $this->enabled ? $item->class : 'disabled';
+			return null;
+		}
 
-			if ($item->type === 'separator')
-			{
-				$this->tree->addChild(new Node\Separator($item->title));
-			}
-			elseif ($item->type === 'heading')
+		// We were passed a class name
+		if (substr($identifier, 0, 6) == 'class:')
+		{
+			$class = substr($identifier, 6);
+		}
+		// We were passed background icon url. Build the CSS class for the icon
+		else
+		{
+			if ($identifier == null)
 			{
-				// We already excluded heading type menu item with no children.
-				$this->tree->addChild(new Node\Heading($item->title, $class, null, $item->icon), $this->enabled);
-
-				if ($this->enabled)
-				{
-					$this->populateTree($item->submenu);
-					$this->tree->getParent();
-				}
+				return null;
 			}
-			elseif ($item->type === 'url')
-			{
-				$cNode = new Node\Url($item->title, $item->link, $item->browserNav, $class, null, $item->icon);
-				$this->tree->addChild($cNode, $this->enabled);
 
-				if ($this->enabled)
-				{
-					$this->populateTree($item->submenu);
-					$this->tree->getParent();
-				}
-			}
-			elseif ($item->type === 'component')
-			{
-				$cNode = new Node\Component($item->title, $item->element, $item->link, $item->browserNav, $class, null, $item->icon);
-				$this->tree->addChild($cNode, $this->enabled);
-
-				if ($this->enabled)
-				{
-					$this->populateTree($item->submenu);
-					$this->tree->getParent();
-				}
-			}
-			elseif ($item->type === 'container')
-			{
-				// We already excluded container type menu item with no children.
-				$this->tree->addChild(new Node\Container($item->title, $item->class, null, $item->icon), $this->enabled);
+			$class = preg_replace('#\.[^.]*$#', '', basename($identifier));
+			$class = preg_replace('#\.\.[^A-Za-z0-9\.\_\- ]#', '', $class);
+		}
 
-				if ($this->enabled)
-				{
-					$this->populateTree($item->submenu);
+		$html = 'fa-fw fa fa-' . $class;
 
-					// Add a separator between dynamic menu items and components menu items
-					if (count($item->submenu) && count($item->components))
-					{
-						$this->tree->addChild(new Node\Separator);
-					}
+		return $html;
+	}
 
-					$this->populateTree($item->components);
+	/**
+	 * Create unique identifier
+	 *
+	 * @return  string
+	 *
+	 * @since   4.0.0
+	 */
+	public function getCounter()
+	{
+		$this->counter++;
 
-					$this->tree->getParent();
-				}
-			}
-		}
+		return $this->counter;
 	}
 }
diff --git a/administrator/modules/mod_menu/Menu/MenuNode.php b/administrator/modules/mod_menu/Menu/MenuNode.php
deleted file mode 100644
index 8ee4c2f9b852a..0000000000000
--- a/administrator/modules/mod_menu/Menu/MenuNode.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  mod_menu
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Module\Menu\Administrator\Menu;
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Uri\Uri;
-use Joomla\Filter\OutputFilter;
-
-/**
- * A Node for JAdminCssMenu
- *
- * @see    JAdminCssMenu
- * @since  1.5
- */
-class MenuNode
-{
-	/**
-	 * Node Title
-	 *
-	 * @var  string
-	 */
-	public $title = null;
-
-	/**
-	 * Node Id
-	 *
-	 * @var  string
-	 */
-	public $id = null;
-
-	/**
-	 * Node Link
-	 *
-	 * @var  string
-	 */
-	public $link = null;
-
-	/**
-	 * Link Target
-	 *
-	 * @var  string
-	 */
-	public $target = null;
-
-	/**
-	 * CSS Class for node
-	 *
-	 * @var  string
-	 */
-	public $class = null;
-
-	/**
-	 * Active Node?
-	 *
-	 * @var  boolean
-	 */
-	public $active = false;
-
-	/**
-	 * Parent node
-	 *
-	 * @var  MenuNode
-	 */
-	protected $_parent = null;
-
-	/**
-	 * Array of Children
-	 *
-	 * @var  array
-	 */
-	protected $_children = array();
-
-	/**
-	 * Constructor for the class.
-	 *
-	 * @param   string   $title      The title of the node
-	 * @param   string   $link       The node link
-	 * @param   string   $class      The CSS class for the node
-	 * @param   boolean  $active     True if node is active, false otherwise
-	 * @param   string   $target     The link target
-	 * @param   string   $titleicon  The title icon for the node
-	 */
-	public function __construct($title, $link = null, $class = null, $active = false, $target = null, $titleicon = null)
-	{
-		$this->title  = $titleicon ? $title . $titleicon : $title;
-		$this->link   = OutputFilter::ampReplace($link);
-		$this->class  = $class;
-		$this->active = $active;
-
-		$this->id = null;
-
-		if (!empty($link) && $link !== '#')
-		{
-			$uri    = new Uri($link);
-			$params = $uri->getQuery(true);
-			$parts  = array();
-
-			foreach ($params as $value)
-			{
-				$parts[] = str_replace(array('.', '_'), '-', $value);
-			}
-
-			$this->id = implode('-', $parts);
-		}
-
-		$this->target = $target;
-	}
-
-	/**
-	 * Add child to this node
-	 *
-	 * If the child already has a parent, the link is unset
-	 *
-	 * @param   MenuNode  &$child  The child to be added
-	 *
-	 * @return  void
-	 */
-	public function addChild(MenuNode &$child)
-	{
-		$child->setParent($this);
-	}
-
-	/**
-	 * Set the parent of a this node
-	 *
-	 * If the node already has a parent, the link is unset
-	 *
-	 * @param   JMenuNode  &$parent  The JMenuNode for parent to be set or null
-	 *
-	 * @return  void
-	 */
-	public function setParent(MenuNode &$parent = null)
-	{
-		$hash = spl_object_hash($this);
-
-		if (!is_null($this->_parent))
-		{
-			unset($this->_parent->_children[$hash]);
-		}
-
-		if (!is_null($parent))
-		{
-			$parent->_children[$hash] = &$this;
-		}
-
-		$this->_parent = &$parent;
-	}
-
-	/**
-	 * Get the children of this node
-	 *
-	 * @return  array  The children
-	 */
-	public function &getChildren()
-	{
-		return $this->_children;
-	}
-
-	/**
-	 * Get the parent of this node
-	 *
-	 * @return  mixed  JMenuNode object with the parent or null for no parent
-	 */
-	public function &getParent()
-	{
-		return $this->_parent;
-	}
-
-	/**
-	 * Test if this node has children
-	 *
-	 * @return  boolean  True if there are children
-	 */
-	public function hasChildren()
-	{
-		return (bool) count($this->_children);
-	}
-
-	/**
-	 * Test if this node has a parent
-	 *
-	 * @return  boolean  True if there is a parent
-	 */
-	public function hasParent()
-	{
-		return $this->getParent() != null;
-	}
-}
diff --git a/administrator/modules/mod_menu/mod_menu.php b/administrator/modules/mod_menu/mod_menu.php
index 0cff6213d70a9..5d866761262f5 100644
--- a/administrator/modules/mod_menu/mod_menu.php
+++ b/administrator/modules/mod_menu/mod_menu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,8 @@
 $enabled = !$app->input->getBool('hidemainmenu');
 
 $menu = new CssMenu($app);
-$menu->load($params, $enabled);
+$root = $menu->load($params, $enabled);
+$root->level = 0;
 
 // Render the module layout
 require ModuleHelper::getLayoutPath('mod_menu', $params->get('layout', 'default'));
diff --git a/administrator/modules/mod_menu/mod_menu.xml b/administrator/modules/mod_menu/mod_menu.xml
index 7dad8f1a8d1f1..0375abe880fed 100644
--- a/administrator/modules/mod_menu/mod_menu.xml
+++ b/administrator/modules/mod_menu/mod_menu.xml
@@ -3,7 +3,7 @@
 	<name>mod_menu</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_menu/tmpl/default.php b/administrator/modules/mod_menu/tmpl/default.php
index 36fc41cec214f..6bffa5ef7daaf 100644
--- a/administrator/modules/mod_menu/tmpl/default.php
+++ b/administrator/modules/mod_menu/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -21,9 +21,6 @@
 $class     = $enabled ? 'nav flex-column main-nav ' . $direction : 'nav flex-column main-nav disabled ' . $direction;
 
 // Recurse through children of root node if they exist
-$menuTree = $menu->getTree();
-$root     = $menuTree->reset();
-
 if ($root->hasChildren())
 {
 	echo '<nav class="main-nav-container" aria-label="' . Text::_('MOD_MENU_ARIA_MAIN_MENU') . '">';
@@ -36,12 +33,7 @@
 	echo '</li>';
 
 	// WARNING: Do not use direct 'include' or 'require' as it is important to isolate the scope for each call
-	$menu->renderSubmenu(ModuleHelper::getLayoutPath('mod_menu', 'default_submenu'));
+	$menu->renderSubmenu(ModuleHelper::getLayoutPath('mod_menu', 'default_submenu'), $root);
 
 	echo "</ul></nav>\n";
-
-	if ($css = $menuTree->getCss())
-	{
-		$doc->addStyleDeclaration(implode("\n", $css));
-	}
 }
diff --git a/administrator/modules/mod_menu/tmpl/default_submenu.php b/administrator/modules/mod_menu/tmpl/default_submenu.php
index e9496e370cdf6..0c8ecff1f51b3 100644
--- a/administrator/modules/mod_menu/tmpl/default_submenu.php
+++ b/administrator/modules/mod_menu/tmpl/default_submenu.php
@@ -3,14 +3,13 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Menu\Node\Separator;
 
 /**
  * =========================================================================================================
@@ -19,7 +18,6 @@
  * =========================================================================================================
  */
 /** @var  \Joomla\Module\Menu\Administrator\Menu\CssMenu  $this */
-$current = $this->tree->getCurrent();
 $class   = '';
 
 // Build the CSS class suffix
@@ -27,15 +25,15 @@
 {
 	$class = ' class="disabled"';
 }
-elseif ($current instanceOf Separator)
+elseif ($current->type == 'separator')
 {
-	$class = $current->get('title') ? ' class="menuitem-group"' : ' class="divider"';
+	$class = $current->title ? ' class="menuitem-group"' : ' class="divider"';
 }
 elseif ($current->hasChildren())
 {
 	$class = ' class="dropdown-submenu"';
 
-	if ($current->getLevel() == 1)
+	if ($current->level == 1)
 	{
 		$class = ' class="parent"';
 	}
@@ -46,7 +44,7 @@
 }
 
 // Set the correct aria role and print the item
-if ($current instanceOf Separator)
+if ($current->type == 'separator')
 {
 	echo '<li' . $class . ' role="presentation">';
 }
@@ -64,7 +62,7 @@
 {
 	$linkClass[] = 'has-arrow';
 
-	if ($current->getLevel() > 2)
+	if ($current->level > 2)
 	{
 		$dataToggle  = ' data-toggle="dropdown"';
 	}
@@ -81,22 +79,22 @@
 $link      = $current->get('link');
 
 // Get the menu icon
-$icon      = $this->tree->getIconClass();
-$iconClass = ($icon != '' && $current->getLevel() == 1) ? '<span class="' . $icon . '" aria-hidden="true"></span>' : '';
+$icon      = $this->getIconClass($current);
+$iconClass = ($icon != '' && $current->level == 1) ? '<span class="' . $icon . '" aria-hidden="true"></span>' : '';
 
-if ($link !== null && $current->get('target') !== null && $current->get('target') !== '')
+if ($link != '' && $current->target != '')
 {
-	echo "<a" . $linkClass . $dataToggle . " href=\"" . $link . "\" target=\"" . $current->get('target') . "\">"
+	echo "<a" . $linkClass . $dataToggle . " href=\"" . $link . "\" target=\"" . $current->target . "\">"
 		. $iconClass
-		. '<span class="sidebar-item-title">' . Text::_($current->get('title')) . "</span></a>";
+		. '<span class="sidebar-item-title">' . Text::_($current->title) . "</span></a>";
 }
-elseif ($link !== null)
+elseif ($link != '')
 {
 	echo "<a" . $linkClass . $dataToggle . " href=\"" . $link . "\">"
 		. $iconClass
 		. '<span class="sidebar-item-title">' . Text::_($current->get('title')) . "</span></a>";
 }
-elseif ($current->get('title') !== null && $current->get('class') !== 'separator')
+elseif ($current->title != '' && $current->get('class') !== 'separator')
 {
 	echo "<a" . $linkClass . $dataToggle . ">"
 		. $iconClass
@@ -110,19 +108,19 @@
 // Recurse through children if they exist
 if ($this->enabled && $current->hasChildren())
 {
-	if ($current->getLevel() > 1)
+	if ($current->level > 1)
 	{
 		$id = $current->get('id') ? ' id="menu-' . strtolower($current->get('id')) . '"' : '';
 
-		echo '<ul' . $id . ' class="collapse collapse-level-' . $current->getLevel() . '">' . "\n";
+		echo '<ul' . $id . ' class="collapse collapse-level-' . $current->level . '">' . "\n";
 	}
 	else
 	{
-		echo '<ul id="collapse' . $this->tree->getCounter() . '" class="collapse-level-1 collapse" role="menu" aria-haspopup="true">' . "\n";
+		echo '<ul id="collapse' . $this->getCounter() . '" class="collapse-level-1 collapse" role="menu" aria-haspopup="true">' . "\n";
 	}
 
 	// WARNING: Do not use direct 'include' or 'require' as it is important to isolate the scope for each call
-	$this->renderSubmenu(__FILE__);
+	$this->renderSubmenu(__FILE__, $current);
 
 	echo "</ul>\n";
 }
diff --git a/administrator/modules/mod_multilangstatus/Helper/MultilangstatusAdminHelper.php b/administrator/modules/mod_multilangstatus/Helper/MultilangstatusAdminHelper.php
index fa6a078458c03..1d1071bf01b34 100644
--- a/administrator/modules/mod_multilangstatus/Helper/MultilangstatusAdminHelper.php
+++ b/administrator/modules/mod_multilangstatus/Helper/MultilangstatusAdminHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_multilangstatus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.ini b/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.ini
index 9c77d2050726e..3e4c324374fbb 100644
--- a/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.ini
+++ b/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.sys.ini b/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.sys.ini
index 9c77d2050726e..3e4c324374fbb 100644
--- a/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.sys.ini
+++ b/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/modules/mod_multilangstatus/mod_multilangstatus.php b/administrator/modules/mod_multilangstatus/mod_multilangstatus.php
index 09efbc283af05..8b624202fab83 100644
--- a/administrator/modules/mod_multilangstatus/mod_multilangstatus.php
+++ b/administrator/modules/mod_multilangstatus/mod_multilangstatus.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_multilangstatus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml b/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml
index 71392e8ec7e26..562a705d8d10a 100644
--- a/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml
+++ b/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml
@@ -3,7 +3,7 @@
 	<name>mod_multilangstatus</name>
 	<author>Joomla! Project</author>
 	<creationDate>September 2011</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_multilangstatus/tmpl/default.php b/administrator/modules/mod_multilangstatus/tmpl/default.php
index 85115d68792d4..9d655525afac8 100644
--- a/administrator/modules/mod_multilangstatus/tmpl/default.php
+++ b/administrator/modules/mod_multilangstatus/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_multilangstatus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,6 +13,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
+HTMLHelper::_('bootstrap.framework');
 HTMLHelper::_('script', 'mod_multilangstatus/admin-multilangstatus.min.js', array('version' => 'auto', 'relative' => true));
 ?>
 
diff --git a/administrator/modules/mod_popular/Helper/PopularHelper.php b/administrator/modules/mod_popular/Helper/PopularHelper.php
index 49508426990ec..4384135625a73 100644
--- a/administrator/modules/mod_popular/Helper/PopularHelper.php
+++ b/administrator/modules/mod_popular/Helper/PopularHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_popular
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_popular/mod_popular.php b/administrator/modules/mod_popular/mod_popular.php
index 923d54ab22b02..c6fc03fc013df 100644
--- a/administrator/modules/mod_popular/mod_popular.php
+++ b/administrator/modules/mod_popular/mod_popular.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_popular
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_popular/mod_popular.xml b/administrator/modules/mod_popular/mod_popular.xml
index 935d8f1410600..f8ce5797bb532 100644
--- a/administrator/modules/mod_popular/mod_popular.xml
+++ b/administrator/modules/mod_popular/mod_popular.xml
@@ -3,7 +3,7 @@
 	<name>mod_popular</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_popular/tmpl/default.php b/administrator/modules/mod_popular/tmpl/default.php
index d2fa108b009d4..43d21de6049dd 100644
--- a/administrator/modules/mod_popular/tmpl/default.php
+++ b/administrator/modules/mod_popular/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_popular
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,6 +12,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
+HTMLHelper::_('bootstrap.framework');
 ?>
 <table class="table" id="<?php echo str_replace(' ', '', $module->title) . $module->id; ?>">
 	<caption class="sr-only"><?php echo $module->title; ?></caption>
@@ -62,4 +63,4 @@
 		</tr>
 	<?php endif; ?>
 	</tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/administrator/modules/mod_privacy_dashboard/helper.php b/administrator/modules/mod_privacy_dashboard/helper.php
new file mode 100644
index 0000000000000..1ec75307d7694
--- /dev/null
+++ b/administrator/modules/mod_privacy_dashboard/helper.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_privacy_dashboard
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Model\BaseModel;
+
+/**
+ * Helper class for admin privacy dashboard module
+ *
+ * @since  3.9.0
+ */
+class ModPrivacyDashboardHelper
+{
+	/**
+	 * Method to retrieve information about the site privacy requests
+	 *
+	 * @return  array  Array containing site privacy requests
+	 *
+	 * @since   3.9.0
+	 */
+	public static function getData()
+	{
+		BaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_privacy/models', 'PrivacyModel');
+
+		/** @var PrivacyModelDashboard $model */
+		$model = BaseModel::getInstance('Dashboard', 'PrivacyModel');
+
+		try
+		{
+			return $model->getRequestCounts();
+		}
+		catch (JDatabaseException $e)
+		{
+			return array();
+		}
+	}
+}
diff --git a/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.php b/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.php
new file mode 100644
index 0000000000000..4160610365679
--- /dev/null
+++ b/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_privacy_dashboard
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Only super user can view this data
+if (!JFactory::getUser()->authorise('core.admin'))
+{
+	return;
+}
+
+// Load the privacy component language file.
+$lang = JFactory::getLanguage();
+$lang->load('com_privacy', JPATH_ADMINISTRATOR, null, false, true)
+	|| $lang->load('com_privacy', JPATH_ADMINISTRATOR . '/components/com_privacy', null, false, true);
+
+JHtml::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/html');
+
+JLoader::register('ModPrivacyDashboardHelper', __DIR__ . '/helper.php');
+
+$list            = ModPrivacyDashboardHelper::getData();
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_privacy_dashboard', $params->get('layout', 'default'));
diff --git a/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.xml b/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.xml
new file mode 100644
index 0000000000000..0075c4777b9c8
--- /dev/null
+++ b/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.9" client="administrator" method="upgrade">
+	<name>mod_privacy_dashboard</name>
+	<author>Joomla! Project</author>
+	<creationDate>June 2018</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>MOD_PRIVACY_DASHBOARD_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_privacy_dashboard">mod_privacy_dashboard.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_privacy_dashboard.ini</language>
+		<language tag="en-GB">en-GB.mod_privacy_dashboard.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_PRIVACY_DASHBOARD" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+				 	rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+
+				<field
+					name="cachemode"
+					type="hidden"
+					default="static"
+					>
+					<option value="static"></option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/administrator/modules/mod_privacy_dashboard/tmpl/default.php b/administrator/modules/mod_privacy_dashboard/tmpl/default.php
new file mode 100644
index 0000000000000..6a18baa7c66fa
--- /dev/null
+++ b/administrator/modules/mod_privacy_dashboard/tmpl/default.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_privacy_dashboard
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+
+$totalRequests  = 0;
+$activeRequests = 0;
+
+?>
+<div class="row-striped">
+	<?php if (count($list)) : ?>
+		<div class="row-fluid">
+			<div class="span5"><strong><?php echo JText::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_TYPE'); ?></strong></div>
+			<div class="span5"><strong><?php echo JText::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_STATUS'); ?></strong></div>
+			<div class="span2"><strong><?php echo JText::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_COUNT'); ?></strong></div>
+		</div>
+		<?php foreach ($list as $row) : ?>
+			<div class="row-fluid">
+				<div class="span5">
+					<a class="hasTooltip" href="<?php echo JRoute::_('index.php?option=com_privacy&view=requests&filter[request_type]=' . $row->request_type . '&filter[status]=' . $row->status); ?>" data-original-title="<?php echo JText::_('COM_PRIVACY_DASHBOARD_VIEW_REQUESTS'); ?>">
+						<strong><?php echo JText::_('COM_PRIVACY_HEADING_REQUEST_TYPE_TYPE_' . $row->request_type); ?></strong>
+					</a>
+				</div>
+				<div class="span5"><?php echo JHtml::_('PrivacyHtml.helper.statusLabel', $row->status); ?></div>
+				<div class="span2"><span class="badge badge-info"><?php echo $row->count; ?></span></div>
+			</div>
+			<?php if (in_array($row->status, array(0, 1))) : ?>
+				<?php $activeRequests += $row->count; ?>
+			<?php endif; ?>
+			<?php $totalRequests += $row->count; ?>
+		<?php endforeach; ?>
+		<div class="row-fluid">
+			<div class="span5"><?php echo JText::plural('COM_PRIVACY_DASHBOARD_BADGE_TOTAL_REQUESTS', $totalRequests); ?></div>
+			<div class="span7"><?php echo JText::plural('COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS', $activeRequests); ?></div>
+		</div>
+	<?php else : ?>
+		<div class="row-fluid">
+			<div class="span12">
+				<div class="alert"><?php echo JText::_('COM_PRIVACY_DASHBOARD_NO_REQUESTS'); ?></div>
+			</div>
+		</div>
+	<?php endif; ?>
+</div>
diff --git a/administrator/modules/mod_quickicon/Dispatcher/Dispatcher.php b/administrator/modules/mod_quickicon/Dispatcher/Dispatcher.php
index e12ce701f7002..9e038b360480e 100644
--- a/administrator/modules/mod_quickicon/Dispatcher/Dispatcher.php
+++ b/administrator/modules/mod_quickicon/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_quickicon
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_quickicon/Event/QuickIconsEvent.php b/administrator/modules/mod_quickicon/Event/QuickIconsEvent.php
index 81abe9ef24459..61d818ac8f655 100644
--- a/administrator/modules/mod_quickicon/Event/QuickIconsEvent.php
+++ b/administrator/modules/mod_quickicon/Event/QuickIconsEvent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_quickicon
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php b/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php
index 6aaca00c10be8..d0ca208e5175d 100644
--- a/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php
+++ b/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_quickicon
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_quickicon/mod_quickicon.xml b/administrator/modules/mod_quickicon/mod_quickicon.xml
index 7e04bded8b5c3..35e6c41f25f47 100644
--- a/administrator/modules/mod_quickicon/mod_quickicon.xml
+++ b/administrator/modules/mod_quickicon/mod_quickicon.xml
@@ -3,7 +3,7 @@
 	<name>mod_quickicon</name>
 	<author>Joomla! Project</author>
 	<creationDate>Nov 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_quickicon/services/provider.php b/administrator/modules/mod_quickicon/services/provider.php
index 7444ebcf6f7d8..85f2ade83cc85 100644
--- a/administrator/modules/mod_quickicon/services/provider.php
+++ b/administrator/modules/mod_quickicon/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_quickicon
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_quickicon/tmpl/default.php b/administrator/modules/mod_quickicon/tmpl/default.php
index 30f472424288c..f5494a2792850 100644
--- a/administrator/modules/mod_quickicon/tmpl/default.php
+++ b/administrator/modules/mod_quickicon/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_quickicon
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_sampledata/Helper/SampledataHelper.php b/administrator/modules/mod_sampledata/Helper/SampledataHelper.php
index ca51c269765bf..569a04b526822 100644
--- a/administrator/modules/mod_sampledata/Helper/SampledataHelper.php
+++ b/administrator/modules/mod_sampledata/Helper/SampledataHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_sampledata
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_sampledata/mod_sampledata.php b/administrator/modules/mod_sampledata/mod_sampledata.php
index c1b16aa466db7..df2c90e7da39d 100644
--- a/administrator/modules/mod_sampledata/mod_sampledata.php
+++ b/administrator/modules/mod_sampledata/mod_sampledata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_sampledata
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_sampledata/mod_sampledata.xml b/administrator/modules/mod_sampledata/mod_sampledata.xml
index 909f701780009..9542d80f7a5e7 100644
--- a/administrator/modules/mod_sampledata/mod_sampledata.xml
+++ b/administrator/modules/mod_sampledata/mod_sampledata.xml
@@ -3,7 +3,7 @@
 	<name>mod_sampledata</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2017</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_sampledata/tmpl/default.php b/administrator/modules/mod_sampledata/tmpl/default.php
index 934a39c2c8406..f573c1ee80914 100644
--- a/administrator/modules/mod_sampledata/tmpl/default.php
+++ b/administrator/modules/mod_sampledata/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_sampledata
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,6 +13,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Uri\Uri;
 
+HTMLHelper::_('bootstrap.framework');
 HTMLHelper::_('script', 'mod_sampledata/sampledata-process.js', ['version' => 'auto', 'relative' => true]);
 
 Text::script('MOD_SAMPLEDATA_CONFIRM_START');
diff --git a/administrator/modules/mod_stats_admin/Helper/StatsAdminHelper.php b/administrator/modules/mod_stats_admin/Helper/StatsAdminHelper.php
index a3f15ef56f0e0..575b40e092b22 100644
--- a/administrator/modules/mod_stats_admin/Helper/StatsAdminHelper.php
+++ b/administrator/modules/mod_stats_admin/Helper/StatsAdminHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_stats_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,6 +14,7 @@
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Router\Route;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Registry\Registry;
 
@@ -108,6 +109,7 @@ public static function getStats(Registry $params, CMSApplication $app, DatabaseI
 				$rows[$i]->title = Text::_('MOD_STATS_USERS');
 				$rows[$i]->icon  = 'users';
 				$rows[$i]->data  = $users;
+				$rows[$i]->link  = Route::_('index.php?option=com_users');
 				$i++;
 			}
 
@@ -117,6 +119,7 @@ public static function getStats(Registry $params, CMSApplication $app, DatabaseI
 				$rows[$i]->title = Text::_('MOD_STATS_ARTICLES');
 				$rows[$i]->icon  = 'file';
 				$rows[$i]->data  = $items;
+				$rows[$i]->link  = Route::_('index.php?option=com_content&view=articles&filter[published]=1');
 				$i++;
 			}
 		}
@@ -137,6 +140,7 @@ public static function getStats(Registry $params, CMSApplication $app, DatabaseI
 					$rows[$i]->title = $row['title'];
 					$rows[$i]->icon  = $row['icon'] ?? 'info';
 					$rows[$i]->data  = $row['data'];
+					$rows[$i]->link  = isset($row['link']) ? $row['link'] : null;
 					$i++;
 				}
 			}
diff --git a/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.ini b/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.ini
index ad50a225cef08..7634ba48a8a50 100644
--- a/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.ini
+++ b/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.sys.ini b/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.sys.ini
index d47a4e9f3045b..ab79bffe73cf0 100644
--- a/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.sys.ini
+++ b/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/modules/mod_stats_admin/mod_stats_admin.php b/administrator/modules/mod_stats_admin/mod_stats_admin.php
index aaf5b4723baad..5d89fd0439465 100644
--- a/administrator/modules/mod_stats_admin/mod_stats_admin.php
+++ b/administrator/modules/mod_stats_admin/mod_stats_admin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_stats_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_stats_admin/mod_stats_admin.xml b/administrator/modules/mod_stats_admin/mod_stats_admin.xml
index 40118bc6ef764..ed3d80a15556e 100644
--- a/administrator/modules/mod_stats_admin/mod_stats_admin.xml
+++ b/administrator/modules/mod_stats_admin/mod_stats_admin.xml
@@ -3,7 +3,7 @@
 	<name>mod_stats_admin</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_stats_admin/tmpl/default.php b/administrator/modules/mod_stats_admin/tmpl/default.php
index 6f6caf9312beb..3787f5b829289 100644
--- a/administrator/modules/mod_stats_admin/tmpl/default.php
+++ b/administrator/modules/mod_stats_admin/tmpl/default.php
@@ -3,14 +3,39 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_stats_admin
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
+
+JHtml::_('jquery.framework');
+JFactory::getDocument()->addScriptDeclaration('
+	jQuery(document).ready(function($) {
+		$("a.js-revert").on("click", function(e) {
+			e.preventDefault();
+			e.stopPropagation();
+
+			var activeTab = [];
+			activeTab.push("#" + e.target.href.split("#")[1]);
+			var path = window.location.pathname;
+			localStorage.removeItem(e.target.href.replace(/&return=[a-zA-Z0-9%]+/, "").replace(/&[a-zA-Z-_]+=[0-9]+/, ""));
+			localStorage.setItem(path + e.target.href.split("index.php")[1].split("#")[0], JSON.stringify(activeTab));
+			return window.location.href = e.target.href.split("#")[0];
+		});
+	});
+');
 ?>
 <ul class="list-group list-group-flush stats-module <?php echo $moduleclass_sfx ?>">
 	<?php foreach ($list as $item) : ?>
-		<li class="list-group-item"><span class="mr-2 fa-fw fa fa-<?php echo $item->icon; ?>" title="<?php echo $item->title; ?>" aria-hidden="true"></span> <?php echo $item->title; ?> <?php echo $item->data; ?></li>
+		<li class="list-group-item">
+			<span class="mr-2 fa-fw fa fa-<?php echo $item->icon; ?>" aria-hidden="true"></span> <?php echo $item->title; ?>
+
+			<?php if(isset($item->link)) : ?>
+				<a class="btn btn-info btn-sm js-revert" href="<?php echo $item->link; ?>"><?php echo $item->data; ?></a>
+			<?php else : ?>
+				<?php echo $item->data; ?>
+			<?php endif; ?>
+		</li>
 	<?php endforeach; ?>
 </ul>
diff --git a/administrator/modules/mod_status/mod_status.php b/administrator/modules/mod_status/mod_status.php
index 536da17c66616..10c9ec996954b 100644
--- a/administrator/modules/mod_status/mod_status.php
+++ b/administrator/modules/mod_status/mod_status.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_status
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_status/mod_status.xml b/administrator/modules/mod_status/mod_status.xml
index ce436de7df83f..e28153b02875d 100644
--- a/administrator/modules/mod_status/mod_status.xml
+++ b/administrator/modules/mod_status/mod_status.xml
@@ -3,7 +3,7 @@
 	<name>mod_status</name>
 	<author>Joomla! Project</author>
 	<creationDate>Feb 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_status/tmpl/default.php b/administrator/modules/mod_status/tmpl/default.php
index 3eefab3ea4aa9..5e8ec869adeef 100644
--- a/administrator/modules/mod_status/tmpl/default.php
+++ b/administrator/modules/mod_status/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_status
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -18,8 +18,9 @@
 use Joomla\CMS\Uri\Uri;
 use Joomla\Module\Multilangstatus\Administrator\Helper\MultilangstatusAdminHelper;
 
-$hideLinks = $app->input->getBool('hidemainmenu');
+HTMLHelper::_('bootstrap.framework');
 
+$hideLinks = $app->input->getBool('hidemainmenu');
 ?>
 <div class="ml-auto">
 	<ul class="nav text-center">
@@ -44,7 +45,7 @@
 		</li>
 
 		<li class="nav-item">
-			<a class="nav-link dropdown-toggle" href="<?php echo Route::_('index.php?option=com_messages'); ?>" title="<?php echo Text::_('MOD_STATUS_PRIVATE_MESSAGES'); ?>">
+			<a class="nav-link <?php echo ($hideLinks ? 'disabled' : 'dropdown-toggle'); ?>" <?php echo ($hideLinks ? '' : 'href="' . Route::_('index.php?option=com_messages') . '"'); ?> title="<?php echo Text::_('MOD_STATUS_PRIVATE_MESSAGES'); ?>">
 				<span class="fa fa-envelope-o" aria-hidden="true"></span>
 				<span class="sr-only"><?php echo Text::_('MOD_STATUS_PRIVATE_MESSAGES'); ?></span>
 				<?php $countUnread = $app->getSession()->get('messages.unread'); ?>
@@ -56,49 +57,54 @@
 
 		<?php if ($user->authorise('core.manage', 'com_postinstall')) : ?>
 		<li class="nav-item dropdown">
-			<a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" title="<?php echo Text::_('MOD_STATUS_POST_INSTALLATION_MESSAGES'); ?>">
+			<a class="nav-link <?php echo ($hideLinks ? 'disabled' : 'dropdown-toggle'); ?>" <?php echo ($hideLinks ? '' : 'data-toggle="dropdown" href="#"'); ?> title="<?php echo Text::_('MOD_STATUS_POST_INSTALLATION_MESSAGES'); ?>">
 				<span class="fa fa-bell-o" aria-hidden="true"></span>
 				<span class="sr-only"><?php echo Text::_('MOD_STATUS_POST_INSTALLATION_MESSAGES'); ?></span>
 				<?php if (count($messages) > 0) : ?>
 					<span class="badge badge-pill badge-danger"><?php echo count($messages); ?></span>
 				<?php endif; ?>
 			</a>
-			<div class="dropdown-menu dropdown-menu-right dropdown-notifications">
-				<div class="list-group">
-					<?php if (empty($messages)) : ?>
-					<p class="list-group-item text-center">
-						<strong><?php echo Text::_('COM_POSTINSTALL_LBL_NOMESSAGES_TITLE'); ?></strong>
-					</p>
-					<?php endif; ?>
-					<?php foreach ($messages as $message) : ?>
-					<a href="<?php echo Route::_('index.php?option=com_postinstall&amp;eid=700'); ?>" class="list-group-item list-group-item-action">
-						<h5 class="list-group-item-heading"><?php echo HTMLHelper::_('string.truncate', Text::_($message->title_key), 28, false, false); ?></h5>
-						<p class="list-group-item-text small">
-							<?php echo HTMLHelper::_('string.truncate', Text::_($message->description_key), 120, false, false); ?>
+			<?php if (!$hideLinks) : ?>
+				<div class="dropdown-menu dropdown-menu-right dropdown-notifications border-0">
+					<div class="list-group">
+						<?php if (empty($messages)) : ?>
+						<p class="list-group-item text-center">
+							<strong><?php echo Text::_('COM_POSTINSTALL_LBL_NOMESSAGES_TITLE'); ?></strong>
 						</p>
-					</a>
-					<?php endforeach; ?>
+						<?php endif; ?>
+						<?php foreach ($messages as $message) : ?>
+						<a href="<?php echo Route::_('index.php?option=com_postinstall&amp;eid=700'); ?>" class="list-group-item list-group-item-action">
+							<h5 class="list-group-item-heading"><?php echo HTMLHelper::_('string.truncate', Text::_($message->title_key), 28, false, false); ?></h5>
+							<p class="list-group-item-text small">
+								<?php echo HTMLHelper::_('string.truncate', Text::_($message->description_key), 120, false, false); ?>
+							</p>
+						</a>
+						<?php endforeach; ?>
+					</div>
 				</div>
-			</div>
+			<?php endif; ?>
 		</li>
 		<?php endif; ?>
 
 		<li class="nav-item dropdown header-profile">
-			<a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" title="<?php echo Text::_('MOD_STATUS_USER_MENU'); ?>">
+			<a class="nav-link <?php echo ($hideLinks ? 'disabled' : 'dropdown-toggle'); ?>" <?php echo ($hideLinks ? '' : 'data-toggle="dropdown" href="#"'); ?> title="<?php echo Text::_('MOD_STATUS_USER_MENU'); ?>">
 				<span class="fa fa-user-o" aria-hidden="true"></span>
 				<span class="sr-only"><?php echo Text::_('MOD_STATUS_USER_MENU'); ?></span>
 			</a>
-			<div class="dropdown-menu dropdown-menu-right">
-				<div class="dropdown-header">
-					<span class="fa fa-user-o" aria-hidden="true"></span>
-					<?php echo $user->name; ?>
+			<?php if (!$hideLinks) : ?>
+				<div class="dropdown-menu dropdown-menu-right">
+					<div class="dropdown-header">
+						<span class="fa fa-user-o" aria-hidden="true"></span>
+						<?php echo $user->name; ?>
+					</div>
+					<?php $uri   = Uri::getInstance(); ?>
+					<?php $route = 'index.php?option=com_users&task=user.edit&id=' . $user->id . '&return=' . base64_encode($uri); ?>
+					<a class="dropdown-item" href="<?php echo Route::_($route); ?>">
+						<?php echo Text::_('MOD_STATUS_EDIT_ACCOUNT'); ?></a>
+					<a class="dropdown-item" href="<?php echo Route::_('index.php?option=com_login&task=logout&'
+						. Session::getFormToken() . '=1'); ?>"><?php echo Text::_('JLOGOUT'); ?></a>
 				</div>
-				<?php $route = 'index.php?option=com_admin&amp;task=profile.edit&amp;id=' . $user->id; ?>
-				<a class="dropdown-item" href="<?php echo Route::_($route); ?>">
-					<?php echo Text::_('MOD_STATUS_EDIT_ACCOUNT'); ?></a>
-				<a class="dropdown-item" href="<?php echo Route::_('index.php?option=com_login&task=logout&'
-					. Session::getFormToken() . '=1'); ?>"><?php echo Text::_('JLOGOUT'); ?></a>
-			</div>
+			<?php endif; ?>
 		</li>
 
 	</ul>
diff --git a/administrator/modules/mod_title/mod_title.php b/administrator/modules/mod_title/mod_title.php
index 1d62393736b22..303f242a3cefb 100644
--- a/administrator/modules/mod_title/mod_title.php
+++ b/administrator/modules/mod_title/mod_title.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_title
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_title/mod_title.xml b/administrator/modules/mod_title/mod_title.xml
index 9c499ee810175..e33aaa3a27411 100644
--- a/administrator/modules/mod_title/mod_title.xml
+++ b/administrator/modules/mod_title/mod_title.xml
@@ -3,7 +3,7 @@
 	<name>mod_title</name>
 	<author>Joomla! Project</author>
 	<creationDate>Nov 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_title/tmpl/default.php b/administrator/modules/mod_title/tmpl/default.php
index 1b28354aea8ea..569fb677950c7 100644
--- a/administrator/modules/mod_title/tmpl/default.php
+++ b/administrator/modules/mod_title/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_title
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_toolbar/mod_toolbar.php b/administrator/modules/mod_toolbar/mod_toolbar.php
index a39813297f155..d5a6dc14c76cb 100644
--- a/administrator/modules/mod_toolbar/mod_toolbar.php
+++ b/administrator/modules/mod_toolbar/mod_toolbar.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_toolbar
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_toolbar/mod_toolbar.xml b/administrator/modules/mod_toolbar/mod_toolbar.xml
index 69e0e78eadb4a..21c23c9a8f140 100644
--- a/administrator/modules/mod_toolbar/mod_toolbar.xml
+++ b/administrator/modules/mod_toolbar/mod_toolbar.xml
@@ -3,7 +3,7 @@
 	<name>mod_toolbar</name>
 	<author>Joomla! Project</author>
 	<creationDate>Nov 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_toolbar/tmpl/default.php b/administrator/modules/mod_toolbar/tmpl/default.php
index 635f5c582836c..f2e18817b8499 100644
--- a/administrator/modules/mod_toolbar/tmpl/default.php
+++ b/administrator/modules/mod_toolbar/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_toolbar
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_version/Helper/VersionHelper.php b/administrator/modules/mod_version/Helper/VersionHelper.php
index c2377206761a9..9bfba34f1c3d0 100644
--- a/administrator/modules/mod_version/Helper/VersionHelper.php
+++ b/administrator/modules/mod_version/Helper/VersionHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_version
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_version/mod_version.php b/administrator/modules/mod_version/mod_version.php
index c1fb0cb5c195f..aeed51637ecf7 100644
--- a/administrator/modules/mod_version/mod_version.php
+++ b/administrator/modules/mod_version/mod_version.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_version
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_version/mod_version.xml b/administrator/modules/mod_version/mod_version.xml
index 0e294a83c1910..8ec2571e52713 100644
--- a/administrator/modules/mod_version/mod_version.xml
+++ b/administrator/modules/mod_version/mod_version.xml
@@ -3,7 +3,7 @@
 	<name>mod_version</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2012</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_version/tmpl/default.php b/administrator/modules/mod_version/tmpl/default.php
index f1dc32ae578cb..4c405060462cd 100644
--- a/administrator/modules/mod_version/tmpl/default.php
+++ b/administrator/modules/mod_version/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_version
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/atum/component.php b/administrator/templates/atum/component.php
index 4cde3ad00cf7f..c29cce885f821 100644
--- a/administrator/templates/atum/component.php
+++ b/administrator/templates/atum/component.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Templates.Atum
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,7 +17,6 @@
 $lang = Factory::getLanguage();
 
 // Add JavaScript Frameworks
-HTMLHelper::_('bootstrap.framework');
 HTMLHelper::_('script', 'vendor/focus-visible/focus-visible.min.js', ['version' => 'auto', 'relative' => true]);
 
 // Load template CSS file
diff --git a/administrator/templates/atum/cpanel.php b/administrator/templates/atum/cpanel.php
index 123d425247c67..5071be49fdca0 100644
--- a/administrator/templates/atum/cpanel.php
+++ b/administrator/templates/atum/cpanel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Templates.Atum
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/atum/error.php b/administrator/templates/atum/error.php
index 6d58481974f49..2a6568ac1ffd3 100644
--- a/administrator/templates/atum/error.php
+++ b/administrator/templates/atum/error.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Administrator
  * @subpackage  Templates.Atum
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       4.0
  */
diff --git a/administrator/templates/atum/error_full.php b/administrator/templates/atum/error_full.php
index 8ff5f4bfbd83e..16ae27bc7e98c 100644
--- a/administrator/templates/atum/error_full.php
+++ b/administrator/templates/atum/error_full.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Administrator
  * @subpackage  Templates.Atum
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       4.0
  */
@@ -32,7 +32,6 @@
 $logoBlue    = $this->baseurl . '/templates/' . $this->template . '/images/logo-blue.svg';
 
 // Add JavaScript
-HTMLHelper::_('bootstrap.framework');
 HTMLHelper::_('script', 'vendor/focus-visible/focus-visible.min.js', ['version' => 'auto', 'relative' => true]);
 HTMLHelper::_('script', 'vendor/css-vars-ponyfill/css-vars-ponyfill.min.js', ['version' => 'auto', 'relative' => true]);
 
@@ -83,7 +82,7 @@
 				<jdoc:include type="modules" name="title" />
 			</div>
 			<div class="header-items d-flex ml-auto">
-				<jdoc:include type="modules" name="status" style="no" />
+				<jdoc:include type="modules" name="status" />
 			</div>
 		</div>
 	</header>
@@ -111,7 +110,7 @@
 						<div id="container-collapse" class="container-collapse"></div>
 						<div class="row">
 							<div class="col-md-12">
-								<jdoc:include type="modules" name="toolbar" style="no" />
+								<jdoc:include type="modules" name="toolbar" />
 							</div>
 					</div>
 				</div>
diff --git a/administrator/templates/atum/error_login.php b/administrator/templates/atum/error_login.php
index c8dca01511f12..ea60c2d8ccd36 100644
--- a/administrator/templates/atum/error_login.php
+++ b/administrator/templates/atum/error_login.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Administrator
  * @subpackage  Templates.Atum
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       4.0
  */
@@ -40,7 +40,7 @@
 $layout   = $app->input->getCmd('layout', '');
 $task     = $app->input->getCmd('task', '');
 $itemid   = $app->input->getCmd('Itemid', '');
-$sitename = $app->get('sitename');
+$sitename = htmlspecialchars($app->get('sitename'), ENT_QUOTES, 'UTF-8');
 
 // Set some meta data
 $this->setMetaData('viewport', 'width=device-width, initial-scale=1');
diff --git a/administrator/templates/atum/html/layouts/chromes/body.php b/administrator/templates/atum/html/layouts/chromes/body.php
new file mode 100644
index 0000000000000..be832cabac21a
--- /dev/null
+++ b/administrator/templates/atum/html/layouts/chromes/body.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Templates.Atum
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+
+$module  = $displayData['module'];
+$params  = $displayData['params'];
+
+if ($module->content) :
+	$id = $module->id;
+
+	// Permission checks
+	$user    = Factory::getUser();
+	$canEdit = $user->authorise('core.edit', 'com_modules.module.' . $id);
+
+	$moduleTag   = $params->get('module_tag', 'div');
+	$bootstrapSize  = (int) $params->get('bootstrap_size', 6);
+	$moduleClass    = ($bootstrapSize) ? 'col-md-' . $bootstrapSize : 'col-md-12';
+	$headerTag      = htmlspecialchars($params->get('header_tag', 'h2'));
+	$moduleClassSfx = $params->get('moduleclass_sfx', '');
+
+	// Temporarily store header class in variable
+	$headerClass = $params->get('header_class');
+	$headerClass = ($headerClass) ? ' ' . htmlspecialchars($headerClass) : '';
+	?>
+	<div class="<?php echo $moduleClass; ?> module-wrapper">
+		<<?php echo $moduleTag; ?> class="card mb-3<?php echo $moduleClassSfx; ?>">
+			<?php if ($canEdit) : ?>
+				<?php $uri = Uri::getInstance(); ?>
+				<?php $url = Route::_('index.php?option=com_modules&task=module.edit&id=' . $id . '&return=' . base64_encode($uri)); ?>
+
+				<?php $dropdownPosition = Factory::getLanguage()->isRTL() ? 'left' : 'right'; ?>
+
+				<div class="module-actions dropdown">
+					<a data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="dropdownMenuButton-<?php echo $id; ?>">
+								<span class="fa fa-cog"><span class="sr-only">
+									<?php echo Text::_('JACTION_EDIT') . ' ' . $module->title; ?>
+								</span></span>
+					</a>
+					<div class="dropdown-menu dropdown-menu-' . $dropdownPosition . '" aria-labelledby="dropdownMenuButton-<?php echo $id; ?>">
+						<a class="dropdown-item" href="<?php echo $url; ?>"><?php echo Text::_('JACTION_EDIT'); ?></a>
+						<a class="dropdown-item unpublish-module" data-module-id="<?php echo $id; ?>"><?php echo Text::_('JACTION_UNPUBLISH'); ?></a>
+					</div>
+				</div>
+			<?php endif; ?>
+			<?php if ($module->showtitle) : ?>
+				<<?php echo $headerTag; ?> class="card-header<?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
+			<?php endif; ?>
+			<div class="module-body">
+				<?php echo $module->content; ?>
+			</div>
+		</<?php echo $moduleTag; ?>>
+	</div>
+<?php endif; ?>
diff --git a/administrator/templates/atum/html/layouts/chromes/title.php b/administrator/templates/atum/html/layouts/chromes/title.php
new file mode 100644
index 0000000000000..c9368a49b7e60
--- /dev/null
+++ b/administrator/templates/atum/html/layouts/chromes/title.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Templates.Atum
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * Module chrome for rendering the module in a submenu
+ */
+
+defined('_JEXEC') or die;
+
+$module  = $displayData['module'];
+
+if ($module->content) : ?>
+	<div class="card-header"><h6><?php echo $module->title; ?></h6></div>
+	<?php echo $module->content; ?>
+<?php endif; ?>
diff --git a/administrator/templates/atum/html/layouts/chromes/well.php b/administrator/templates/atum/html/layouts/chromes/well.php
new file mode 100644
index 0000000000000..c9dba9e088f9d
--- /dev/null
+++ b/administrator/templates/atum/html/layouts/chromes/well.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Templates.Atum
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
+
+$module  = $displayData['module'];
+$params  = $displayData['params'];
+$attribs = $displayData['attribs'];
+
+if ($module->content) :
+	$id = $module->id;
+
+	// Permission checks
+	$user    = Factory::getUser();
+	$canEdit = $user->authorise('core.edit', 'com_modules.module.' . $id) && $user->authorise('core.manage', 'com_modules');
+
+	$moduleTag      = $params->get('module_tag', 'div');
+	$bootstrapSize  = (int) $params->get('bootstrap_size', 6);
+	$moduleClass    = ($bootstrapSize) ? 'col-md-' . $bootstrapSize : 'col-md-12';
+	$headerTag      = htmlspecialchars($params->get('header_tag', 'h2'));
+	$moduleClassSfx = $params->get('moduleclass_sfx', '');
+
+	// Temporarily store header class in variable
+	$headerClass = $params->get('header_class');
+	$headerClass = ($headerClass) ? ' ' . htmlspecialchars($headerClass) : '';
+	?>
+	<div class="<?php echo $moduleClass; ?> module-wrapper">
+		<<?php echo $moduleTag; ?> class="card mb-3<?php echo $moduleClassSfx; ?>">
+			<?php if ($canEdit) : ?>
+				<?php $uri = Uri::getInstance(); ?>
+				<?php $url = Route::_('index.php?option=com_modules&task=module.edit&id=' . $id . '&return=' . base64_encode($uri)); ?>
+
+				<?php $dropdownPosition = Factory::getLanguage()->isRTL() ? 'left' : 'right'; ?>
+
+				<div class="module-actions dropdown">
+					<a data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="dropdownMenuButton-<?php echo $id; ?>">
+						<span class="fa fa-cog"><span class="sr-only">
+							<?php echo Text::_('JACTION_EDIT') . ' ' . $module->title; ?>
+						</span></span>
+					</a>
+					<div class="dropdown-menu dropdown-menu-' . $dropdownPosition . '" aria-labelledby="dropdownMenuButton-<?php echo $id; ?>">
+						<a class="dropdown-item" href="<?php echo $url; ?>"><?php echo Text::_('JACTION_EDIT'); ?></a>
+						<a class="dropdown-item unpublish-module" data-module-id="<?php echo $id; ?>"><?php echo Text::_('JACTION_UNPUBLISH'); ?></a>
+					</div>
+				</div>
+			<?php endif; ?>
+
+			<?php if ($module->showtitle) : ?>
+				<h2 class="card-header<?php echo $headerClass; ?>"><?php echo $module->title; ?></h2>
+			<?php endif; ?>
+
+			<?php echo $module->content; ?>
+		</<?php echo $moduleTag; ?>>
+	</div>
+<?php endif; ?>
diff --git a/administrator/templates/atum/html/modules.php b/administrator/templates/atum/html/modules.php
deleted file mode 100644
index eb0a720599da5..0000000000000
--- a/administrator/templates/atum/html/modules.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  Templates.Atum
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Router\Route;
-
-/**
- * This is a file to add template specific chrome to module rendering.  To use it you would
- * set the style attribute for the given module(s) include in your template to use the style
- * for each given modChrome function.
- *
- * eg.  To render a module mod_test in the submenu style, you would use the following include:
- * <jdoc:include type="module" name="test" style="submenu" />
- *
- * This gives template designers ultimate control over how modules are rendered.
- *
- * NOTICE: All chrome wrapping methods should be named: modChrome_{STYLE} and take the same
- * two arguments.
- */
-
-/*
- * Module chrome for rendering the module in a submenu
- */
-function modChrome_title($module, &$params, &$attribs)
-{
-	if ($module->content)
-	{
-		echo "<div class=\"card-header\"><h6>" . $module->title . "</h6></div>";
-		echo $module->content;
-	}
-}
-
-function modChrome_no($module, &$params, &$attribs)
-{
-	if ($module->content)
-	{
-		echo $module->content;
-	}
-}
-
-function modChrome_well($module, &$params, &$attribs)
-{
-	if ($module->content)
-	{
-		// Permission checks
-		$user           = Factory::getUser();
-		$canEdit	    = $user->authorise('core.edit', 'com_modules.module.' . $module->id) && $user->authorise('core.manage', 'com_modules');
-
-		$moduleTag      = $params->get('module_tag', 'div');
-		$bootstrapSize  = (int) $params->get('bootstrap_size', 6);
-		$moduleClass    = ($bootstrapSize) ? 'col-md-' . $bootstrapSize : 'col-md-12';
-		$headerTag      = htmlspecialchars($params->get('header_tag', 'h2'));
-		$moduleClassSfx = $params->get('moduleclass_sfx', '');
-
-		// Temporarily store header class in variable
-		$headerClass    = $params->get('header_class');
-		$headerClass    = ($headerClass) ? ' ' . htmlspecialchars($headerClass) : '';
-
-		echo '<div class="' . $moduleClass . '">';
-		echo '<' . $moduleTag . ' class="card mb-3' . $moduleClassSfx . '">';
-
-		if ($canEdit)
-		{
-			echo '<div class="module-actions">';
-			echo '<a href="' . Route::_('index.php?option=com_modules&task=module.edit&id=' . (int) $module->id)
-				. '"><span class="fa fa-cog"><span class="sr-only">' . Text::_('JACTION_EDIT') . " " . $module->title . '</span></span></a>';
-			echo '</div>';
-		}
-
-		if ($module->showtitle)
-		{
-			echo '<h2 class="card-header' . $headerClass . '">' . $module->title . '</h2>';
-		}
-
-		echo $module->content;
-
-		echo '</' . $moduleTag . '>';
-		echo '</div>';
-	}
-}
-
-function modChrome_body($module, &$params, &$attribs)
-{
-	if ($module->content)
-	{
-		// Permission checks
-		$user           = Factory::getUser();
-		$canEdit	    = $user->authorise('core.edit', 'com_modules.module.' . $module->id);
-
-		$moduleTag      = $params->get('module_tag', 'div');
-		$bootstrapSize  = (int) $params->get('bootstrap_size', 6);
-		$moduleClass    = ($bootstrapSize) ? 'col-md-' . $bootstrapSize : 'col-md-12';
-		$headerTag      = htmlspecialchars($params->get('header_tag', 'h2'));
-		$moduleClassSfx = $params->get('moduleclass_sfx', '');
-
-		// Temporarily store header class in variable
-		$headerClass    = $params->get('header_class');
-		$headerClass    = ($headerClass) ? ' ' . htmlspecialchars($headerClass) : '';
-
-		echo '<div class="' . $moduleClass . '">';
-		echo '<' . $moduleTag . ' class="card mb-3' . $moduleClassSfx . '">';
-
-		if ($canEdit)
-		{
-			echo '<div class="module-actions">';
-			echo '<a href="' . Route::_('index.php?option=com_modules&task=module.edit&id=' . (int) $module->id)
-				. '"><span class="fa fa-cog"><span class="sr-only">' . Text::_('JACTION_EDIT') . " " . $module->title . '</span></span></a>';
-			echo '</div>';
-		}
-
-		if ($module->showtitle)
-		{
-			echo '<h2 class="card-header' . $headerClass . '">' . $module->title . '</h2>';
-		}
-
-		echo '<div class="module-body">';
-		echo $module->content;
-		echo '</div>';
-
-		echo '</' . $moduleTag . '>';
-		echo '</div>';
-	}
-}
diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
index 00a5901a087fb..2a50594fcd939 100644
--- a/administrator/templates/atum/index.php
+++ b/administrator/templates/atum/index.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Administrator
  * @subpackage  Templates.Atum
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       4.0
  */
@@ -67,14 +67,20 @@
 		<div class="d-flex align-items-center">
 			<div class="header-title d-flex mr-auto">
 				<div class="d-flex">
+				<?php if (!$hidden) : ?>
 					<a class="logo" href="<?php echo Route::_('index.php'); ?>" aria-label="<?php echo Text::_('TPL_BACK_TO_CONTROL_PANEL'); ?>">
 						<img src="<?php echo $logoBlue; ?>" alt="">
 					</a>
+				<?php else : ?>
+					<a class="logo">
+						<img src="<?php echo $logoBlue; ?>" alt="">
+					</a>
+				<?php endif; ?>
 				</div>
 				<jdoc:include type="modules" name="title" />
 			</div>
 			<div class="header-items d-flex ml-auto">
-				<jdoc:include type="modules" name="status" style="no" />
+				<jdoc:include type="modules" name="status" />
 			</div>
 		</div>
 	</header>
@@ -102,7 +108,7 @@
 						<div id="container-collapse" class="container-collapse"></div>
 						<div class="row">
 							<div class="col-md-12">
-								<jdoc:include type="modules" name="toolbar" style="no" />
+								<jdoc:include type="modules" name="toolbar" />
 							</div>
 					</div>
 				</div>
diff --git a/administrator/templates/atum/joomla.asset.json b/administrator/templates/atum/joomla.asset.json
index 9c17c08429ad0..9aecacd835081 100644
--- a/administrator/templates/atum/joomla.asset.json
+++ b/administrator/templates/atum/joomla.asset.json
@@ -8,10 +8,8 @@
       "name": "template.atum.base",
       "dependencies": [
         "core",
-        "jquery-noconflict",
         "font-awesome",
         "bootstrap.css",
-        "bootstrap.js.bundle",
         "css-vars-ponyfill"
       ],
       "js": []
diff --git a/administrator/templates/atum/js/template.min.js b/administrator/templates/atum/js/template.min.js
deleted file mode 100644
index d32b7de44c31d..0000000000000
--- a/administrator/templates/atum/js/template.min.js
+++ /dev/null
@@ -1 +0,0 @@
-Joomla=window.Joomla||{},function(t,s){"use strict";function a(t,a){var e;["matches","msMatchesSelector"].some(function(t){return"function"==typeof s.body[t]&&(e=t,!0)});for(var c;t;){if((c=t.parentElement)&&c[e](a))return c;t=c}return null}s.addEventListener("joomla:updated",function(t){for(var e=t&&t.target?t.target:s,c=e.querySelectorAll(".btn-group"),d=0;d<c.length;d++)for(var l=c[d].querySelectorAll("label"),i=0;i<l.length;i++)l[i].classList.add("btn"),i%2==1?l[i].classList.add("btn-outline-danger"):l[i].classList.add("btn-outline-success");var n=e.querySelector(".btn-group label:not(.active)");n&&n.addEventListener("click",function(t){var e=s.getElementById(t.target.getAttribute("for"));if("checked"!==e.getAttribute("checked")){var c=a(t.target,".btn-group").querySelector("label");c.classList.remove("active"),c.classList.remove("btn-success"),c.classList.remove("btn-danger"),c.classList.remove("btn-primary"),a(c,".btn-group").classList.contains("btn-group-reversed")?(c.classList.contains("btn")||c.classList.add("btn"),""===e.value?(c.classList.add("active"),c.classList.add("btn"),c.classList.add("btn-outline-primary")):0===e.value?(c.classList.add("active"),c.classList.add("btn"),c.classList.add("btn-outline-success")):(c.classList.add("active"),c.classList.add("btn"),c.classList.add("btn-outline-danger"))):""===e.value?(c.classList.add("active"),c.classList.add("btn"),c.classList.add("btn-outline-primary")):0===e.value?(c.classList.add("active"),c.classList.add("btn"),c.classList.add("btn-outline-danger")):(c.classList.add("active"),c.classList.add("btn"),c.classList.add("btn-outline-success")),e.setAttribute("checked",!0)}});for(var r=e.querySelectorAll(".btn-group input[checked=checked]"),o=(d=0,r.length);o>d;d++){var u=r[d],L=u.id,b=e.querySelector("label[for="+L+"]");u.parentNode.parentNode.classList.contains("btn-group-reversed")?""===u.value?(b.classList.add("active"),b.classList.add("btn"),b.classList.add("btn-outline-primary")):0===u.value?(b.classList.add("active"),b.classList.add("btn"),b.classList.add("btn-outline-success")):(b.classList.add("active"),b.classList.add("btn"),b.classList.add("btn-outline-danger")):""===u.value?(b.classList.add("active"),b.classList.add("btn-outline-primary")):0===u.value?(b.classList.add("active"),b.classList.add("btn"),b.classList.add("btn-outline-danger")):(b.classList.add("active"),b.classList.add("btn"),b.classList.add("btn-outline-success"))}})}(Joomla,document);
\ No newline at end of file
diff --git a/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.ini b/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.ini
index cbed66382d23b..9f1abb5555c2d 100644
--- a/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.ini
+++ b/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.sys.ini b/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.sys.ini
index a3b354fc2e443..ed38f6c1b614d 100644
--- a/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.sys.ini
+++ b/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php
index a93c19ffc65b5..78ef27bd3db64 100644
--- a/administrator/templates/atum/login.php
+++ b/administrator/templates/atum/login.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Templates.Atum
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss
index 99f351a691984..1d6cc533df6cc 100644
--- a/administrator/templates/atum/scss/_variables.scss
+++ b/administrator/templates/atum/scss/_variables.scss
@@ -51,6 +51,7 @@ $colors: (
   sidebar-child-link-color: #cbd6e2,
   login-main-bg: darken(theme-color("primary"), 8%),
   login-light-bg: #3b97f9,
+  form-link-feedback: #cbd8e1,
   border: $gray-400,
   row-selected: #d9edf7,
   white-offset: #fefefe,
@@ -119,8 +120,7 @@ $btn-border-radius-sm:             0;
 
 // Dropdowns
 $dropdown-padding-y:               0;
-$dropdown-border-width:            0;
-$dropdown-link-hover-color:        $white;
+$dropdown-border-width:            1px;
 $dropdown-item-padding-y:          .5rem;
 $dropdown-item-padding-x:          .75rem;
 $dropdown-spacer:                  0;
diff --git a/administrator/templates/atum/scss/blocks/_form.scss b/administrator/templates/atum/scss/blocks/_form.scss
index 2b8cf5abd6b84..5922716934b5c 100644
--- a/administrator/templates/atum/scss/blocks/_form.scss
+++ b/administrator/templates/atum/scss/blocks/_form.scss
@@ -65,6 +65,8 @@ td .form-control {
 
 legend {
   margin-bottom: 1.1rem;
+  font-size: 1rem;
+  font-weight: $normal-weight;
 }
 
 .checkboxes {
diff --git a/administrator/templates/atum/scss/blocks/_header.scss b/administrator/templates/atum/scss/blocks/_header.scss
index b7a3a54384c50..0bbca2e908767 100644
--- a/administrator/templates/atum/scss/blocks/_header.scss
+++ b/administrator/templates/atum/scss/blocks/_header.scss
@@ -56,7 +56,6 @@
   .dropdown-menu {
     min-width: 280px;
     padding: 0;
-    border: 0;
     z-index: 1041;
 
     h2 {
diff --git a/administrator/templates/atum/scss/blocks/_login.scss b/administrator/templates/atum/scss/blocks/_login.scss
index 20d0ea1d56f67..d6c08f44ce97d 100644
--- a/administrator/templates/atum/scss/blocks/_login.scss
+++ b/administrator/templates/atum/scss/blocks/_login.scss
@@ -58,7 +58,7 @@
 
       span {
         font-size: .9rem;
-        color: #c6d2de;
+        color: var(--form-link-feedback);
       }
     }
   }
diff --git a/administrator/templates/atum/scss/blocks/_modals.scss b/administrator/templates/atum/scss/blocks/_modals.scss
index 4ee9aa761f3d7..9477f1fb382b3 100644
--- a/administrator/templates/atum/scss/blocks/_modals.scss
+++ b/administrator/templates/atum/scss/blocks/_modals.scss
@@ -32,7 +32,6 @@
 }
 
 .modal-body {
-  padding: 0;
   overflow-y: auto;
 }
 
@@ -44,3 +43,59 @@
 .contentpane {
   padding: 15px;
 }
+
+// Changelog
+.changelog {
+  text-align: left !important;
+
+  &__item {
+    display: flex;
+    border-bottom: 1px solid $table-border-color;
+
+    @include media-breakpoint-down(sm) {
+      flex-direction: column;
+    }
+  }
+
+  &__tag {
+    flex: 1 0 180px;
+    max-width: 180px;
+    padding: 10px 15px;
+    background: darken($gray-100, 2.5%);
+    border-right: 1px solid $table-border-color;
+    text-align: right;
+
+    .badge {
+      border-radius: .2rem;
+
+      &.badge-jlanguage {
+        background-color: $white;
+      }
+    }
+
+    @include media-breakpoint-down(sm) {
+      flex: 1 0 auto;
+      max-width: 100%;
+      text-align: left;
+      border-right: 0;
+      border-bottom: 1px solid $table-border-color;
+    }
+  }
+
+  &__list {
+    padding: 10px 15px;
+
+    ul {
+      padding-left: 15px;
+      margin-bottom: 0;
+    }
+
+    li {
+      margin-bottom: .15rem;
+
+      &:last-of-type{
+        margin-bottom: 0;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/administrator/templates/atum/scss/blocks/_sidebar-nav.scss b/administrator/templates/atum/scss/blocks/_sidebar-nav.scss
index 581978393f21b..3d1f9a2fa5f68 100644
--- a/administrator/templates/atum/scss/blocks/_sidebar-nav.scss
+++ b/administrator/templates/atum/scss/blocks/_sidebar-nav.scss
@@ -7,7 +7,7 @@
   }
 
   li {
-    padding-bottom: 3px;
+    margin-bottom: .5rem;
     font-size: .9rem;
     font-weight: $bold-weight;
 
diff --git a/administrator/templates/atum/scss/blocks/_toolbar.scss b/administrator/templates/atum/scss/blocks/_toolbar.scss
index 4f1d975f9b057..c1d7ac12435e0 100644
--- a/administrator/templates/atum/scss/blocks/_toolbar.scss
+++ b/administrator/templates/atum/scss/blocks/_toolbar.scss
@@ -56,13 +56,6 @@
     }
   }
 
-  .dropdown-item {
-
-    &:hover {
-      color: #212529;
-    }
-  }
-
   .dropdown-toggle {
 
     &.btn {
diff --git a/administrator/templates/atum/scss/font-awesome.scss b/administrator/templates/atum/scss/font-awesome.scss
index 637c8ec2da717..9e9a25cb3ea05 100644
--- a/administrator/templates/atum/scss/font-awesome.scss
+++ b/administrator/templates/atum/scss/font-awesome.scss
@@ -5,7 +5,7 @@
 @import "../../../../media/vendor/font-awesome/scss/font-awesome";
 
 // B/C for Icomoon
-@import "../../../../build/media/system/scss/icomoon";
+@import "../../../../build/media_source/system/scss/icomoon";
 
 // RTL override
 html[dir=rtl] .pull-right {
diff --git a/administrator/templates/atum/scss/pages/_com_templates.scss b/administrator/templates/atum/scss/pages/_com_templates.scss
index 68d4d4bb06469..47027dc465306 100644
--- a/administrator/templates/atum/scss/pages/_com_templates.scss
+++ b/administrator/templates/atum/scss/pages/_com_templates.scss
@@ -11,13 +11,13 @@
     column-gap: 15px;
 
     > li {
-      display: inline-block;
       width: 100%;
       margin-bottom: 15px;
       vertical-align: top;
       list-style: none;
       backface-visibility: hidden;
       column-break-inside: avoid;
+      page-break-inside: avoid;
     }
   }
 
diff --git a/administrator/templates/atum/scss/template.scss b/administrator/templates/atum/scss/template.scss
index bd0e8032156c3..2191617a84f60 100644
--- a/administrator/templates/atum/scss/template.scss
+++ b/administrator/templates/atum/scss/template.scss
@@ -10,10 +10,10 @@
 @import "../../../../media/vendor/bootstrap/scss/custom-forms";
 
 // Alert
-@import "../../../../build/media/system/scss/jalert";
+@import "../../../../build/media_source/system/scss/jalert";
 
 // jQuery Minicolors
-@import "../../../../build/media/system/scss/jquery-minicolors";
+@import "../../../../build/media_source/system/scss/jquery-minicolors";
 
 // Blocks
 @import "blocks/global"; // Leave this first
@@ -114,4 +114,4 @@
 // Quickicon specific
 .message-alert {
   text-align: right !important;
-}
\ No newline at end of file
+}
diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_dropdown.scss b/administrator/templates/atum/scss/vendor/bootstrap/_dropdown.scss
index 514578a7cfdab..184fa27506d3c 100644
--- a/administrator/templates/atum/scss/vendor/bootstrap/_dropdown.scss
+++ b/administrator/templates/atum/scss/vendor/bootstrap/_dropdown.scss
@@ -9,6 +9,14 @@
   }
 }
 
+.dropdown-menu {
+  box-shadow: $atum-box-shadow;
+}
+
+.dropdown-item {
+  cursor: pointer;
+}
+
 .dropdown-item:hover,
 .dropdown-item:focus {
   .btn-primary + .dropdown-menu  & {
diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_table.scss b/administrator/templates/atum/scss/vendor/bootstrap/_table.scss
index cd5c68fbafc7a..947b62d22ce50 100644
--- a/administrator/templates/atum/scss/vendor/bootstrap/_table.scss
+++ b/administrator/templates/atum/scss/vendor/bootstrap/_table.scss
@@ -8,7 +8,6 @@
       font-weight: $normal-weight;
       color: $gray-800;
       white-space: nowrap;
-      border-bottom: 2px solid $gray-300;
     }
     td {
       padding: 0;
diff --git a/administrator/templates/atum/templateDetails.xml b/administrator/templates/atum/templateDetails.xml
index 78020cf75a683..e96a0f8f5e719 100644
--- a/administrator/templates/atum/templateDetails.xml
+++ b/administrator/templates/atum/templateDetails.xml
@@ -5,7 +5,7 @@
 	<creationDate>16/09/2016</creationDate>
 	<author>Charlie Lodder, Dimitris Grammatikogiannis, Ciaran Walsh, Elisa Foltyn</author>
 	<authorEmail>admin@joomla.org</authorEmail>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.</copyright>
 	<description>TPL_ATUM_XML_DESCRIPTION</description>
 	<files>
 		<filename>component.php</filename>
diff --git a/administrator/templates/system/component.php b/administrator/templates/system/component.php
index 9b093962541ac..8d91f7a8b2d48 100644
--- a/administrator/templates/system/component.php
+++ b/administrator/templates/system/component.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.system
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/system/css/error.css b/administrator/templates/system/css/error.css
index 34a9e2f7430a9..e3fed0f023513 100644
--- a/administrator/templates/system/css/error.css
+++ b/administrator/templates/system/css/error.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/system/css/system.css b/administrator/templates/system/css/system.css
index 68d90eb2a3cec..fcb437b80d5a2 100644
--- a/administrator/templates/system/css/system.css
+++ b/administrator/templates/system/css/system.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/system/error.php b/administrator/templates/system/error.php
index 2f419d03de42e..d04c926fa13b5 100644
--- a/administrator/templates/system/error.php
+++ b/administrator/templates/system/error.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.system
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/system/html/modules.php b/administrator/templates/system/html/modules.php
deleted file mode 100644
index 297c8888591d5..0000000000000
--- a/administrator/templates/system/html/modules.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  Template.system
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\HTML\HTMLHelper;
-
-/*
- * none (output raw module content)
- */
-function modChrome_none($module, &$params, &$attribs)
-{
-	echo $module->content;
-}
-
-/*
- * html5 (chosen html5 tag and font header tags)
- */
-function modChrome_html5($module, &$params, &$attribs)
-{
-	$moduleTag      = $params->get('module_tag');
-	$headerTag      = htmlspecialchars($params->get('header_tag'), ENT_COMPAT, 'UTF-8');
-	$headerClass    = $params->get('header_class');
-	$bootstrapSize  = $params->get('bootstrap_size');
-	$moduleClass    = !empty($bootstrapSize) ? ' span' . (int) $bootstrapSize . '' : '';
-	$moduleClassSfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
-
-	if (!empty ($module->content))
-	{
-		$html  = "<{$moduleTag} class=\"moduletable{$moduleClassSfx} {$moduleClass}\">";
-
-		if ((bool) $module->showtitle)
-		{
-			$html .= "<{$headerTag} class=\"{$headerClass}\">{$module->title}</{$headerTag}>";
-		}
-
-		$html .= $module->content;
-		$html .= "</{$moduleTag}>";
-
-		echo $html;
-	}
-}
-
-/*
- * xhtml (divs and font header tags)
- * With the new advanced parameter it does the same as the html5 chrome
- */
-function modChrome_xhtml($module, &$params, &$attribs)
-{
-	$moduleTag      = $params->get('module_tag', 'div');
-	$headerTag      = htmlspecialchars($params->get('header_tag', 'h3'), ENT_COMPAT, 'UTF-8');
-	$bootstrapSize  = (int) $params->get('bootstrap_size', 0);
-	$moduleClass    = $bootstrapSize != 0 ? ' span' . $bootstrapSize : '';
-
-	// Temporarily store header class in variable
-	$headerClass    = $params->get('header_class');
-	$headerClass    = $headerClass ? ' class="' . htmlspecialchars($headerClass, ENT_COMPAT, 'UTF-8') . '"' : '';
-
-	$content = trim($module->content);
-
-	if (!empty ($content)) : ?>
-		<<?php echo $moduleTag; ?> class="module<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
-			<?php if ($module->showtitle != 0) : ?>
-				<<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
-			<?php endif; ?>
-			<?php echo $content; ?>
-		</<?php echo $moduleTag; ?>>
-	<?php endif;
-}
-
-/*
- * allows sliders
- */
-function modChrome_sliders($module, &$params, &$attribs)
-{
-	$content = trim($module->content);
-
-	if (!empty($content))
-	{
-		echo HTMLHelper::_('sliders.panel', $module->title, 'module' . $module->id);
-		echo $content;
-	}
-}
-
-/*
- * allows tabs
- */
-function modChrome_tabs($module, &$params, &$attribs)
-{
-	$content = trim($module->content);
-
-	if (!empty($content))
-	{
-		echo HTMLHelper::_('tabs.panel', $module->title, 'module' . $module->id);
-		echo $content;
-	}
-}
diff --git a/administrator/templates/system/index.php b/administrator/templates/system/index.php
index 21b4c9f92a310..bb61cbae8d7da 100644
--- a/administrator/templates/system/index.php
+++ b/administrator/templates/system/index.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.system
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/api/components/com_content/Controller/ArticlesController.php b/api/components/com_content/Controller/ArticlesController.php
new file mode 100644
index 0000000000000..92b0f5462ac38
--- /dev/null
+++ b/api/components/com_content/Controller/ArticlesController.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.API
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Content\Api\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\ApiController;
+
+/**
+ * The article controller
+ *
+ * @since  4.0.0
+ */
+class ArticlesController extends ApiController
+{
+	/**
+	 * The content type of the item.
+	 *
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected $contentType = 'articles';
+}
diff --git a/api/components/com_content/View/Articles/JsonapiView.php b/api/components/com_content/View/Articles/JsonapiView.php
new file mode 100644
index 0000000000000..cf04f7ec5d238
--- /dev/null
+++ b/api/components/com_content/View/Articles/JsonapiView.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.API
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Content\Api\View\Articles;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\View\JsonApiView as BaseApiView;
+
+/**
+ * The article controller
+ *
+ * @since  4.0.0
+ */
+class JsonapiView extends BaseApiView
+{
+	/**
+	 * The fields to render in the documents
+	 *
+	 * @var  string
+	 * @since  4.0.0
+	 */
+	protected $fieldsToRender = ['id', 'typeAlias', 'asset_id', 'title', 'introtext', 'state', 'catid', 'created'];
+}
diff --git a/api/includes/app.php b/api/includes/app.php
new file mode 100644
index 0000000000000..de82024d09551
--- /dev/null
+++ b/api/includes/app.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package    Joomla.API
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Saves the start time and memory usage.
+$startTime = microtime(1);
+$startMem  = memory_get_usage();
+
+if (file_exists(dirname(__DIR__) . '/defines.php'))
+{
+	include_once dirname(__DIR__) . '/defines.php';
+}
+
+if (!defined('_JDEFINES'))
+{
+	define('JPATH_BASE', dirname(__DIR__));
+	require_once JPATH_BASE . '/includes/defines.php';
+}
+
+require_once JPATH_BASE . '/includes/framework.php';
+
+// Set profiler start time and memory usage and mark afterLoad in the profiler.
+JDEBUG ? JProfiler::getInstance('Application')->setStart($startTime, $startMem)->mark('afterLoad') : null;
+
+// Boot the DI container
+$container = \Joomla\CMS\Factory::getContainer();
+
+/*
+ * Alias the session service keys to the web session service as that is the primary session backend for this application
+ *
+ * In addition to aliasing "common" service keys, we also create aliases for the PHP classes to ensure autowiring objects
+ * is supported.  This includes aliases for aliased class names, and the keys for alised class names should be considered
+ * deprecated to be removed when the class name alias is removed as well.
+ */
+$container->alias('session', 'session.cli')
+	->alias('JSession', 'session.cli')
+	->alias(\Joomla\CMS\Session\Session::class, 'session.cli')
+	->alias(\Joomla\Session\Session::class, 'session.cli')
+	->alias(\Joomla\Session\SessionInterface::class, 'session.cli');
+
+// Instantiate the application.
+$app = $container->get(\Joomla\CMS\Application\ApiApplication::class);
+
+// Set the application as global app
+\Joomla\CMS\Factory::$application = $app;
+
+// Execute the application.
+$app->execute();
diff --git a/api/includes/defines.php b/api/includes/defines.php
new file mode 100644
index 0000000000000..29245d8df5de3
--- /dev/null
+++ b/api/includes/defines.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package    Joomla.API
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Global definitions
+$parts = explode(DIRECTORY_SEPARATOR, JPATH_BASE);
+array_pop($parts);
+
+// Defines.
+define('JPATH_ROOT',          implode(DIRECTORY_SEPARATOR, $parts));
+define('JPATH_SITE',          JPATH_ROOT);
+define('JPATH_CONFIGURATION', JPATH_ROOT);
+define('JPATH_ADMINISTRATOR', JPATH_ROOT . DIRECTORY_SEPARATOR . 'administrator');
+define('JPATH_LIBRARIES',     JPATH_ROOT . DIRECTORY_SEPARATOR . 'libraries');
+define('JPATH_PLUGINS',       JPATH_ROOT . DIRECTORY_SEPARATOR . 'plugins');
+define('JPATH_INSTALLATION',  JPATH_ROOT . DIRECTORY_SEPARATOR . 'installation');
+define('JPATH_THEMES',        JPATH_BASE . DIRECTORY_SEPARATOR . 'templates');
+define('JPATH_CACHE',         JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'cache');
+define('JPATH_MANIFESTS',     JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'manifests');
+define('JPATH_API',           JPATH_ROOT . DIRECTORY_SEPARATOR . 'api');
diff --git a/api/includes/framework.php b/api/includes/framework.php
new file mode 100644
index 0000000000000..d55daeb367b41
--- /dev/null
+++ b/api/includes/framework.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * @package    Joomla.API
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// System includes
+require_once JPATH_LIBRARIES . '/bootstrap.php';
+
+// Installation check, and check on removal of the install directory.
+if (!file_exists(JPATH_CONFIGURATION . '/configuration.php')
+	|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10)
+	|| (file_exists(JPATH_INSTALLATION . '/index.php') && (false === (new JVersion)->isInDevelopmentState())))
+{
+	if (file_exists(JPATH_INSTALLATION . '/index.php'))
+	{
+		header('HTTP/1.1 500 Internal Server Error');
+		echo json_encode(
+			array('error' => 'You must install Joomla to use the API')
+		);
+
+		exit();
+	}
+	else
+	{
+		header('HTTP/1.1 500 Internal Server Error');
+		echo json_encode(
+			array('error' => 'No configuration file found and no installation code available. Exiting...')
+		);
+
+		exit;
+	}
+}
+
+// Pre-Load configuration. Don't remove the Output Buffering due to BOM issues, see JCode 26026
+ob_start();
+require_once JPATH_CONFIGURATION . '/configuration.php';
+ob_end_clean();
+
+// System configuration.
+$config = new JConfig;
+
+// Set the error_reporting
+switch ($config->error_reporting)
+{
+	case 'default':
+	case '-1':
+		break;
+
+	case 'none':
+	case '0':
+		error_reporting(0);
+
+		break;
+
+	case 'simple':
+		error_reporting(E_ERROR | E_WARNING | E_PARSE);
+		ini_set('display_errors', 1);
+
+		break;
+
+	case 'maximum':
+		error_reporting(E_ALL);
+		ini_set('display_errors', 1);
+
+		break;
+
+	case 'development':
+		error_reporting(-1);
+		ini_set('display_errors', 1);
+
+		break;
+
+	default:
+		error_reporting($config->error_reporting);
+		ini_set('display_errors', 1);
+
+		break;
+}
+
+define('JDEBUG', $config->debug);
+
+unset($config);
+
+// System profiler
+if (JDEBUG)
+{
+	// @deprecated 4.0 - The $_PROFILER global will be removed
+	$_PROFILER = JProfiler::getInstance('Application');
+}
diff --git a/api/index.php b/api/index.php
new file mode 100644
index 0000000000000..dd6d0929c77fa
--- /dev/null
+++ b/api/index.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package    Joomla.API
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * NOTE: This file should remain compatible with PHP 5.2 to allow us to run our PHP minimum check and show a friendly error message
+ */
+
+/**
+ * Define the application's minimum supported PHP version as a constant so it can be referenced within the application.
+ */
+define('JOOMLA_MINIMUM_PHP', '7.0');
+
+if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<'))
+{
+	header('HTTP/1.1 500 Internal Server Error');
+	echo json_encode(
+		array('error' => sprintf('Joomla requires PHP version %s to run', JOOMLA_MINIMUM_PHP))
+	);
+
+	return;
+}
+
+/**
+ * Constant that is checked in included files to prevent direct access.
+ * define() is used rather than "const" to not error for PHP 5.2 and lower
+ */
+define('_JEXEC', 1);
+
+// Run the application - All executable code should be triggered through this file
+require_once dirname(__FILE__) . '/includes/app.php';
diff --git a/appveyor-phpunit.xml b/appveyor-phpunit.xml
deleted file mode 100644
index 0cfebafd21668..0000000000000
--- a/appveyor-phpunit.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="tests/unit/bootstrap.php" colors="true">
-	<php>
-		<const name="JTEST_DATABASE_MYSQLI_DSN" value="host=127.0.0.1;dbname=joomla_ut;user=root;pass=Password12!" />
-		<const name="JTEST_DATABASE_PDO_MYSQL_DSN" value="host=127.0.0.1;dbname=joomla_ut;user=root;pass=Password12!" />
-		<const name="JTEST_DATABASE_POSTGRESQL_DSN" value="host=127.0.0.1;port=5432;dbname=joomla_ut;user=postgres;pass=Password12!" />
-		<const name="JTEST_DATABASE_SQLSRV_DSN" value="host=(local)\SQL2014;dbname=joomla_ut;user=sa;pass=Password12!" />
-		<!-- <const name="JTEST_HTTP_STUB" value="http://localhost/tests/unit/stubs/jhttp_stub.php" /> -->
-	</php>
-
-	<testsuites>
-		<testsuite name="libraries-cms">
-			<directory>tests/unit/suites/libraries/cms</directory>
-		</testsuite>
-		<testsuite name="libraries-platform">
-			<directory>tests/unit/suites/libraries/joomla</directory>
-		</testsuite>
-		<testsuite name="libraries-legacy">
-			<directory>tests/unit/suites/libraries/legacy</directory>
-		</testsuite>
-		<testsuite name="administrator">
-			<directory>tests/unit/suites/administrator</directory>
-		</testsuite>
-		<testsuite name="FinderIndexer">
-			<directory>tests/unit/suites/finderIndexer</directory>
-		</testsuite>
-		<testsuite name="plugins">
-			<directory>tests/unit/suites/plugins</directory>
-		</testsuite>
-	</testsuites>
-</phpunit>
diff --git a/build.js b/build.js
index 2e35f4e0f7edd..9af96600073f5 100644
--- a/build.js
+++ b/build.js
@@ -6,12 +6,10 @@
  * npm install
  *
  * For dedicated tasks, please run:
- * node build.js --buildcheck     === will create the error page (for incomplete repo build)
- * node build.js --installer       === will create the error page (for unsupported PHP version)
- * node build.js --copy-assets     === will clean the media/vendor folder and then will populate the folder from node_modules
- * node build.js --compile-js      === will transpile ES6 files and also uglify the ES6,ES5 files
- * node build.js --compile-ce      === will compile all the given CE or WC with their relative css files
- * node build.js --compile-css     === will compile all the scss defined files and also create a minified version of the css
+ * node build.js --build-pages  === will create the error pages (for incomplete repo build PHP+NPM)
+ * node build.js --copy-assets  === will clean the media/vendor folder and then will populate the folder from node_modules
+ * node build.js --compile-js   === will transpile ES6 files and also uglify the ES6,ES5 files
+ * node build.js --compile-css  === will compile all the scss defined files and also create a minified version of the css
  *
  */
 
@@ -20,12 +18,12 @@ const Program = require('commander');
 // eslint-disable-next-line import/no-extraneous-dependencies
 
 // Joomla Build modules
-const buildCheck = require('./build/build-modules-js/build-check');
-const copyAssets = require('./build/build-modules-js/update');
-const compileCSS = require('./build/build-modules-js/compilescss');
-const compileJS = require('./build/build-modules-js/compilejs');
-const compileWebComponents = require('./build/build-modules-js/compilecejs');
-const minifyVendor = require('./build/build-modules-js/minify-vendor');
+const errorPages = require('./build/build-modules-js/error-pages.es6.js');
+const init = require('./build/build-modules-js/init.es6.js');
+const compileCSS = require('./build/build-modules-js/compilecss.es6.js');
+const compileJS = require('./build/build-modules-js/compilejs.es6.js');
+const minifyVendor = require('./build/build-modules-js/javascript/minify-vendor.es6.js');
+const watch = require('./build/build-modules-js/watch.es6.js');
 
 // The settings
 const options = require('./package.json');
@@ -40,11 +38,10 @@ if ('settings' in settings) {
 Program
   .version(options.version)
   .option('--copy-assets', 'Moving files from node_modules to media folder')
-  .option('--compile-js, --compile-js path', 'Compiles ES6 to ES5 scripts')
+  .option('--build-pages', 'Creates the error pages for unsupported PHP version & incomplete environment')
+  .option('--compile-js, --compile-js path', 'Handles ES6, ES5 and web component scripts')
   .option('--compile-css, --compile-css path', 'Compiles all the scss files to css')
-  .option('--compile-ce, --compile-ce path', 'Compiles/traspiles all the custom elements files')
-  .option('--watch, --watch path', 'Watch file changes and re-compile (Only work for compile-css and compile-js now).')
-  .option('--build-check', 'Creates the error pages for unsupported PHP version & incomplete environment')
+  .option('--watch', 'Watch file changes and re-compile (ATM only works for the js in the media_source).')
   .on('--help', () => {
     // eslint-disable-next-line no-console
     console.log(`Version: ${options.version}`);
@@ -62,7 +59,7 @@ if (!process.argv.slice(2).length) {
 // Update the vendor folder
 if (Program.copyAssets) {
   Promise.resolve()
-    .then(copyAssets.copyAssets(options))
+    .then(init.copyAssets(options))
     .then(minifyVendor.compile(options))
 
     // Exit with success
@@ -78,29 +75,30 @@ if (Program.copyAssets) {
 
 
 // Creates the error pages for unsupported PHP version & incomplete environment
-if (Program.buildCheck) {
-    buildCheck.buildCheck(options);
+if (Program.buildPages) {
+  Promise.resolve()
+    .then(() => {
+      errorPages.run(options);
+      })
+    // Handle errors
+    .catch((err) => {
+      // eslint-disable-next-line no-console
+      console.error(err);
+      process.exit(-1);
+    });
 }
 
 // Convert scss to css
 if (Program.compileCss) {
-  if (Program.watch) {
-    compileCSS.watch(options, null, true);
-  } else {
-    compileCSS.compileCSS(options, Program.args[0]);
-  }
+  compileCSS.compile(options, Program.args[0]);
 }
 
 // Compress/transpile the javascript files
 if (Program.compileJs) {
-  if (Program.watch) {
-    compileJS.watch(options, null, false);
-  } else {
-    compileJS.compileJS(options, Program.args[0]);
-  }
+  compileJS.compileJS(options, Program.args[0]);
 }
 
-// Compress/transpile the Custom Elements files
-if (Program.compileCe) {
-  compileWebComponents.compile(options, Program.args[0]);
+// Compress/transpile the javascript files
+if (Program.watch) {
+  watch.run();
 }
diff --git a/build/build-modules-js/babel.js b/build/build-modules-js/babel.js
deleted file mode 100644
index 18f0f705043fa..0000000000000
--- a/build/build-modules-js/babel.js
+++ /dev/null
@@ -1,30 +0,0 @@
-const Babel = require('@babel/core');
-const Fs = require('fs');
-
-/**
- *
- * @param fileContents  the content of the file to be transpiled
- * @param settings      the settings for the transpiler
- * @param output        the full pat + filename + extension of the trnspiled file
- */
-module.exports.run = (fileContents, settings, output) => {
-    Babel.transform(fileContents, settings, (error, result) => {
-        if (error) {
-            // eslint-disable-next-line no-console
-            console.error(`${error}`);
-            process.exit(1);
-        }
-
-        Fs.writeFile(
-            output,
-            result.code, // + os.EOL
-            (fsError) => {
-                if (fsError) {
-                    // eslint-disable-next-line no-console
-                    console.error(`${fsError}`);
-                    process.exit(1);
-                }
-            }
-        );
-    });
-};
diff --git a/build/build-modules-js/compile-es6.js b/build/build-modules-js/compile-es6.js
deleted file mode 100644
index e413b22ece377..0000000000000
--- a/build/build-modules-js/compile-es6.js
+++ /dev/null
@@ -1,67 +0,0 @@
-const Babel = require('./babel.js');
-const Fs = require('fs');
-const MakeDir = require('./make-dir.js');
-const Path = require('path');
-
-const headerText = `PLEASE DO NOT MODIFY THIS FILE. WORK ON THE ES6 VERSION.
-OTHERWISE YOUR CHANGES WILL BE REPLACED ON THE NEXT BUILD.`;
-
-// Predefine some settings
-const settings = [
-    {
-        presets: [
-            ['@babel/preset-env', {
-                targets: {
-                    browsers: ["ie 11"]
-                },
-                modules: false
-            }],
-        ],
-        plugins: [
-            ['add-header-comment', { header: [headerText] }],
-            ['@babel/plugin-transform-classes']
-        ],
-        comments: true
-    },
-    {
-    presets: [
-        ['@babel/preset-env', {
-            targets: {
-                browsers: ["ie 11"]
-            },
-            modules: false
-        }],
-        "minify"
-    ],
-    plugins: [
-        ['@babel/plugin-transform-classes']
-    ],
-    comments: false
-}
-];
-
-/**
- * Compiles es6 files to es5.
- *
- * @param file the full path to the file + filename + extension
- */
-const compileFile = (file) => {
-  const filePath = file.slice(0, -7);
-
-  const outputFiles = [
-    `${filePath.replace('/build/media_src/', '/media/').replace('\\build\\media_src\\', '\\media\\')}.js`,
-    `${filePath.replace('/build/media_src/', '/media/').replace('\\build\\media_src\\', '\\media\\')}.min.js`
-  ];
-
-  // Ensure that the directories exist or create them
-  MakeDir.run(Path.dirname(file).replace('/build/media_src/', '/media/'));
-
-  // Get the contents of the ES-XXXX file
-  let es6File = Fs.readFileSync(file, 'utf8');
-
-  settings.forEach((setting, index) => {
-      Babel.run(es6File, setting, outputFiles[index])
-  });
-};
-
-module.exports.compileFile = compileFile;
diff --git a/build/build-modules-js/compilecejs.js b/build/build-modules-js/compilecejs.js
deleted file mode 100644
index 4f998ce4da452..0000000000000
--- a/build/build-modules-js/compilecejs.js
+++ /dev/null
@@ -1,190 +0,0 @@
-const Autoprefixer = require('autoprefixer');
-const Babel = require('./babel.js');
-const CssNano = require('cssnano');
-const Fs = require('fs');
-const FsExtra = require('fs-extra');
-const Postcss = require('postcss');
-const Promise = require('bluebird');
-const Sass = require('node-sass');
-const RootPath = require('./rootpath.js')._();
-
-const createJsFiles = (element, es6File) => {
-    // Define some settings
-    const settings = [
-        {
-            presets: [
-                ['@babel/preset-env', {
-                    "targets": {
-                        "browsers": ["last 1 Chrome version"]
-                    }
-                }],
-            ],
-            "comments": true
-        },
-        {
-            presets: [
-                ['@babel/preset-env', {
-                    "targets": {
-                        "browsers": ["last 1 Chrome version"]
-                    }
-                }],
-                ['minify']
-            ],
-            "comments": false
-        },
-        {
-            presets: [
-                ['@babel/preset-env', {
-                    'targets': {
-                        'browsers': ["ie 11"]
-                    }
-                }],
-            ],
-            plugins: [
-                '@babel/plugin-transform-classes'
-            ],
-            'comments': true
-
-        },
-        {
-            presets: [
-
-                ['@babel/preset-env', {
-                    targets: {
-                        browsers: ["ie 11"]
-                    }
-                }],
-                ['minify']
-            ],
-            plugins:[
-                ['@babel/plugin-transform-classes'],
-            ],
-            "comments": false
-
-        }
-    ];
-
-    const outputFiles = [
-        `${RootPath}/media/system/webcomponents/js/joomla-${element}.js`,
-        `${RootPath}/media/system/webcomponents/js/joomla-${element}.min.js`,
-        `${RootPath}/media/system/webcomponents/js/joomla-${element}-es5.js`,
-        `${RootPath}/media/system/webcomponents/js/joomla-${element}-es5.min.js`,
-    ];
-
-    settings.forEach((setting, index) => {
-        Babel.run(es6File, setting, outputFiles[index])
-    });
-};
-
-const compile = (options) => {
-    // Make sure that the dist paths exist
-    if (!Fs.existsSync(`${RootPath}/media/system/webcomponents`)) {
-        FsExtra.mkdirSync(`${RootPath}/media/system/webcomponents`);
-    }
-    if (!Fs.existsSync(`${RootPath}/media/system/webcomponents/js`)) {
-        FsExtra.mkdirSync(`${RootPath}/media/system/webcomponents/js`);
-    }
-
-    if (!Fs.existsSync(`${RootPath}/media/system/webcomponents/css`)) {
-        Fs.mkdirSync(`${RootPath}/media/system/webcomponents/css`);
-    }
-
-    options.settings.elements.forEach((element) => {
-        // Get the contents of the ES-XXXX file
-        let es6File = Fs.readFileSync(`${RootPath}/build/media/webcomponents/js/${element}/${element}.js`, 'utf8');
-        // Check if there is a css file
-        if (Fs.existsSync(`${RootPath}/build/media/webcomponents/scss/${element}/${element}.scss`)) {
-            if (!Fs.existsSync(`${RootPath}/build/media/webcomponents/scss/${element}/${element}.scss`)) {
-                return;
-            }
-
-            Sass.render({
-                file: `${RootPath}/build/media/webcomponents/scss/${element}/${element}.scss`,
-            }, (error, result) => {
-                if (error) {
-                    // eslint-disable-next-line no-console
-                    console.error(`${error.column}`);
-                    // eslint-disable-next-line no-console
-                    console.error(`${error.message}`);
-                    // eslint-disable-next-line no-console
-                    console.error(`${error.line}`);
-                } else {
-                    // Auto prefixing
-                    // eslint-disable-next-line no-console
-                    console.log(`Creating /media/system/webcomponents/css/joomla-${element}`);
-                    console.log(`Prefixing for: ${options.settings.browsers}`);
-
-                    const cleaner = Postcss(
-                        [
-                            Autoprefixer({
-                                env: {
-                                    targets: {
-                                        browsers: [options.settings.browsers]
-                                    },
-                                }
-                            }),
-                        ],
-                    );
-
-                    if (typeof result === 'object' && result.css) {
-                        cleaner.process(result.css.toString(), {from: undefined})
-                            .then((res) => {
-                                if (/{{CSS_CONTENTS_PLACEHOLDER}}/.test(es6File)) {
-                                    if (typeof res === 'object' && res.css) {
-                                        Postcss([CssNano]).process(res.css.toString(), {from: undefined}).then(cssMin => {
-                                            es6File = es6File.replace('{{CSS_CONTENTS_PLACEHOLDER}}', cssMin.css.toString());
-                                            createJsFiles(element, es6File);
-                                        });
-                                    }
-                                } else {
-                                    if (typeof res === 'object' && res.css) {
-                                        Fs.writeFileSync(
-                                            `${RootPath}/media/system/webcomponents/css/joomla-${element}.css`,
-                                            res.css.toString(),
-                                            { encoding: 'UTF-8' },
-                                        );
-                                        Postcss([CssNano]).process(res.css.toString(), {from: undefined}).then(cssMin => {
-                                            Fs.writeFileSync(
-                                                `${RootPath}/media/system/webcomponents/css/joomla-${element}.min.css`,
-                                                cssMin.css.toString(),
-                                                { encoding: 'UTF-8' },
-                                            );
-                                        });
-                                    }
-
-                                    createJsFiles(element, es6File);
-                                }
-                            })
-
-                            // Handle errors
-                            .catch((err) => {
-                                // eslint-disable-next-line no-console
-                                console.error(`${err}`);
-                                process.exit(-1);
-                            });
-
-                        return ;
-                        // eslint-disable-next-line no-console
-                        console.log(`joomla-${element} was updated.`);
-                    }
-                }
-            });
-        } else {
-            createJsFiles(element, es6File);
-        }
-    });
-};
-
-const compileCEjs = (options, path) => {
-    Promise.resolve()
-        .then(() => compile(options, path))
-
-        // Handle errors
-        .catch((err) => {
-            // eslint-disable-next-line no-console
-            console.error(`${err}`);
-            process.exit(-1);
-        });
-};
-
-module.exports.compile = compileCEjs;
diff --git a/build/build-modules-js/compilecss.es6.js b/build/build-modules-js/compilecss.es6.js
new file mode 100644
index 0000000000000..76c4097283cf1
--- /dev/null
+++ b/build/build-modules-js/compilecss.es6.js
@@ -0,0 +1,110 @@
+const Fs = require('fs');
+const Path = require('path');
+const Recurs = require('recursive-readdir');
+const UglyCss = require('uglifycss');
+const MakeDir = require('./utils/make-dir.es6.js');
+const CompileScss = require('./stylesheets/scss-transform.es6.js');
+const RootPath = require('./utils/rootpath.es6.js')._();
+
+/**
+ * Method that will crawl the media_source folder and
+ * compile any scss files to css and .min.css
+ * copy any css files to the appropriate destination and
+ * minify them in place
+ *
+ * Expects scss files to have ext: .scss
+ *         css files to have ext: .css
+ * Ignores scss files that their filename starts with `_`
+ *
+ * @param {object} options  The options
+ * @param {string} path     The folder that needs to be compiled, optional
+ */
+module.exports.compile = (options, path) => {
+  Promise.resolve()
+  // Compile the scss files
+    .then(() => {
+      let files = [];
+      let folders = [];
+
+      if (path) {
+        const stats = Fs.lstatSync(`${RootPath}/${path}`);
+
+        if (stats.isDirectory()) {
+          folders.push(`${RootPath}/${path}`);
+        } else if (stats.isFile()) {
+          files.push(`${RootPath}/${path}`);
+        } else {
+          // eslint-disable-next-line no-console
+          console.error(`Unknown path ${path}`);
+          process.exit(1);
+        }
+      } else {
+        files = [
+          `${RootPath}/templates/cassiopeia/scss/offline.scss`,
+          `${RootPath}/templates/cassiopeia/scss/template.scss`,
+          `${RootPath}/templates/cassiopeia/scss/template-rtl.scss`,
+          `${RootPath}/administrator/templates/atum/scss/bootstrap.scss`,
+          `${RootPath}/administrator/templates/atum/scss/font-awesome.scss`,
+          `${RootPath}/administrator/templates/atum/scss/template.scss`,
+          `${RootPath}/administrator/templates/atum/scss/template-rtl.scss`,
+          `${RootPath}/installation/template/scss/template.scss`,
+          `${RootPath}/installation/template/scss/template-rtl.scss`,
+        ];
+
+        folders = [
+          `${RootPath}/build/media_source`,
+        ];
+      }
+
+      // Loop to get the files that should be compiled via parameter
+      folders.forEach((folder) => {
+        Recurs(folder, ['*.js', '*.map', '*.svg', '*.png', '*.gif', '*.swf', '*.html', '*.json']).then(
+          (filesRc) => {
+            filesRc.forEach(
+              (file) => {
+                // Don't take files with "_" but "file" has the full path, so check via match
+                if (file.match(/\.scss$/) && !file.match(/(\/|\\)_[^/\\]+$/)) {
+                  files.push(file);
+                }
+                if (file.match(/\.css/)) {
+                  // CSS file, we will copy the file and then minify it in place
+                  // Ensure that the directories exist or create them
+                  MakeDir.run(Path.dirname(file).replace('/build/media_source/', '/media/').replace('\\build\\media_source\\', '\\media\\'));
+                  Fs.copyFileSync(file, file.replace('/build/media_source/', '/media/').replace('\\build\\media_source\\', '\\media\\'));
+                  Fs.writeFileSync(
+                    file.replace('/build/media_source/', '/media/').replace('\\build\\media_source\\', '\\media\\').replace('.css', '.min.css'),
+                    UglyCss.processFiles([file], { expandVars: false }),
+                    { encoding: 'utf8' },
+                  );
+
+                  // eslint-disable-next-line no-console
+                  console.log(`CSS file copied/minified: ${file}`);
+                }
+              },
+              (error) => {
+                // eslint-disable-next-line no-console
+                console.error(`something exploded ${error}`);
+              },
+            );
+
+            return files;
+          },
+        ).then(
+          (scssFiles) => {
+            scssFiles.forEach(
+              (inputFile) => {
+                CompileScss.compile(inputFile, options);
+              },
+            );
+          },
+        );
+      });
+    })
+
+    // Handle errors
+    .catch((error) => {
+      // eslint-disable-next-line no-console
+      console.error(`${error}`);
+      process.exit(1);
+    });
+};
diff --git a/build/build-modules-js/compilejs.es6.js b/build/build-modules-js/compilejs.es6.js
new file mode 100644
index 0000000000000..0ab6f17f270d1
--- /dev/null
+++ b/build/build-modules-js/compilejs.es6.js
@@ -0,0 +1,63 @@
+const Fs = require('fs');
+const Recurs = require('recursive-readdir');
+const HandleFile = require('./javascript/handle-file.es6.js');
+const RootPath = require('./utils/rootpath.es6.js')._();
+
+/**
+ * Method that will crawl the media_source folder and
+ * compile ES6 to ES5 and ES6
+ * copy any ES5 files to the appropriate destination and
+ * minify them in place
+ * compile any custom elements/webcomponents
+ *
+ * Expects ES6 files to have ext: .es6.js
+ *         ES5 files to have ext: .es5.js
+ *         WC/CE files to have ext: .w-c.es6.js
+ *
+ * @param { object } options The options from settings.json
+ * @param { string } path    The folder that needs to be compiled, optional
+ */
+module.exports.compileJS = (options, path) => {
+  Promise.resolve(options, path)
+    // Compile the scss files
+    .then(() => {
+      let folders = [];
+      if (path) {
+        const stats = Fs.lstatSync(`${RootPath}/${path}`);
+
+        if (!stats.isDirectory()) {
+          // @todo: allow to compile single file
+          throw new Error(`Path should be a directory: ${path}`);
+        }
+
+        folders.push(`${RootPath}/${path}`);
+      } else {
+        folders = [
+          `${RootPath}/build/media_source`,
+          `${RootPath}/templates/cassiopeia/js`,
+        ];
+      }
+
+      // Loop to get some text for the packgage.json
+      folders.forEach((folder) => {
+        Recurs(folder, ['*.min.js', '*.map', '*.scss', '*.css', '*.svg', '*.png', '*.swf', '*.gif', '*.json']).then(
+          (files) => {
+            files.forEach(
+              (file) => {
+                HandleFile.run(file, options);
+              },
+              (error) => {
+                // eslint-disable-next-line no-console
+                console.error(`something exploded ${error}`);
+              },
+            );
+          },
+        );
+      });
+    })
+
+    // Handle errors
+    .catch((error) => {
+      throw new Error(`${error}`);
+    });
+};
diff --git a/build/build-modules-js/compilejs.js b/build/build-modules-js/compilejs.js
deleted file mode 100644
index b5e58b08aa633..0000000000000
--- a/build/build-modules-js/compilejs.js
+++ /dev/null
@@ -1,114 +0,0 @@
-const Debounce = require('lodash.debounce');
-const Fs = require('fs');
-const Promise = require('bluebird');
-const Recurs = require('recursive-readdir');
-const RootPath = require('./rootpath.js')._();
-const TranspileJs = require('./compile-es6.js');
-const UglifyJS = require('uglify-es');
-
-const watches = [
-  `${RootPath}/media`,
-  `${RootPath}/administrator/templates/atum/js`,
-  `${RootPath}/templates/cassiopeia/js`,
-];
-
-const uglifyJs = (options, path) => {
-  let folders = [];
-  if (path) {
-    const stats = Fs.lstatSync(`${RootPath}/${path}`);
-
-    if (!stats.isDirectory()) {
-      // @todo: allow to compile single file
-      throw new Error(`Path should be a directory: ${path}`);
-    }
-
-    folders.push(`${RootPath}/${path}`);
-  } else {
-    folders = [
-      `${RootPath}/build/media_src`,
-      `${RootPath}/administrator/templates/atum/js`,
-      `${RootPath}/templates/cassiopeia/js`,
-    ];
-  }
-
-  // Loop to get some text for the packgage.json
-  folders.forEach((folder) => {
-    Recurs(folder, ['*.min.js', '*.map', '*.scss', '*.css', '*.svg', '*.png', '*.swf', '*.json']).then(
-      (files) => {
-        files.forEach(
-            (file) => {
-                if (file.match(/\.es6\.js/)) {
-                    // Transpile the file
-                    TranspileJs.compileFile(file);
-                } else {
-                    Fs.writeFileSync(file.replace('.js', '.min.js'), UglifyJS.minify(Fs.readFileSync(file, 'utf8')).code, { encoding: 'utf8' });
-                }
-          },
-          (error) => {
-            // eslint-disable-next-line no-console
-            console.error(`something exploded ${error}`);
-          },
-        );
-      });
-  });
-};
-
-const watchFiles = (options, folders, compileFirst = false) => {
-  const folderz = folders || watches;
-
-  if (compileFirst) {
-    uglifyJs(options);
-  }
-
-  folderz.forEach(
-  	(folder) => {
-      Recurs(folder, ['*.min.js', '*.map', '*.css', 'scss', '*.svg', '*.png', '*.swf', '*.json']).then(
-        (files) => {
-          files.forEach(
-            (file) => {
-              if (file.match(/\.js/)) {
-                Fs.watchFile(file, () => {
-                  // eslint-disable-next-line no-console
-                  console.warn(`File: ${file} changed.`);
-                  Debounce(() => {
-                    if (file.match(/\.es6\.js/)) {
-                      // Transpile the file
-                      TranspileJs.compileFile(file);
-                    } else {
-                        Fs.writeFileSync(file.replace('.js', '.min.js'), UglifyJS.minify(Fs.readFileSync(file, 'utf8')).code, { encoding: 'utf8' });
-                    }
-                  }, 150)();
-
-                  // eslint-disable-next-line no-console
-                  console.log(`${file} was updated.`);
-                });
-              }
-            },
-            (error) => {
-                // eslint-disable-next-line no-console
-                console.error(`${error}`);
-                process.exit(1);
-            },
-          );
-        }
-      );
-    }
-  );
-
-  // eslint-disable-next-line no-console
-  console.log(`Now watching JS files...`);
-};
-
-const compileJS = (options, path) => {
-  Promise.resolve()
-    // Compile the scss files
-    .then(() => uglifyJs(options, path))
-
-    // Handle errors
-    .catch((error) => {
-      throw new Error(`${error}`);
-    });
-};
-
-module.exports.compileJS = compileJS;
-module.exports.watch = watchFiles;
diff --git a/build/build-modules-js/compilescss.js b/build/build-modules-js/compilescss.js
deleted file mode 100644
index 1c45e4c8247ec..0000000000000
--- a/build/build-modules-js/compilescss.js
+++ /dev/null
@@ -1,192 +0,0 @@
-const Autoprefixer = require('autoprefixer');
-const CssNano = require('cssnano');
-const Debounce = require('lodash.debounce');
-const Fs = require('fs');
-const MakeDir = require('./make-dir.js');
-const Path = require('path');
-const Postcss = require('postcss');
-const Promise = require('bluebird');
-const Recurs = require('recursive-readdir');
-const RootPath = require('./rootpath.js')._();
-const Sass = require('node-sass');
-
-/**
- * A collection of folders to be watched
- * @type {string[]}
- */
-const watches = [
-  `${RootPath}/templates/cassiopeia/scss`,
-  `${RootPath}/administrator/templates/atum/scss`,
-  `${RootPath}/build/media_src`,
-  `${RootPath}/installation/template/scss/template.scss`,
-  `${RootPath}/installation/template/scss/template-rtl.scss`,
-];
-
-const compile = (file, options) => {
-  const cssFile = file.replace('/scss/', '/css/').replace('.scss', '.css').replace('/build/media_src/', '/media/');
-
-  Sass.render({
-    file,
-  }, (error, result) => {
-    if (error) {
-      // eslint-disable-next-line no-console
-      console.error(`something exploded ${error.column}`, error.message, error.line);
-      process.exit(1);
-    } else {
-      // Auto prefixing
-      // eslint-disable-next-line no-console
-      console.log(`Prefixing for: ${options.settings.browsers}`);
-
-      const cleaner = Postcss(
-        [
-          Autoprefixer({
-            browsers: options.settings.browsers,
-          }),
-        ],
-      );
-
-      cleaner.process(result.css.toString(), {from: undefined})
-        .then((res) => {
-          // Ensure the folder exists or create it
-          MakeDir.run(Path.dirname(cssFile));
-
-          Fs.writeFileSync(
-            cssFile,
-            res.css.toString(),
-            { encoding: 'UTF-8' },
-          );
-
-          Postcss([CssNano]).process(res.css.toString(), {from: undefined}).then(cssMin => {
-            // Ensure the folder exists or create it
-            MakeDir.run(Path.dirname(cssFile.replace('.css', '.min.css')));
-            Fs.writeFileSync(
-              cssFile.replace('.css', '.min.css'),
-              cssMin.css.toString(),
-              { encoding: 'UTF-8' },
-            );
-
-            // eslint-disable-next-line no-console
-            console.log(`File: ${cssFile.replace(/.+\//, '')} was updated. `);
-          });
-        });
-    }
-  });
-};
-
-/**
- *
- * @param {object} options  the options
- * @param {string} path   the folder that needs to be compiled, optional
- */
-const compileCSSFiles = (options, path) => {
-  let files = [];
-  let folders = [];
-
-  if (path) {
-    const stats = Fs.lstatSync(`${RootPath}/${path}`);
-
-    if (stats.isDirectory()) {
-      folders.push(`${RootPath}/${path}`);
-    } else if (stats.isFile()) {
-      files.push(`${RootPath}/${path}`);
-    } else {
-      // eslint-disable-next-line no-console
-      console.error(`Unknown path ${path}`);
-      process.exit(1);
-    }
-  } else {
-    files = [
-      `${RootPath}/templates/cassiopeia/scss/offline.scss`,
-      `${RootPath}/templates/cassiopeia/scss/template.scss`,
-      `${RootPath}/templates/cassiopeia/scss/template-rtl.scss`,
-      `${RootPath}/administrator/templates/atum/scss/bootstrap.scss`,
-      `${RootPath}/administrator/templates/atum/scss/font-awesome.scss`,
-      `${RootPath}/administrator/templates/atum/scss/template.scss`,
-      `${RootPath}/administrator/templates/atum/scss/template-rtl.scss`,
-      `${RootPath}/installation/template/scss/template.scss`,
-      `${RootPath}/installation/template/scss/template-rtl.scss`,
-    ];
-
-    folders = [
-      `${RootPath}/build/media_src`,
-    ];
-  }
-
-  // Loop to get the files that should be compiled via parameter
-  folders.forEach((folder) => {
-    Recurs(folder, ['*.js', '*.map', '*.css', '*.svg', '*.png', '*.swf', '*.json']).then(
-      (filesRc) => {
-        filesRc.forEach(
-          (filez) => {
-            if (filez.match(/\.scss/) && filez.charAt(0) !== '_') {
-              files.push(filez);
-            }
-          },
-          (error) => {
-            // eslint-disable-next-line no-console
-            console.error(`something exploded ${error}`);
-          },
-        );
-
-        files.forEach((file) => {
-          compile(file, options);
-        });
-      });
-  });
-
-  // Loop to get some text for the packgage.json
-
-};
-
-/**
- * The watch method
- * @param {object}  options     the options
- * @param {array}   folders     an array of folders to be watched
- * @param {boolean} compileFirst
- */
-const watchFiles = (options, folders, compileFirst = false) => {
-  const folderz = folders || watches;
-
-  if (compileFirst) {
-    compileCSSFiles(options, '');
-  }
-
-  folderz.forEach((folder) => {
-    Recurs(folder, ['*.css', '*.map', '*.js', '*.svg', '*.png', '*.swf']).then(
-      (files) => {
-        files.forEach((file) => {
-            if (file.match(/\.scss/)) {
-              Fs.watchFile(file, () => {
-                // eslint-disable-next-line no-console
-                console.log(`File: ${file} changed.`);
-                Debounce(() => compileCSSFiles(options, ''), 150)();
-              });
-            }
-          },
-          (error) => {
-            // eslint-disable-next-line no-console
-            console.error(`something exploded ${error}`);
-          },
-        );
-      });
-  });
-
-  // eslint-disable-next-line no-console
-  console.log('Now watching SASS files...');
-};
-
-const compileCSS = (options, path) => {
-  Promise.resolve()
-    // Compile the scss files
-    .then(() => compileCSSFiles(options, path))
-
-    // Handle errors
-    .catch((error) => {
-      // eslint-disable-next-line no-console
-      console.error(`${error}`);
-      process.exit(1);
-    });
-};
-
-module.exports.compileCSS = compileCSS;
-module.exports.watch = watchFiles;
diff --git a/build/build-modules-js/build-check.js b/build/build-modules-js/error-pages.es6.js
similarity index 59%
rename from build/build-modules-js/build-check.js
rename to build/build-modules-js/error-pages.es6.js
index a4341dcba2aa9..efab9aead60d1 100644
--- a/build/build-modules-js/build-check.js
+++ b/build/build-modules-js/error-pages.es6.js
@@ -3,7 +3,7 @@ const Ini = require('ini');
 const Recurs = require('recursive-readdir');
 const UglifyCss = require('uglifycss');
 const UglifyJs = require('uglify-es');
-const RootPath = require('./rootpath.js')._();
+const RootPath = require('./utils/rootpath.es6.js')._();
 
 const dir = `${RootPath}/installation/language`;
 const srcPath = `${RootPath}/build/warning_page`;
@@ -22,8 +22,8 @@ let unsupported = 'window.errorLocale = {';
  * And also specific strings in the languages in the installation folder!
  * Also the base strings are held in build/build-modules-js/settings.json
  */
-const buildCheck = (options) => {
-  let initTemplate = Fs.readFileSync(`${srcPath}/template.html`, 'utf-8');
+module.exports.run = (options) => {
+  const initTemplate = Fs.readFileSync(`${srcPath}/template.html`, 'utf-8');
   let cssContent = Fs.readFileSync(`${srcPath}/template.css`, 'utf-8');
   let jsContent = Fs.readFileSync(`${srcPath}/template.js`, 'utf-8');
 
@@ -32,34 +32,40 @@ const buildCheck = (options) => {
 
   Recurs(dir).then(
     (files) => {
-      files.forEach((file) => {
+      files.sort().forEach((file) => {
         const languageStrings = Ini.parse(Fs.readFileSync(file, 'UTF-8'));
 
         // Build the variables into json for the unsupported page
         if (languageStrings.MIN_PHP_ERROR_LANGUAGE) {
           const name = file.replace('.ini', '').replace(/.+\//, '').replace(/.+\\/, '');
-          unsupported += `"${name}":{"language":"${languageStrings.MIN_PHP_ERROR_LANGUAGE}","header":"${languageStrings.MIN_PHP_ERROR_HEADER}","text1":"${languageStrings.MIN_PHP_ERROR_TEXT}","help-url-text":"${languageStrings.MIN_PHP_ERROR_URL_TEXT}"},`;
+          unsupported += `"${name}":{"language":"${languageStrings.MIN_PHP_ERROR_LANGUAGE}",`
+                      + `"header":"${languageStrings.MIN_PHP_ERROR_HEADER}",`
+                      + `"text1":"${languageStrings.MIN_PHP_ERROR_TEXT}",`
+                      + `"help-url-text":"${languageStrings.MIN_PHP_ERROR_URL_TEXT}"},`;
         }
 
         // Build the variables into json for the unsupported page
         if (languageStrings.BUILD_INCOMPLETE_LANGUAGE) {
           const name = file.replace('.ini', '').replace(/.+\//, '').replace(/.+\\/, '');
-          incomplete += `"${name}":{"language":"${languageStrings.BUILD_INCOMPLETE_LANGUAGE}","header":"${languageStrings.BUILD_INCOMPLETE_HEADER}","text1":"${languageStrings.BUILD_INCOMPLETE_TEXT}","help-url-text":"${languageStrings.BUILD_INCOMPLETE_URL_TEXT}"},`;
+          incomplete += `"${name}":{"language":"${languageStrings.BUILD_INCOMPLETE_LANGUAGE}",`
+                     + `"header":"${languageStrings.BUILD_INCOMPLETE_HEADER}",`
+                     + `"text1":"${languageStrings.BUILD_INCOMPLETE_TEXT}",`
+                     + `"help-url-text":"${languageStrings.BUILD_INCOMPLETE_URL_TEXT}"},`;
         }
       });
 
       unsupported = `${unsupported}}`;
       incomplete = `${incomplete}}`;
 
-      for (const name in options.settings.errorPages) {
-	      checkContent = initTemplate;
-	      checkContent = checkContent.replace('{{jsonContents}}', name === 'incomplete' ? incomplete : unsupported);
-          checkContent = checkContent.replace('{{PHP_VERSION}}', '');
-          checkContent = checkContent.replace('{{Title}}', options.settings.errorPages[name].title);
-          checkContent = checkContent.replace('{{Header}}', options.settings.errorPages[name].header);
-          checkContent = checkContent.replace('{{Description}}', options.settings.errorPages[name].text);
-          checkContent = checkContent.replace('{{Link}}', options.settings.errorPages[name].link);
-          checkContent = checkContent.replace('{{LinkText}}', options.settings.errorPages[name].linkText);
+      Object.keys(options.settings.errorPages).sort().forEach((name) => {
+        let checkContent = initTemplate;
+        checkContent = checkContent.replace('{{jsonContents}}', name === 'incomplete' ? incomplete : unsupported);
+        checkContent = checkContent.replace('{{PHP_VERSION}}', '');
+        checkContent = checkContent.replace('{{Title}}', options.settings.errorPages[name].title);
+        checkContent = checkContent.replace('{{Header}}', options.settings.errorPages[name].header);
+        checkContent = checkContent.replace('{{Description}}', options.settings.errorPages[name].text);
+        checkContent = checkContent.replace('{{Link}}', options.settings.errorPages[name].link);
+        checkContent = checkContent.replace('{{LinkText}}', options.settings.errorPages[name].linkText);
 
         if (cssContent) {
           checkContent = checkContent.replace('{{cssContents}}', cssContent);
@@ -83,14 +89,12 @@ const buildCheck = (options) => {
             console.log(`The ${options.settings.errorPages[name].destFile} page was created successfully!`);
           },
         );
-      }
+      });
     },
     (error) => {
-        // eslint-disable-next-line no-console
-        console.error(`${error}`);
-        process.exit(1);
+      // eslint-disable-next-line no-console
+      console.error(`${error}`);
+      process.exit(1);
     },
   );
 };
-
-module.exports.buildCheck = buildCheck;
diff --git a/build/build-modules-js/gzip-assets.es6.js b/build/build-modules-js/gzip-assets.es6.js
new file mode 100644
index 0000000000000..939cc26af9dbc
--- /dev/null
+++ b/build/build-modules-js/gzip-assets.es6.js
@@ -0,0 +1,117 @@
+/**
+ * For creating Brotli files you need to install iltorb
+ * and import it like:
+ * const { compressStream } = require('iltorb');
+ */
+const Fs = require('fs');
+const { gzip } = require('@gfx/zopfli');
+const RootPath = require('./utils/rootpath.es6.js')._();
+const WalkSync = require('./utils/walk-sync.es6.js');
+
+const compressStream = '';
+const options = {
+  verbose: false,
+  verbose_more: false,
+  numiterations: 15,
+  blocksplitting: true,
+  blocksplittingmax: 15,
+};
+
+/**
+ * Method that will create a gzipped vestion of the given file
+ *
+ * @param   { string }  file  The path of the file
+ *
+ * @returns { void }
+ */
+const handleFile = (file, enableBrotli) => {
+  if (file.match('/images') || file.match('\\images')) {
+    return;
+  }
+
+
+  if (file.match(/\.min\.js/) && !file.match(/\.min\.js\.gz/) && !file.match(/\.min\.js\.br/) && !file.toLowerCase().match(/json/) && !file.toLowerCase().match(/license/)) {
+    // eslint-disable-next-line no-console
+    console.log(`Processing: ${file}`);
+
+    if (enableBrotli && compressStream) {
+      // Brotli file
+      Fs.createReadStream(file)
+        .pipe(compressStream())
+        .pipe(Fs.createWriteStream(file.replace(/\.js$/, '.js.br')));
+    } else {
+      // Gzip the file
+      Fs.readFile(file, (err, data) => {
+        if (err) throw err;
+        gzip(data, options, (error, output) => {
+          if (error) throw err;
+          // Save the gzipped file
+          Fs.writeFileSync(
+            file.replace(/\.js$/, '.js.gz'),
+            output,
+            { encoding: 'utf8' },
+          );
+        });
+      });
+    }
+  }
+
+  if (file.match(/\.min\.css/) && !file.match(/\.min\.css\.gz/) && !file.match(/\.min\.css\.br/) && !file.match(/\.css\.map/) && !file.toLowerCase().match(/license/)) {
+    // eslint-disable-next-line no-console
+    console.log(`Processing: ${file}`);
+
+    if (enableBrotli && compressStream) {
+      // Brotli file
+      Fs.createReadStream(file)
+        .pipe(compressStream())
+        .pipe(Fs.createWriteStream(file.replace(/\.css$/, '.css.br')));
+    } else {
+      // Gzip the file
+      Fs.readFile(file, (err, data) => {
+        if (err) throw err;
+        gzip(data, options, (error, output) => {
+          if (error) throw err;
+          // Save the gzipped file
+          Fs.writeFileSync(
+            file.replace(/\.css$/, '.css.gz'),
+            output,
+            { encoding: 'utf8' },
+          );
+        });
+      });
+    }
+  }
+};
+
+/**
+ * Method to gzip the script and stylesheet files
+ *
+ * @param brotliParam {string} The CLI argument
+ *
+ * @returns { void }
+ */
+const gzipFiles = (brotliParam) => {
+  let enableBrotli = false;
+  if (brotliParam === 'brotli') {
+    enableBrotli = true;
+  }
+  // Minify the legacy files
+  // eslint-disable-next-line no-console
+  console.log('Gziping stylesheets and scripts...');
+
+  const templatesFiles = WalkSync.run(`${RootPath}/templates`, []);
+  const adminTemplatesFiles = WalkSync.run(`${RootPath}/administrator/templates`, []);
+  const mediaFiles = WalkSync.run(`${RootPath}/media`, []);
+
+  if (templatesFiles.length) {
+    templatesFiles.forEach(file => handleFile(file, enableBrotli));
+  }
+  if (adminTemplatesFiles.length) {
+    adminTemplatesFiles.forEach(file => handleFile(file, enableBrotli));
+  }
+  if (mediaFiles.length) {
+    mediaFiles.forEach(file => handleFile(file, enableBrotli));
+  }
+};
+
+module.exports.gzipFiles = gzipFiles;
diff --git a/build/build-modules-js/update.js b/build/build-modules-js/init.es6.js
similarity index 65%
rename from build/build-modules-js/update.js
rename to build/build-modules-js/init.es6.js
index 1e1f43b6cdc91..b34e259d9e467 100644
--- a/build/build-modules-js/update.js
+++ b/build/build-modules-js/init.es6.js
@@ -2,37 +2,33 @@ const Copydir = require('copy-dir');
 const Fs = require('fs');
 const FsExtra = require('fs-extra');
 const Path = require('path');
-const Promise = require('bluebird');
-const RootPath = require('./rootpath.js')._();
-const UglyCss = require('uglifycss');
-const UglifyJS = require('uglify-es');
-const WalkSync = require('./walk-sync.js');
+const RootPath = require('./utils/rootpath.es6.js')._();
 
 const xmlVersionStr = /(<version>)(\d+.\d+.\d+)(<\/version>)/;
 
 /**
- * Clean the media/vendor folder
+ * Method that will erase the media/vendor folder
+ * and populate the debugbar assets
+ *
+ * @returns { void }
  */
 const cleanVendors = () => {
-  // Remove the vendor folder
-  FsExtra.removeSync(Path.join(RootPath, 'media/vendor'));
-
-  // eslint-disable-next-line no-console
-  console.error('/media/vendor has been removed.');
-
-  // Restore our code on the vendor folders
-  FsExtra.copySync(Path.join(RootPath, 'build/media/vendor/tinymce/langs'), Path.join(RootPath, 'media/vendor/tinymce/langs'));
-  FsExtra.copySync(Path.join(RootPath, 'build/media/vendor/tinymce/templates'), Path.join(RootPath, 'media/vendor/tinymce/templates'));
-  FsExtra.copySync(Path.join(RootPath, 'build/media/vendor/jquery-ui'), Path.join(RootPath, 'media/vendor/jquery-ui'));
-
-  // And here some assets from a PHP package
-    if (Fs.existsSync(Path.join(RootPath, 'libraries/vendor/maximebf/debugbar/src/DebugBar/Resources'))) {
-        FsExtra.copySync(Path.join(RootPath, 'libraries/vendor/maximebf/debugbar/src/DebugBar/Resources'), Path.join(RootPath, 'media/vendor/debugbar'));
-    } else {
-        // eslint-disable-next-line no-console
-        console.error('You need to run `npm install` AFTER the command `composer install`!!!. The debug plugin HASN\'T install all its front end assets');
-        process.exit(1);
-    }
+  if (Fs.existsSync(Path.join(RootPath, 'libraries/vendor/maximebf/debugbar/src/DebugBar/Resources'))) {
+    // Remove the vendor folder
+    FsExtra.removeSync(Path.join(RootPath, 'media/vendor'));
+    // eslint-disable-next-line no-console
+    console.error('/media/vendor has been removed.');
+
+    // Copy some assets from a PHP package
+    FsExtra.copySync(Path.join(RootPath, 'libraries/vendor/maximebf/debugbar/src/DebugBar/Resources'), Path.join(RootPath, 'media/vendor/debugbar'));
+    // Do some cleanup
+    FsExtra.removeSync(Path.join(RootPath, 'media/vendor/debugbar/vendor/font-awesome'));
+    FsExtra.removeSync(Path.join(RootPath, 'media/vendor/debugbar/vendor/jquery'));
+  } else {
+    // eslint-disable-next-line no-console
+    console.error('You need to run `npm install` AFTER the command `composer install`!!!. The debug plugin HASN\'T install all its front end assets');
+    process.exit(1);
+  }
 };
 
 /**
@@ -41,6 +37,8 @@ const cleanVendors = () => {
  * @param {string} dirName the name of the source folder
  * @param {string} name    the name of the destination folder
  * @param {string} type    the type of the folder, eg: js, css, fonts, images
+ *
+ * @returns { void }
  */
 const copyAll = (dirName, name, type) => {
   const folderName = dirName === '/' ? '/' : `/${dirName}`;
@@ -55,6 +53,8 @@ const copyAll = (dirName, name, type) => {
  * @param {array}  files   the array of files to be be copied
  * @param {string} name    the name of the destination folder
  * @param {string} type    the type of the folder, eg: js, css, fonts, images
+ *
+ * @returns { void }
  */
 const copyArrayFiles = (dirName, files, name, type) => {
   files.forEach((file) => {
@@ -95,6 +95,8 @@ const copyFilesTo = (files, srcDir, destDir) => {
  *
  * @param {array}  files   the array of files to be be concatenated
  * @param {string} output  the name of the output file
+ *
+ * @returns {void}
  */
 const concatFiles = (files, output) => {
   let tempMem = '';
@@ -110,7 +112,9 @@ const concatFiles = (files, output) => {
 /**
  * Main method that will copy all vendor files according to Joomla's specs
  *
- * @param options
+ * @param options The options from setting.json
+ *
+ * @returns {void}
  */
 const copyFiles = (options) => {
   const mediaVendorPath = Path.join(RootPath, 'media/vendor');
@@ -175,7 +179,17 @@ const copyFiles = (options) => {
           'media/vendor/codemirror/addon/selection/active-line.js',
           'media/vendor/codemirror/mode/meta.js',
         ],
-        'media/vendor/codemirror/lib/addons.js');
+        'media/vendor/codemirror/lib/addons.js',
+      );
+
+      concatFiles(
+        [
+          'media/vendor/codemirror/lib/codemirror.js',
+          'media/vendor/codemirror/lib/addons.js',
+
+        ],
+        'media/vendor/codemirror/lib/codemirror-ce.js',
+      );
 
       concatFiles([
         'media/vendor/codemirror/addon/display/fullscreen.css',
@@ -224,69 +238,73 @@ const copyFiles = (options) => {
       });
 
       // Copy the license if exists
-      if (options.settings.vendors[packageName].licenseFilename &&
-     Fs.existsSync(`${Path.join(RootPath, `node_modules/${packageName}`)}/${options.settings.vendors[packageName].licenseFilename}`)
+      if (options.settings.vendors[packageName].licenseFilename
+     && Fs.existsSync(`${Path.join(RootPath, `node_modules/${packageName}`)}/${options.settings.vendors[packageName].licenseFilename}`)
       ) {
         const dest = Path.join(mediaVendorPath, vendorName);
         FsExtra.copySync(`${Path.join(RootPath, `node_modules/${packageName}`)}/${options.settings.vendors[packageName].licenseFilename}`, `${dest}/${options.settings.vendors[packageName].licenseFilename}`);
       }
     }
 
-    // Joomla's hack to expose the chosen base classes so we can extend it ourselves (it was better than the
-    // many hacks we had before. But I'm still ashamed of myself.
+    // Joomla's hack to expose the chosen base classes so we can extend it ourselves
+    // (it was better than the many hacks we had before. But I'm still ashamed of myself).
     if (packageName === 'chosen-js') {
       const dest = Path.join(mediaVendorPath, vendorName);
       const chosenPath = `${dest}/${options.settings.vendors[packageName].js['chosen.jquery.js']}`;
       let ChosenJs = Fs.readFileSync(chosenPath, { encoding: 'UTF-8' });
-      ChosenJs = ChosenJs.replace('}).call(this);', '  document.AbstractChosen = AbstractChosen;\n' +
-          '  document.Chosen = Chosen;\n' +
-          '}).call(this);');
+      ChosenJs = ChosenJs.replace('}).call(this);', '  document.AbstractChosen = AbstractChosen;\n'
+          + '  document.Chosen = Chosen;\n'
+          + '}).call(this);');
       Fs.writeFileSync(chosenPath, ChosenJs, { encoding: 'UTF-8' });
     }
 
     // Add provided Assets to a registry, if any
     if (vendor.provideAssets && vendor.provideAssets.length) {
       vendor.provideAssets.forEach((assetInfo) => {
-
         const registryItem = {
           package: packageName,
-          name:    assetInfo.name || vendorName,
+          name: assetInfo.name || vendorName,
           version: moduleOptions.version,
           dependencies: assetInfo.dependencies || [],
-          js:  [],
+          js: [],
           css: [],
-          attribute: {}
+          attribute: {},
         };
 
         // Update path for JS and CSS files
-        assetInfo.js && assetInfo.js.length && assetInfo.js.forEach((assetJS) => {
-          let itemPath = assetJS;
-
-          // Check for external path
-          if (itemPath.indexOf('http://') !== 0 && itemPath.indexOf('https://') !== 0 && itemPath.indexOf('//') !== 0) {
-            itemPath = `media/vendor/${vendorName}/js/${itemPath}`;
-          }
-          registryItem.js.push(itemPath);
-
-          // Check if there are any attribute to this file, then update the path
-          if (assetInfo.attribute && assetInfo.attribute[assetJS]) {
-            registryItem.attribute[itemPath] = assetInfo.attribute[assetJS]
-          }
-        });
-        assetInfo.css && assetInfo.css.length && assetInfo.css.forEach((assetCSS) => {
-          let itemPath = assetCSS;
-
-          // Check for external path
-          if (itemPath.indexOf('http://') !== 0 && itemPath.indexOf('https://') !== 0 && itemPath.indexOf('//') !== 0) {
-            itemPath = `media/vendor/${vendorName}/css/${itemPath}`;
-          }
-          registryItem.css.push(itemPath);
-
-          // Check if there are any attribute to this file, then update the path
-          if (assetInfo.attribute && assetInfo.attribute[assetCSS]) {
-            registryItem.attribute[itemPath] = assetInfo.attribute[assetCSS]
-          }
-        });
+        if (assetInfo.js && assetInfo.js.length) {
+          assetInfo.js.forEach((assetJS) => {
+            let itemPath = assetJS;
+
+            // Check for external path
+            if (itemPath.indexOf('http://') !== 0 && itemPath.indexOf('https://') !== 0 && itemPath.indexOf('//') !== 0) {
+              itemPath = `media/vendor/${vendorName}/js/${itemPath}`;
+            }
+            registryItem.js.push(itemPath);
+
+            // Check if there are any attribute to this file, then update the path
+            if (assetInfo.attribute && assetInfo.attribute[assetJS]) {
+              registryItem.attribute[itemPath] = assetInfo.attribute[assetJS];
+            }
+          });
+        }
+
+        if (assetInfo.css && assetInfo.css.length) {
+          assetInfo.css.forEach((assetCSS) => {
+            let itemPath = assetCSS;
+
+            // Check for external path
+            if (itemPath.indexOf('http://') !== 0 && itemPath.indexOf('https://') !== 0 && itemPath.indexOf('//') !== 0) {
+              itemPath = `media/vendor/${vendorName}/css/${itemPath}`;
+            }
+            registryItem.css.push(itemPath);
+
+            // Check if there are any attribute to this file, then update the path
+            if (assetInfo.attribute && assetInfo.attribute[assetCSS]) {
+              registryItem.attribute[itemPath] = assetInfo.attribute[assetCSS];
+            }
+          });
+        }
 
         registry.assets[registryItem.name] = registryItem;
       });
@@ -300,73 +318,43 @@ const copyFiles = (options) => {
   Fs.writeFileSync(
     Path.join(mediaVendorPath, 'joomla.asset.json'),
     JSON.stringify(registry, null, 2),
-    {encoding: 'UTF-8'}
+    { encoding: 'UTF-8' },
   );
+
+  // Restore our code on the vendor folders
+  FsExtra.copySync(Path.join(RootPath, 'build/media_source/vendor/tinymce/templates'), Path.join(RootPath, 'media/vendor/tinymce/templates'));
 };
 
 /**
  * Method to recreate the basic media folder structure
+ * After execution the media folder is populated with empty js and css subdirectories
+ * images subfolders with the relative files
+ * any other files except .js, .css, .scss
+ *
+ * @returns { void }
  */
 const recreateMediaFolder = () => {
-	// eslint-disable-next-line no-console
-	console.log(`Recreating the media folder...`);
-
-    Copydir.sync(Path.join(RootPath, 'build/media'), Path.join(RootPath, 'media'), function(stat, filepath, filename){
-        if (stat === 'directory' && (filename === 'webcomponents' || filename === 'scss')) {
-            return false;
-        }
-        return true;
-    }, function(err){
-        if (!err) {
-            console.log('Legacy media files restored');
-        }
-    });
+  // eslint-disable-next-line no-console
+  console.log('Recreating the media folder...');
 
-    Copydir.sync(Path.join(RootPath, 'build/media_src'), Path.join(RootPath, 'media'), function(stat, filepath, filename){
-        if (stat === 'directory' && filename === 'scss') {
-            return false;
-        }
-        return true;
-    }, function(err){
-        if (!err) {
-            console.log('Media folder structure was created');
-        }
-    });
+  Copydir.sync(Path.join(RootPath, 'build/media_source'), Path.join(RootPath, 'media'), (stat, filepath, filename) => {
+    if (stat === 'file' && (filepath.match(/\.es6\.js/) || filepath.match(/\.scss/) || filepath.match(/\.es5\.js/))) {
+      return false;
+    }
+    if (stat === 'directory' && (filename.match(/webcomponent/) || filename.match(/scss/))) {
+      return false;
+    }
+    return true;
+  }, (err) => {
+    if (!err) {
+      // eslint-disable-next-line no-console
+      console.log('Legacy media files restored');
+    }
+  });
 };
 
-/**
- * Method to minify the legacy ES5 files
- */
-const uglifyLegacyFiles = () => {
-	// Minify the legacy files
-	console.log('Minifying legacy stylesheets/scripts...');
-	const files = WalkSync.run(`${RootPath}/media`, []);
-
-	if (files.length) {
-		files.forEach(
-			(file) => {
-				if (file.match('/vendor') || file.match('\\vendor')) {
-					return;
-				}
-				if (file.match(/\.js/) && !file.match(/\.min\.js/) && !file.toLowerCase().match(/license/) && !file.toLowerCase().match(/json/) ) {
-          console.log(`Processing: ${file}`);
-					// Create the minified file
-					Fs.writeFileSync(file.replace(/\.js$/, '.min.js'), UglifyJS.minify(Fs.readFileSync(file, 'utf8')).code, {encoding: 'utf8'});
-				}
-				if (file.match(/\.css/) && !file.match(/\.min\.css/) && !file.match(/\.css\.map/) && !file.toLowerCase().match(/license/)) {
-					console.log(`Processing: ${file}`);
-					// Create the minified file
-					Fs.writeFileSync(
-						file.replace(/\.css$/, '.min.css'),
-						UglyCss.processFiles([file], { expandVars: false }),
-						{ encoding: 'utf8' },
-					);
-				}
-			});
-	}
-};
 
-const copyAssets = (options) => {
+module.exports.copyAssets = (options) => {
   Promise.resolve()
     // Copy a fresh version of the files
     .then(cleanVendors())
@@ -377,15 +365,10 @@ const copyAssets = (options) => {
     // Copy a fresh version of the files
     .then(copyFiles(options))
 
-    // Uglify the legacy css/js files
-    .then(uglifyLegacyFiles(options))
-
     // Handle errors
     .catch((error) => {
-        // eslint-disable-next-line no-console
-        console.error(`${error}`);
-        process.exit(1);
+      // eslint-disable-next-line no-console
+      console.error(`${error}`);
+      process.exit(1);
     });
 };
-
-module.exports.copyAssets = copyAssets;
diff --git a/build/build-modules-js/javascript/babel-transform.es6.js b/build/build-modules-js/javascript/babel-transform.es6.js
new file mode 100644
index 0000000000000..83e261e726242
--- /dev/null
+++ b/build/build-modules-js/javascript/babel-transform.es6.js
@@ -0,0 +1,35 @@
+const Babel = require('@babel/core');
+const Fs = require('fs');
+const Path = require('path');
+const MakeDir = require('../utils/make-dir.es6.js');
+
+/**
+ *
+ * @param fileContents  the content of the file to be transpiled
+ * @param settings      the settings for the transpiler
+ * @param output        the full pat + filename + extension of the trnspiled file
+ */
+module.exports.run = (fileContents, settings, output) => {
+  Babel.transform(fileContents, settings, (error, result) => {
+    if (error) {
+      // eslint-disable-next-line no-console
+      console.error(`${error}`);
+      process.exit(1);
+    }
+
+    // Ensure the folder exists or create it
+    MakeDir.run(Path.dirname(output));
+
+    Fs.writeFile(
+      output,
+      result.code, // + os.EOL
+      (fsError) => {
+        if (fsError) {
+          // eslint-disable-next-line no-console
+          console.error(`${fsError}`);
+          process.exit(1);
+        }
+      },
+    );
+  });
+};
diff --git a/build/build-modules-js/javascript/compile-es6.es6.js b/build/build-modules-js/javascript/compile-es6.es6.js
new file mode 100644
index 0000000000000..f9c8c21f38cde
--- /dev/null
+++ b/build/build-modules-js/javascript/compile-es6.es6.js
@@ -0,0 +1,106 @@
+const Fs = require('fs');
+const Path = require('path');
+const Babel = require('./babel-transform.es6.js');
+const MakeDir = require('../utils/make-dir.es6.js');
+
+const headerText = `PLEASE DO NOT MODIFY THIS FILE. WORK ON THE ES6 VERSION.
+OTHERWISE YOUR CHANGES WILL BE REPLACED ON THE NEXT BUILD.`;
+
+// Predefine some settings
+const settings = [
+  {
+    presets: [
+      ['@babel/preset-env', {
+        targets: {
+          browsers: ['ie 11'],
+        },
+        modules: false,
+      }],
+    ],
+    plugins: [
+      ['add-header-comment', { header: [headerText] }],
+      ['@babel/plugin-transform-classes'],
+    ],
+    comments: true,
+  },
+  {
+    presets: [
+      ['@babel/preset-env', {
+        targets: {
+          browsers: ['ie 11'],
+        },
+        modules: false,
+      }],
+      'minify',
+    ],
+    plugins: [
+      ['@babel/plugin-transform-classes'],
+    ],
+    comments: false,
+  },
+  {
+    presets: [
+      ['@babel/preset-env', {
+        targets: {
+          browsers: ['> 5%', 'not ie 11'],
+        },
+        modules: false,
+      }],
+    ],
+    plugins: [
+      ['add-header-comment', { header: [headerText] }],
+    ],
+    comments: true,
+  },
+  {
+    presets: [
+      ['@babel/preset-env', {
+        targets: {
+          browsers: ['> 5%', 'not ie 11'],
+        },
+        modules: false,
+      }],
+      'minify',
+    ],
+    plugins: [],
+    comments: false,
+  },
+];
+
+/**
+ * Compiles es6 files to es5.
+ *
+ * @param file the full path to the file + filename + extension
+ */
+module.exports.compileFile = (file) => {
+  Promise.resolve()
+    .then(() => {
+      const filePath = file.slice(0, -7);
+
+      const outputFiles = [
+        `${filePath.replace('/build/media_source/', '/media/').replace('\\build\\media_source\\', '\\media\\')}.js`,
+        `${filePath.replace('/build/media_source/', '/media/').replace('\\build\\media_source\\', '\\media\\')}.min.js`,
+        `${filePath.replace('/build/media_source/', '/media/').replace('\\build\\media_source\\', '\\media\\')}.es6.js`,
+        `${filePath.replace('/build/media_source/', '/media/').replace('\\build\\media_source\\', '\\media\\')}.es6.min.js`,
+      ];
+
+      // Ensure that the directories exist or create them
+      MakeDir.run(Path.dirname(file).replace('/build/media_source/', '/media/').replace('\\build\\media_source\\', '\\media\\'));
+
+      // Get the contents of the ES-XXXX file
+      const es6File = Fs.readFileSync(file, 'utf8');
+
+      settings.forEach((setting, index) => {
+      // eslint-disable-next-line no-console
+        console.error(`Transpiling ES6 file: ${file}`);
+        Babel.run(es6File, setting, outputFiles[index]);
+      });
+    })
+
+  // Handle errors
+    .catch((error) => {
+    // eslint-disable-next-line no-console
+      console.error(`${error}`);
+      process.exit(1);
+    });
+};
diff --git a/build/build-modules-js/javascript/compile-w-c.es6.js b/build/build-modules-js/javascript/compile-w-c.es6.js
new file mode 100644
index 0000000000000..8bd03d421cef1
--- /dev/null
+++ b/build/build-modules-js/javascript/compile-w-c.es6.js
@@ -0,0 +1,172 @@
+const Autoprefixer = require('autoprefixer');
+const CssNano = require('cssnano');
+const Fs = require('fs');
+const Postcss = require('postcss');
+const Sass = require('node-sass');
+const Babel = require('./babel-transform.es6.js');
+
+const createJsFiles = (inputFile, es6FileContents) => {
+  // Define some settings
+  const settings = [
+    {
+      presets: [
+        ['@babel/preset-env', {
+          targets: {
+            browsers: ['last 1 Chrome version'],
+          },
+        }],
+      ],
+      comments: true,
+    },
+    {
+      presets: [
+        ['@babel/preset-env', {
+          targets: {
+            browsers: ['last 1 Chrome version'],
+          },
+        }],
+        ['minify'],
+      ],
+      comments: false,
+    },
+    {
+      presets: [
+        ['@babel/preset-env', {
+          targets: {
+            browsers: ['ie 11'],
+          },
+        }],
+      ],
+      plugins: [
+        '@babel/plugin-transform-classes',
+      ],
+      comments: true,
+
+    },
+    {
+      presets: [
+
+        ['@babel/preset-env', {
+          targets: {
+            browsers: ['ie 11'],
+          },
+        }],
+        ['minify'],
+      ],
+      plugins: [
+        ['@babel/plugin-transform-classes'],
+      ],
+      comments: false,
+
+    },
+  ];
+
+  const outputFiles = [
+    inputFile.replace('/build/media_source/', '/media/').replace('\\build\\media_source\\', '\\media\\').replace('.w-c.es6.js', '.js'),
+    inputFile.replace('/build/media_source/', '/media/').replace('\\build\\media_source\\', '\\media\\').replace('.w-c.es6.js', '.min.js'),
+    inputFile.replace('/build/media_source/', '/media/').replace('\\build\\media_source\\', '\\media\\').replace('.w-c.es6.js', '-es5.js'),
+    inputFile.replace('/build/media_source/', '/media/').replace('\\build\\media_source\\', '\\media\\').replace('.w-c.es6.js', '-es5.min.js'),
+  ];
+
+  settings.forEach((setting, index) => {
+    Babel.run(es6FileContents, setting, outputFiles[index]);
+  });
+};
+
+/**
+ * Compiles any web component/custom element files from the media_source folder
+ *
+ * @param file     The full path to the file + filename + extension
+ * @param options  The options from the settings.json
+ */
+module.exports.compile = (inputFile, options) => {
+  Promise.resolve()
+    .then(() => {
+      // Get the contents of the ES-XXXX file
+      let es6File = Fs.readFileSync(inputFile, 'utf8');
+      // Check if there is a css file
+      if (Fs.existsSync(inputFile.replace('/js/', '/scss/').replace('\\js\\', '\\scss\\').replace('.w-c.es6.js', '.scss'))) {
+        Sass.render({
+          file: inputFile.replace('/js/', '/scss/').replace('\\js\\', '\\scss\\').replace('.w-c.es6.js', '.scss'),
+        }, (error, result) => {
+          if (error) {
+            // eslint-disable-next-line no-console
+            console.error(`${error.column}
+                      ${error.message}
+                      ${error.line}`);
+          } else {
+            const cleaner = Postcss(
+              [
+                Autoprefixer({
+                  env: {
+                    targets: {
+                      browsers: [options.settings.browsers],
+                    },
+                  },
+                }),
+              ],
+            );
+
+            if (typeof result === 'object' && result.css) {
+              cleaner.process(result.css.toString(), { from: undefined })
+                .then((res) => {
+                  if (/{{CSS_CONTENTS_PLACEHOLDER}}/.test(es6File)) {
+                    if (typeof res === 'object' && res.css) {
+                      // eslint-disable-next-line max-len
+                      Postcss([CssNano]).process(res.css.toString(), { from: undefined }).then((cssMin) => {
+                        es6File = es6File.replace('{{CSS_CONTENTS_PLACEHOLDER}}', cssMin.css.toString());
+                        // eslint-disable-next-line no-console
+                        console.error(`Transpiling Web Component file: ${inputFile}`);
+                        createJsFiles(inputFile, es6File);
+                      });
+                    }
+                  } else {
+                    if (typeof res === 'object' && res.css) {
+                      Fs.writeFileSync(
+                        inputFile.replace('/build/media_source/', '/media/').replace('\\build\\media_source\\', '\\media\\').replace('/js/', '/css/').replace('\\js\\', '\\css\\')
+                          .replace('.w-c.es6.js', '.css'),
+                        res.css.toString(),
+                        { encoding: 'UTF-8' },
+                      );
+                      // eslint-disable-next-line max-len
+                      Postcss([CssNano]).process(res.css.toString(), { from: undefined }).then((cssMin) => {
+                        Fs.writeFileSync(
+                          inputFile.replace('/build/media_source/', '/media/').replace('\\build\\media_source\\', '\\media\\').replace('/js/', '/css/').replace('\\js\\', '\\css\\')
+                            .replace('.w-c.es6.js', '.min.css'),
+                          cssMin.css.toString(),
+                          { encoding: 'UTF-8' },
+                        );
+                      });
+                    }
+
+                    // eslint-disable-next-line no-console
+                    console.error(`Transpiling Web Component file: ${inputFile}`);
+
+                    createJsFiles(inputFile, es6File);
+                  }
+                })
+
+                // Handle errors
+                .catch((err) => {
+                  // eslint-disable-next-line no-console
+                  console.error(`${err}`);
+                  process.exit(-1);
+                });
+            }
+          }
+        });
+      } else {
+        // eslint-disable-next-line no-console
+        console.error(`Transpiling Web Component file: ${inputFile}`);
+
+        createJsFiles(inputFile, es6File);
+      }
+    })
+
+    // Handle errors
+    .catch((err) => {
+      // eslint-disable-next-line no-console
+      console.error(`${err}`);
+      process.exit(-1);
+    });
+};
diff --git a/build/build-modules-js/javascript/handle-file.es6.js b/build/build-modules-js/javascript/handle-file.es6.js
new file mode 100644
index 0000000000000..83957fc450111
--- /dev/null
+++ b/build/build-modules-js/javascript/handle-file.es6.js
@@ -0,0 +1,24 @@
+const Fs = require('fs');
+const Path = require('path');
+const UglifyJS = require('uglify-es');
+const TranspileJs = require('./compile-es6.es6.js');
+const TranspileWc = require('./compile-w-c.es6.js');
+const MakeDir = require('../utils/make-dir.es6.js');
+
+module.exports.run = (file, options) => {
+  if (file.match(/\.js/) && file.match(/\.es6\.js/) && !file.match(/\.w-c\.es6\.js/)) {
+    // ES6 file so we need to transpile it
+    TranspileJs.compileFile(file);
+  } else if (file.match(/\.js/) && file.match(/\.es5\.js/)) {
+    // ES5 file, we will copy the file and then minify it in place
+    // Ensure that the directories exist or create them
+    MakeDir.run(Path.dirname(file).replace('/build/media_source/', '/media/').replace('\\build\\media_source\\', '\\media\\'));
+    Fs.copyFileSync(file, file.replace('/build/media_source/', '/media/').replace('\\build\\media_source\\', '\\media\\').replace('.es5.js', '.js'));
+    Fs.writeFileSync(file.replace('/build/media_source/', '/media/').replace('\\build\\media_source\\', '\\media\\').replace('.es5.js', '.min.js'), UglifyJS.minify(Fs.readFileSync(file, 'utf8')).code, { encoding: 'utf8' });
+    // eslint-disable-next-line no-console
+    console.log(`Es5 file copied/minified: ${file}`);
+  } else if (file.match(/\.js/) && file.match(/\.w-c\.es6\.js/)) {
+    // Web Component, so we need to transpile it
+    TranspileWc.compile(file, options);
+  }
+};
diff --git a/build/build-modules-js/minify-vendor.js b/build/build-modules-js/javascript/minify-vendor.es6.js
similarity index 53%
rename from build/build-modules-js/minify-vendor.js
rename to build/build-modules-js/javascript/minify-vendor.es6.js
index 4595ed5b18f6c..fbf586c5964c4 100644
--- a/build/build-modules-js/minify-vendor.js
+++ b/build/build-modules-js/javascript/minify-vendor.es6.js
@@ -1,17 +1,18 @@
 const Fs = require('fs');
 const Path = require('path');
-const RootPath = require('./rootpath.js')._();
 const UglifyJS = require('uglify-es');
-const WalkSync = require('./walk-sync.js');
+const WalkSync = require('../utils/walk-sync.es6.js');
+const RootPath = require('../utils/rootpath.es6.js')._();
 
-const fixVendors = () => {
+/**
+ * Method that will minify a set of vendor javascript files
+ */
+module.exports.compile = () => {
   Promise.resolve()
     .then(() => {
       const folders = [
         Path.join(RootPath, 'media/vendor/codemirror'),
-        Path.join(RootPath, 'media/vendor/jquery-ui/js'),
         Path.join(RootPath, 'media/vendor/punycode/js'),
-        Path.join(RootPath, 'media/vendor/tinymce/langs'),
         Path.join(RootPath, 'media/vendor/webcomponentsjs'),
       ];
 
@@ -23,21 +24,25 @@ const fixVendors = () => {
           files.forEach(
             (file) => {
               if (file.match(/\.js/) && !file.match(/LICENSE\.md/)) {
-              console.log(`Processing: ${file}`);
+                // eslint-disable-next-line no-console
+                console.log(`Processing ES5 file: ${file}`);
                 // Write the file
-                Fs.writeFileSync(file.replace('.js', '.min.js'), UglifyJS.minify(Fs.readFileSync(file, 'utf8')).code, {encoding: 'utf8'});
+                Fs.writeFileSync(
+                  file.replace('.js', '.min.js'),
+                  UglifyJS.minify(Fs.readFileSync(file, 'utf8')).code,
+                  { encoding: 'utf8' },
+                );
               }
-            });
+            },
+          );
         }
       });
     })
 
     // Handle errors
     .catch((error) => {
-        // eslint-disable-next-line no-console
-        console.error(`${error}`);
-        process.exit(1);
+      // eslint-disable-next-line no-console
+      console.error(`${error}`);
+      process.exit(1);
     });
 };
-
-module.exports.compile = fixVendors;
diff --git a/build/build-modules-js/make-dir.js b/build/build-modules-js/make-dir.js
deleted file mode 100644
index 24e5e0287bde2..0000000000000
--- a/build/build-modules-js/make-dir.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Helper fn creates dir
- *
- * @param targetDir
- * @param isRelativeToScript
- * @returns {string}
- */
-const Fs = require('fs');
-const Path = require('path');
-
-module.exports.run = (targetDir, { isRelativeToScript = false } = {}) => {
-    const sep = Path.sep;
-    const initDir = Path.isAbsolute(targetDir) ? sep : '';
-    const baseDir = isRelativeToScript ? __dirname : '.';
-
-    return targetDir.split(sep).reduce((parentDir, childDir) => {
-        const curDir = Path.resolve(baseDir, parentDir, childDir);
-        try {
-            Fs.mkdirSync(curDir);
-        } catch (err) {
-            if (err.code === 'EEXIST') { // curDir already exists!
-                return curDir;
-            }
-
-            // To avoid `EISDIR` error on Mac and `EACCES`-->`ENOENT` and `EPERM` on Windows.
-            if (err.code === 'ENOENT') { // Throw the original parentDir error on curDir `ENOENT` failure.
-                throw new Error(`EACCES: permission denied, mkdir '${parentDir}'`);
-            }
-
-            const caughtErr = ['EACCES', 'EPERM', 'EISDIR'].indexOf(err.code) > -1;
-            if (!caughtErr || caughtErr && curDir === Path.resolve(targetDir)) {
-                throw new Error(`${err}`);
-            }
-        }
-
-        return curDir;
-    }, initDir);
-};
diff --git a/build/build-modules-js/rootpath.js b/build/build-modules-js/rootpath.js
deleted file mode 100644
index ad0600ac1c0d4..0000000000000
--- a/build/build-modules-js/rootpath.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Method to get the root path
- *
- * @returns {string} The root path
- */
-const rootPath = () => __dirname.replace('/build/build-modules-js', '').replace('\\build\\build-modules-js', '');
-
-module.exports._ = rootPath;
diff --git a/build/build-modules-js/settings.json b/build/build-modules-js/settings.json
index bd6d67ad46708..af6ca3c2fdc8b 100644
--- a/build/build-modules-js/settings.json
+++ b/build/build-modules-js/settings.json
@@ -4,63 +4,6 @@
       "last 1 version",
       "not ie < 11"
     ],
-    "elements": [
-      "field-media",
-      "field-user",
-      "field-switcher",
-      "field-send-test-mail",
-      "field-module-order",
-      "field-permissions",
-      "field-simple-color",
-      "field-send-test-mail",
-      "field-subform",
-      "field-fancy-select",
-      "editor-codemirror",
-      "hidden-mail",
-      "editor-none",
-      "toolbar-button"
-    ],
-    "webcomponents": {
-      "field-media": {
-        "css": "media/system/webcomponents/css",
-        "js": "media/system/webcomponents/js"
-      },
-      "field-switcher": {
-        "css": "media/system/webcomponents/css",
-        "js": "media/system/webcomponents/js"
-      },
-      "field-simple-color": {
-        "css": "media/system/webcomponents/css",
-        "js": "media/system/webcomponents/js"
-      },
-      "field-send-test-mail": {
-        "css": "media/system/webcomponents/css",
-        "js": "media/system/webcomponents/js"
-      },
-      "editor-codemirror": {
-        "css": "media/system/webcomponents/css",
-        "js": "media/system/webcomponents/js"
-      },
-      "editor-none": {
-        "css": "media/system/webcomponents/css",
-        "js": "media/system/webcomponents/js"
-      },
-      "field-module-order": {
-        "css": "media/system/webcomponents/css",
-        "js": "media/system/webcomponents/js"
-      },
-      "field-hidden-mail": {
-        "css": "media/system/webcomponents/css",
-        "js": "media/system/webcomponents/js"
-      },
-      "field-subform": {
-        "css": "media/system/webcomponents/css",
-        "js": "media/system/webcomponents/js"
-      },
-      "field-fancy-select": {
-        "js": "media/system/webcomponents/js"
-      }
-    },
     "vendors": {
       "awesomplete": {
         "name": "awesomplete",
@@ -429,6 +372,17 @@
           "dist/metismenujs.min.js": "js/metismenujs.min.js",
           "dist/metismenujs.min.js.map": "js/metismenujs.min.js.map"
         }
+      },
+      "skipto": {
+        "name": "skipto",
+        "licenseFilename": "LICENSE.md",
+        "js": {
+          "src/js/skipTo.js": "js/skipTo.js",
+          "src/js/dropMenu.js": "js/dropMenu.js"
+        },
+        "css": {
+          "src/css/SkipTo.css": "css/SkipTo.css"
+        }
       }
     },
     "errorPages": {
diff --git a/build/build-modules-js/stylesheets/scss-transform.es6.js b/build/build-modules-js/stylesheets/scss-transform.es6.js
new file mode 100644
index 0000000000000..6369e216fa3e3
--- /dev/null
+++ b/build/build-modules-js/stylesheets/scss-transform.es6.js
@@ -0,0 +1,59 @@
+const Autoprefixer = require('autoprefixer');
+const CssNano = require('cssnano');
+const Fs = require('fs');
+const Path = require('path');
+const Postcss = require('postcss');
+const Sass = require('node-sass');
+const MakeDir = require('../utils/make-dir.es6.js');
+
+module.exports.compile = (file, options) => {
+  const cssFile = file.replace('/scss/', '/css/').replace('\\scss\\', '\\css\\')
+    .replace('.scss', '.css').replace('/build/media_source/', '/media/')
+    .replace('\\build\\media_source\\', '\\media\\');
+
+  Sass.render({
+    file,
+  },
+  (error, result) => {
+    if (error) {
+      // eslint-disable-next-line no-console
+      console.error(`something exploded ${error.column}`, error.message, error.line);
+      process.exit(1);
+    } else {
+      // Auto prefixing
+      // eslint-disable-next-line no-console
+      const cleaner = Postcss(
+        [
+          Autoprefixer({
+            browsers: options.settings.browsers,
+          }),
+        ],
+      );
+
+      cleaner.process(result.css.toString(), { from: undefined })
+        .then((res) => {
+          // Ensure the folder exists or create it
+          MakeDir.run(Path.dirname(cssFile));
+
+          Fs.writeFileSync(
+            cssFile,
+            res.css.toString(),
+            { encoding: 'UTF-8' },
+          );
+
+          Postcss([CssNano]).process(res.css.toString(), { from: undefined }).then((cssMin) => {
+            // Ensure the folder exists or create it
+            MakeDir.run(Path.dirname(cssFile.replace('.css', '.min.css')));
+            Fs.writeFileSync(
+              cssFile.replace('.css', '.min.css'),
+              cssMin.css.toString(),
+              { encoding: 'UTF-8' },
+            );
+
+            // eslint-disable-next-line no-console
+            console.log(`SCSS File compiled: ${cssFile}`);
+          });
+        });
+    }
+  });
+};
diff --git a/build/build-modules-js/utils/make-dir.es6.js b/build/build-modules-js/utils/make-dir.es6.js
new file mode 100644
index 0000000000000..2252e45f1533a
--- /dev/null
+++ b/build/build-modules-js/utils/make-dir.es6.js
@@ -0,0 +1,38 @@
+/**
+ * Helper fn creates dir
+ *
+ * @param targetDir
+ * @param isRelativeToScript
+ * @returns {string}
+ */
+const Fs = require('fs');
+const Path = require('path');
+
+module.exports.run = (targetDir, { isRelativeToScript = false } = {}) => {
+  const { sep } = Path;
+  const initDir = Path.isAbsolute(targetDir) ? sep : '';
+  const baseDir = isRelativeToScript ? __dirname : '.';
+
+  return targetDir.split(sep).reduce((parentDir, childDir) => {
+    const curDir = Path.resolve(baseDir, parentDir, childDir);
+    try {
+      Fs.mkdirSync(curDir);
+    } catch (err) {
+      if (err.code === 'EEXIST') { // curDir already exists!
+        return curDir;
+      }
+
+      // To avoid `EISDIR` error on Mac and `EACCES`-->`ENOENT` and `EPERM` on Windows.
+      if (err.code === 'ENOENT') { // Throw the original parentDir error on curDir `ENOENT` failure.
+        throw new Error(`EACCES: permission denied, mkdir '${parentDir}'`);
+      }
+
+      const caughtErr = ['EACCES', 'EPERM', 'EISDIR'].indexOf(err.code) > -1;
+      if (!caughtErr || (caughtErr && curDir === Path.resolve(targetDir))) {
+        throw new Error(`${err}`);
+      }
+    }
+
+    return curDir;
+  }, initDir);
+};
diff --git a/build/build-modules-js/utils/rootpath.es6.js b/build/build-modules-js/utils/rootpath.es6.js
new file mode 100644
index 0000000000000..e80d50bdaaa2f
--- /dev/null
+++ b/build/build-modules-js/utils/rootpath.es6.js
@@ -0,0 +1,6 @@
+/**
+ * Method to get the root path
+ *
+ * @returns {string} The root path
+ */
+module.exports._ = () => __dirname.replace('/build/build-modules-js/utils', '').replace('\\build\\build-modules-js\\utils', '');
diff --git a/build/build-modules-js/utils/walk-sync.es6.js b/build/build-modules-js/utils/walk-sync.es6.js
new file mode 100644
index 0000000000000..24a8d0ad6c2db
--- /dev/null
+++ b/build/build-modules-js/utils/walk-sync.es6.js
@@ -0,0 +1,33 @@
+const Fs = require('fs');
+const Path = require('path');
+
+/**
+ * Method to list all files in a directory recursively in a synchronous fashion
+ *
+ * @param {string} dir      the name of the folder to be recurse'd
+ * @param {array}  filelist the array with all the files
+ */
+const walkSync = (dir, filelist) => {
+  if (!Array.isArray(filelist)) {
+    // eslint-disable-next-line no-console
+    console.log('Method `walkSync` expects second parameter to be an array!');
+    process.env.exit(1);
+  }
+
+  const files = Fs.readdirSync(dir);
+  // eslint-disable-next-line no-param-reassign
+  filelist = filelist || [];
+
+  files.forEach((file) => {
+    if (Fs.statSync(Path.join(dir, file)).isDirectory()) {
+      // eslint-disable-next-line no-param-reassign
+      filelist = walkSync(Path.join(dir, file), filelist);
+    } else {
+      // eslint-disable-next-line no-param-reassign
+      filelist.push(Path.join(dir, file));
+    }
+  });
+  return filelist;
+};
+
+module.exports.run = walkSync;
diff --git a/build/build-modules-js/walk-sync.js b/build/build-modules-js/walk-sync.js
deleted file mode 100644
index 0eeb62df436a1..0000000000000
--- a/build/build-modules-js/walk-sync.js
+++ /dev/null
@@ -1,30 +0,0 @@
-const Fs = require('fs');
-const Path = require('path');
-
-/**
- * Method to list all files in a directory recursively in a synchronous fashion
- *
- * @param {string} dir      the name of the folder to be recurse'd
- * @param {array}  filelist the array with all the files
- */
-const walkSync = (dir, filelist) => {
-    if (!Array.isArray(filelist)) {
-        console.log('Method `walkSync` expects second parameter to be an array!');
-        process.env.exit(1)
-    }
-
-    const files = Fs.readdirSync(dir);
-    filelist = filelist || [];
-
-    files.forEach((file) => {
-        if (Fs.statSync(Path.join(dir, file)).isDirectory()) {
-            filelist = walkSync(Path.join(dir, file), filelist);
-        }
-        else {
-            filelist.push(Path.join(dir, file));
-        }
-    });
-    return filelist;
-};
-
-module.exports.run = walkSync;
diff --git a/build/build-modules-js/watch.es6.js b/build/build-modules-js/watch.es6.js
new file mode 100644
index 0000000000000..41382a214cc66
--- /dev/null
+++ b/build/build-modules-js/watch.es6.js
@@ -0,0 +1,37 @@
+const watch = require('watch');
+const Path = require('path');
+const HandleJsFile = require('./javascript/handle-file.es6.js');
+const RootPath = require('./utils/rootpath.es6.js')._();
+
+/**
+ * Debounce
+ * https://gist.github.com/nmsdvid/8807205
+ *
+ * @param { function } callback  The callback function to be executed
+ * @param { integer }  time      The time to wait before firing the callback
+ * @param { integer }  interval  The interval
+ */
+// eslint-disable-next-line max-len, no-param-reassign, no-return-assign
+const debounce = (callback, time = 250, interval) => (...args) => clearTimeout(interval, interval = setTimeout(callback, time, ...args));
+
+module.exports.run = () => {
+  watch.createMonitor(Path.join(RootPath, 'build/media_source'), (monitor) => {
+    monitor.on('created', (file) => {
+      if (file.match(/\.js/) && (file.match(/\.es5\.js/) || file.match(/\.es6\.js/) || file.match(/\.w-c\.es6\.js/))) {
+        debounce(HandleJsFile.run(file), 300);
+      }
+      // @todo css and scss
+    });
+    monitor.on('changed', (file) => {
+      if (file.match(/\.js/) && (file.match(/\.es5\.js/) || file.match(/\.es6\.js/) || file.match(/\.w-c\.es6\.js/))) {
+        debounce(HandleJsFile.run(file), 300);
+      }
+      // @todo css and scss
+    });
+    monitor.on('removed', (file) => {
+      // Handle this case as well
+      // eslint-disable-next-line no-console
+      console.log(file);
+    });
+  });
+};
diff --git a/build/build.php b/build/build.php
index ab268b3611379..ca78f5438392e 100644
--- a/build/build.php
+++ b/build/build.php
@@ -16,7 +16,7 @@
  * 4. Check the archives in the tmp directory.
  *
  * @package    Joomla.Build
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -212,6 +212,15 @@ function clean_composer(string $dir)
 	exit(1);
 }
 
+// Create gzipped version of the static assets
+system('npm run gzip', $gzipReturnCode);
+
+if ($gzipReturnCode !== 0)
+{
+	echo "`npm run gzip` did not complete as expected.\n";
+	exit(1);
+}
+
 // Clean the checkout of extra resources
 clean_checkout($fullpath);
 
@@ -285,6 +294,7 @@ function clean_composer(string $dir)
 	'.drone.yml',
 	'.eslintignore',
 	'.eslintrc',
+	'.editorconfig',
 	'.github',
 	'.gitignore',
 	'.hound.yml',
@@ -310,6 +320,9 @@ function clean_composer(string $dir)
 	'scss-lint.yml',
 	'tests',
 	'travisci-phpunit.xml',
+	'codeception.yml',
+	'RoboFile.php',
+	'CODE_OF_CONDUCT.md',
 	// Remove the testing sample data from all packages
 	'installation/sql/mysql/sample_testing.sql',
 	'installation/sql/postgresql/sample_testing.sql',
@@ -514,7 +527,7 @@ function clean_composer(string $dir)
 {
 	echo "Generating checksums for $packageName\n";
 
-	foreach (array('md5', 'sha1') as $hash)
+	foreach (array('md5', 'sha1', 'sha256', 'sha384', 'sha512') as $hash)
 	{
 		if (file_exists('packages/' . $packageName))
 		{
diff --git a/build/bump.php b/build/bump.php
index e5e9176f466bf..afd1d9a8d203c 100644
--- a/build/bump.php
+++ b/build/bump.php
@@ -17,7 +17,7 @@
  * - /usr/bin/php /path/to/joomla-cms/build/bump.php -v 3.7.0
  *
  * @package    Joomla.Build
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/deleted_file_check.php b/build/deleted_file_check.php
index b2a06c90d170e..2ccf6e7196403 100644
--- a/build/deleted_file_check.php
+++ b/build/deleted_file_check.php
@@ -14,7 +14,7 @@
  *
  * @package    Joomla.Build
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/helpTOC.php b/build/helpTOC.php
index c42ced9d5f8d0..988395171ca76 100644
--- a/build/helpTOC.php
+++ b/build/helpTOC.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Build
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -65,7 +65,7 @@ public function doExecute()
 
 		// Get the version data for the script
 		$minorVersion = Version::MAJOR_VERSION . '.' . Version::MINOR_VERSION;
-		$namespace    = 'Help' . $minorVersion . ':';
+		$namespace    = 'Help' . str_replace('.', '', $minorVersion) . ':';
 
 		// Set up HTTP driver for MediaWiki
 		$http = new \Joomla\Mediawiki\Http([], JHttpFactory::getAvailableDriver());
diff --git a/build/media/mod_languages/images/el.gif b/build/media/mod_languages/images/el.gif
deleted file mode 100644
index b8879c2980917..0000000000000
Binary files a/build/media/mod_languages/images/el.gif and /dev/null differ
diff --git a/build/media/mod_languages/images/el_gr.gif b/build/media/mod_languages/images/el_gr.gif
deleted file mode 100644
index b8879c2980917..0000000000000
Binary files a/build/media/mod_languages/images/el_gr.gif and /dev/null differ
diff --git a/build/media/webcomponents/js/field-fancy-select/field-fancy-select.js b/build/media/webcomponents/js/field-fancy-select/field-fancy-select.js
deleted file mode 100644
index e35a5ad3e33c5..0000000000000
--- a/build/media/webcomponents/js/field-fancy-select/field-fancy-select.js
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-/**
- * Fancy select field, which use Choices.js
- *
- * Example:
- * <joomla-field-fancy-select ...attributes>
- *   <select>...</select>
- * </joomla-field-fancy-select>
- *
- * Possible attributes:
- *
- * allow-custom          Whether allow User to dynamically add a new value.
- * new-item-prefix=""    Prefix for a dynamically added value.
- *
- * remote-search         Enable remote search.
- * url=""                Url for remote search.
- * term-key="term"       Variable key name for searched term, will be appended to Url.
- *
- * min-term-length="1"   The minimum length a search value should be before choices are searched.
- * placeholder=""        The value of the inputs placeholder.
- * search-placeholder="" The value of the search inputs placeholder.
- */
-;(function(customElements){
-  "use strict";
-
-  class JoomlaFieldFancySelect extends HTMLElement {
-
-    // Properties getters/setters
-    get allowCustom()       { return this.hasAttribute('allow-custom'); }
-    get remoteSearch()      { return this.hasAttribute('remote-search'); }
-    get url()               { return this.getAttribute('url'); }
-    get termKey()           { return this.getAttribute('term-key') || 'term'; }
-    get minTermLength()     { return parseInt(this.getAttribute('min-term-length')) || 1; }
-    get newItemPrefix()     { return this.getAttribute('new-item-prefix') || ''; }
-    get placeholder()       { return this.getAttribute('placeholder'); }
-    get searchPlaceholder() { return this.getAttribute('search-placeholder'); }
-    get value()             { return this.choicesInstance.getValue(true); }
-    set value($val)         { this.choicesInstance.setValueByChoice('' + $val); }
-
-    connectedCallback() {
-      if (!window.Choices) {
-        throw new Error('JoomlaFieldFancySelect require Choices.js to work');
-      }
-
-      // Get a <select> element
-      this.select = this.querySelector('select');
-
-      if (!this.select) {
-        throw new Error('JoomlaFieldFancySelect require <select> element to work');
-      }
-
-      // Init Choices
-      this.choicesInstance = new Choices(this.select, {
-        placeholderValue: this.placeholder,
-        searchPlaceholderValue: this.searchPlaceholder,
-        removeItemButton: true,
-        searchFloor: this.minTermLength,
-        searchResultLimit: 10,
-        shouldSort: false,
-        fuseOptions: {
-          threshold: 0.3 // Strict search
-        },
-        noResultsText: Joomla.Text._('JGLOBAL_SELECT_NO_RESULTS_MATCH', 'No results found'),
-        noChoicesText: Joomla.Text._('JGLOBAL_SELECT_NO_RESULTS_MATCH', 'No results found'),
-        itemSelectText: Joomla.Text._('JGLOBAL_SELECT_PRESS_TO_SELECT', 'Press to select'),
-
-        // Redefine some classes
-        classNames: {
-          button: 'choices__button_joomla' // It is need because an original styling use unavailable Icon.svg file
-        }
-      });
-
-      // Collect an existing values, to avoid duplications
-      this.choicesCache = {};
-
-      // Handle typing of custom term
-      if (this.allowCustom) {
-        this.addEventListener('keydown', (event) => {
-          if (event.keyCode !== 13 || event.target !== this.choicesInstance.input) return;
-          event.preventDefault();
-
-          if (this.choicesInstance.highlightPosition
-            || !event.target.value || this.choicesCache[event.target.value]) return;
-
-          // Make sure nothing is highlighted
-          const highlighted = this.choicesInstance.dropdown.querySelector('.' + this.choicesInstance.config.classNames.highlightedState);
-          if (highlighted) return;
-
-          this.choicesInstance.setChoices([{
-            value: this.newItemPrefix + event.target.value,
-            label: event.target.value,
-            selected: true,
-            customProperties: {
-              value: event.target.value // Store real value, just in case
-            }
-          }], 'value', 'label', false);
-
-          this.choicesCache[event.target.value] = event.target.value;
-
-          event.target.value = null;
-          this.choicesInstance.hideDropdown();
-
-          return false;
-        });
-      }
-
-      // Handle remote search
-      if (this.remoteSearch && this.url) {
-        // Cache existing
-        this.choicesInstance.presetChoices.forEach((choiceItem) => {
-          this.choicesCache[choiceItem.value] = choiceItem.label;
-        });
-
-        const lookupDelay = 300;
-        let   lookupTimeout = null;
-        this.activeXHR = null;
-        this.select.addEventListener('search', (event) => {
-          clearTimeout(lookupTimeout);
-          lookupTimeout = setTimeout(this.requestLookup.bind(this), lookupDelay);
-        });
-      }
-    }
-
-    disconnectedCallback() {
-      // Destroy Choices instance, to unbind an event listeners
-      if (this.choicesInstance) {
-        this.choicesInstance.destroy();
-        this.choicesInstance = null;
-      }
-      if (this.activeXHR){
-        this.activeXHR.abort();
-        this.activeXHR = null;
-      }
-    }
-
-    requestLookup() {
-      let url = this.url;
-      url += (url.indexOf('?') === -1 ? '?' : '&');
-      url += encodeURIComponent(this.termKey) + '=' +  encodeURIComponent(this.choicesInstance.input.value);
-
-      // Stop previous request if any
-      if (this.activeXHR){
-        this.activeXHR.abort();
-      }
-
-      this.activeXHR = Joomla.request({
-        url: url,
-        onSuccess: (response, xhr) => {
-          this.activeXHR = null;
-          const items = response ? JSON.parse(response) : [];
-          if (!items.length) return;
-
-          // Remove duplications
-          let item;
-          for(let i = items.length - 1; i >= 0; i--) {
-            item = items[i];
-            if (this.choicesCache[item.value]) {
-              items.splice(i, 1);
-            }
-          }
-
-          // Add new options to field, assume that each item is object, eg {value: "foo", text: "bar"}
-          if (items.length) {
-            this.choicesInstance.setChoices(items, 'value', 'text', false);
-          }
-        },
-        onError: () => {
-          this.activeXHR = null;
-        }
-      });
-    }
-  }
-
-  customElements.define('joomla-field-fancy-select', JoomlaFieldFancySelect);
-
-})(customElements);
diff --git a/build/media/webcomponents/js/field-module-order/field-module-order.js b/build/media/webcomponents/js/field-module-order/field-module-order.js
deleted file mode 100644
index cf58cfc1b0650..0000000000000
--- a/build/media/webcomponents/js/field-module-order/field-module-order.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * @package         Joomla.JavaScript
- * @copyright       Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license         GNU General Public License version 2 or later; see LICENSE.txt
- */
-;customElements.define('joomla-field-module-order', class extends HTMLElement {
-	constructor() {
-		super();
-
-		this.linkedFieldSelector = '';
-		this.linkedFieldElement = '';
-		this.originalPosition = '';
-
-		this.writeDynaList.bind(this);
-		this.getNewOrder.bind(this);
-	}
-
-	connectedCallback() {
-		this.linkedFieldSelector = this.getAttribute('data-linked-field') || 'jform_position';
-
-		if (!this.linkedFieldSelector) {
-			throw new Error('No linked field defined!')
-		}
-
-		this.linkedFieldElement = document.getElementById(this.linkedFieldSelector);
-
-		if (!this.linkedFieldElement) {
-			throw new Error('No linked field defined!')
-		}
-
-		const that = this;
-		this.originalPosition = this.linkedFieldElement.value;
-
-		/** Initialize the field **/
-		this.getNewOrder(this.originalPosition);
-
-		/** Watch for changes on the linked field **/
-		this.linkedFieldElement.addEventListener('change', () => {
-			that.originalPosition = that.linkedFieldElement.value;
-			that.getNewOrder(that.linkedFieldElement.value);
-		});
-	}
-
-	writeDynaList (selectProperties, source, originalPositionName, originalPositionValue) {
-		let i = 0;
-		const selectNode = document.createElement('select');
-		if (this.hasOwnProperty('disabled')) {
-			selectNode.setAttribute('disabled', '');
-		}
-
-		if (this.getAttribute('onchange')) {
-			selectNode.setAttribute('onchange', this.getAttribute('onchange'));
-		}
-
-		if (this.getAttribute('size')) {
-			selectNode.setAttribute('size', this.getAttribute('size'));
-		}
-
-		selectNode.classList.add(selectProperties.itemClass);
-		selectNode.setAttribute('name', selectProperties.name);
-		selectNode.id = selectProperties.id;
-
-		for (let x in source) {
-			if (!source.hasOwnProperty(x)) {
-				continue;
-			}
-
-			const node = document.createElement('option');
-			const item = source[x];
-
-			node.value = item[1];
-			node.innerHTML = item[2];
-
-			if ((originalPositionName && originalPositionValue === item[1]) || (!originalPositionName && i === 0)) {
-				node.setAttribute('selected', 'selected');
-			}
-
-			selectNode.appendChild(node);
-			i++;
-		}
-
-		this.innerHTML = '';
-		this.appendChild(selectNode);
-	}
-
-	getNewOrder (originalPosition) {
-		const url = this.getAttribute('data-url');
-		const clientId = this.getAttribute('data-client-id');
-		const originalOrder = this.getAttribute('data-ordering');
-		const name = this.getAttribute('data-name');
-		const attr = this.getAttribute('data-client-attr') ? this.getAttribute('data-client-attr') : 'custom-select';
-		const id = this.getAttribute('id') + '_1';
-		const orders = [];
-		const that = this;
-
-		Joomla.request({
-				url: `${url}client_id=${clientId}&position=${originalPosition}`,
-				method: 'GET',
-				perform: true,
-				headers: {'Content-Type': 'application/x-www-form-urlencoded'},
-				onSuccess: function(response, xhr) {
-					if (response) {
-						response = JSON.parse(response);
-
-						/** Check if everything is OK **/
-						if (response.data.length > 0) {
-							for (let i = 0; i < response.data.length; ++i) {
-								orders[i] = response.data[i].split(',');
-							}
-
-							that.writeDynaList({
-									name: name,
-									id: id,
-									itemClass: attr
-								},
-								orders,
-								that.originalPosition,
-								originalOrder,
-							);
-						}
-					}
-
-					/** Render messages, if any. There are only message in case of errors. **/
-					if (typeof response.messages == 'object' && response.messages !== null)
-					{
-						Joomla.renderMessages(response.messages);
-					}
-				}
-			}
-		);
-	}
-});
diff --git a/build/media/webcomponents/js/field-permissions/field-permissions.js b/build/media/webcomponents/js/field-permissions/field-permissions.js
deleted file mode 100644
index daf8b9848311b..0000000000000
--- a/build/media/webcomponents/js/field-permissions/field-permissions.js
+++ /dev/null
@@ -1,152 +0,0 @@
-;((customElements, Joomla) => {
-
-	class JoomlaFieldPermissions extends HTMLElement {
-
-	constructor() {
-		super();
-
-		if (!Joomla) {
-			throw new Error('Joomla API is not properly initiated');
-		}
-
-		if (!this.getAttribute('data-uri')) {
-			throw new Error('No valid url for validation')
-		}
-	}
-
-	connectedCallback() {
-		const buttonDataSelector = 'data-onchange-task';
-		const buttons=[].slice.call(document.querySelectorAll('[' + buttonDataSelector + ']'));
-
-		if(buttons) {
-			buttons.forEach((button) => {
-				button.addEventListener('change', (e) => {
-				e.preventDefault();
-				const task = e.target.getAttribute(buttonDataSelector);
-					if(task == 'permissions.apply') {
-						this.sendPermissions(e);
-					}
-				});
-			});
-		}
-	}
-
-	sendPermissions(event) {
-		const target = event.target;
-		//set the icon while storing the values
-		const icon = document.getElementById('icon_' + target.id);
-		icon.removeAttribute('class');
-		icon.setAttribute('class','fa fa-spinner fa-spin');
-
-		//get values add prepare GET-Parameter
-		let asset		= 'not';
-		let component = this.getUrlParam('component');
-		let extension = this.getUrlParam('extension');
-		let option    = this.getUrlParam('option');
-		let view      = this.getUrlParam('view');
-		let title     = component;
-		let value     = target.value;
-		let context   = '';
-
-		if (document.getElementById('jform_context')) {
-			context = document.getElementById('jform_context').value;
-			context = context.split('.')[0];
-		}
-
-		if(option == 'com_config' && component == false && extension == false) {
-			asset = 'root.1';
-		} else if (extension == false && view == 'component') {
-			asset = component;
-		} else if (context) {
-			if (view == 'group') {
-				asset = context + '.fieldgroup.' + this.getUrlParam('id');
-			} else {
-				asset = context + '.field.' + this.getUrlParam('id');
-			}
-			title = document.getElementById('jform_title').value;
-		} else if (extension != false && view != false) {
-			asset = extension + '.' + view + '.' + this.getUrlParam('id');
-			title = document.getElementById('jform_title').value;
-		} else if (extension == false && view != false) {
-			asset = option + '.' + view + '.' + this.getUrlParam('id');
-			title = document.getElementById('jform_title').value;
-		}
-
-		const id                  = target.id.replace('jform_rules_', '');
-		const lastUnderscoreIndex = id.lastIndexOf('_');
-
-		const permissionData = {
-			  comp   : asset,
-			  action : id.substring(0, lastUnderscoreIndex),
-			  rule   : id.substring(lastUnderscoreIndex + 1),
-			  value  : value,
-			  title  : title,
-		};
-
-		// Remove JS messages, if they exist.
-		Joomla.removeMessages();
-
-		// Ajax request
-		Joomla.request({
-			url: this.getAttribute('data-uri'),
-			method: 'POST',
-			data: JSON.stringify(permissionData),
-			perform: true,
-			headers: {'Content-Type': 'application/json'},
-			onSuccess: (response, xhr) => {
-				try {
-					response = JSON.parse(response);
-				} catch(e) {
-					console.log(e)
-				}
-
-				icon.removeAttribute('class');
-
-				// Check if everything is OK
-				if (response.data && response.data.result === true) {
-					icon.setAttribute('class', 'fa fa-check');
-
-					const badgeSpan = target.parentNode.parentNode.nextElementSibling.querySelector('span');
-					badgeSpan.removeAttribute('class');
-					badgeSpan.setAttribute('class', response.data['class']);
-					badgeSpan.innerHTML = response.data.text;
-				}
-
-				// Render messages, if any. There are only message in case of errors.
-				if (typeof response.messages === 'object' && response.messages !== null) {
-					Joomla.renderMessages(response.messages);
-
-					if (response.data && response.data.result === true) {
-						icon.setAttribute('class', 'fa fa-check');
-					} else {
-						icon.setAttribute('class', 'fa fa-times');
-					}
-				}
-			},
-			onError: (xhr) => {
-				// Remove the spinning icon.
-				icon.removeAttribute('style');
-
-				Joomla.renderMessages(Joomla.ajaxErrorsMessages(jqXHR, textStatus, error));
-				icon.setAttribute('class', 'fa fa-times');
-			}
-		});
-	}
-
-	getUrlParam(variable) {
-		const query = window.location.search.substring(1);
-		const vars = query.split('&');
-
-		for(let i = 0; i < vars.length; i += 1) {
-			let pair =vars[i].split('=');
-			if(pair[0] == variable) {
-				return pair[1];
-			}
-		}
-		return false;
-	}
-}
-
-customElements.define('joomla-field-permissions', JoomlaFieldPermissions);
-
-})(customElements, Joomla);
\ No newline at end of file
diff --git a/build/media/webcomponents/js/field-send-test-mail/field-send-test-mail.js b/build/media/webcomponents/js/field-send-test-mail/field-send-test-mail.js
deleted file mode 100644
index b8d549a22a088..0000000000000
--- a/build/media/webcomponents/js/field-send-test-mail/field-send-test-mail.js
+++ /dev/null
@@ -1,65 +0,0 @@
-;((customElements, Joomla) => {
-
-	class JoomlaFieldSendTestMail extends HTMLElement {
-
-	// attributeChangedCallback(attr, oldValue, newValue) {}
-	constructor() {
-		super();
-
-		if (!Joomla) {
-			throw new Error('Joomla API is not properly initiated');
-		}
-
-		if (!this.getAttribute('uri')) {
-			throw new Error('No valid url for validation')
-		}
-	}
-
-	connectedCallback() {
-		const self = this;
-		const button = document.getElementById('sendtestmail');
-
-		if (button) {
-			button.addEventListener('click', () => { self.sendTestMail(self); });
-		}
-	}
-
-	sendTestMail() {
-		const email_data = {
-			smtpauth: this.querySelector('[name="jform[smtpauth]"]').value,
-			smtpuser: this.querySelector('[name="jform[smtpuser]"]').value,
-			smtppass: this.querySelector('[name="jform[smtppass]"]').value,
-			smtphost: this.querySelector('[name="jform[smtphost]"]').value,
-			smtpsecure: this.querySelector('[name="jform[smtpsecure]"]').value,
-			smtpport: this.querySelector('[name="jform[smtpport]"]').value,
-			mailfrom: this.querySelector('[name="jform[mailfrom]"]').value,
-			fromname: this.querySelector('[name="jform[fromname]"]').value,
-			mailer: this.querySelector('[name="jform[mailer]"]').value,
-			mailonline: this.querySelector('[name="jform[mailonline]"]').value,
-		};
-
-		// Remove js messages, if they exist.
-		Joomla.removeMessages();
-
-		Joomla.request({
-			url: this.getAttribute('uri'),
-			method: 'POST',
-			data: JSON.stringify(email_data),
-			perform: true,
-			headers: { 'Content-Type': 'application/json' },
-			onSuccess: (response, xhr) => {
-				response = JSON.parse(response);
-				if (typeof response.messages === 'object' && response.messages !== null) {
-					Joomla.renderMessages(response.messages);
-				}
-			},
-			onError: (xhr) => {
-				Joomla.renderMessages(Joomla.ajaxErrorsMessages(xhr));
-			},
-		});
-	}
-}
-
-customElements.define('joomla-field-send-test-mail', JoomlaFieldSendTestMail);
-
-})(customElements, Joomla);
diff --git a/build/media/webcomponents/js/field-simple-color/field-simple-color.js b/build/media/webcomponents/js/field-simple-color/field-simple-color.js
deleted file mode 100644
index 9170856e967a1..0000000000000
--- a/build/media/webcomponents/js/field-simple-color/field-simple-color.js
+++ /dev/null
@@ -1,412 +0,0 @@
-/**
- * Based on:
- * Very simple jQuery Color Picker
- * Copyright (C) 2012 Tanguy Krotoff
- * Licensed under the MIT license
- *
- * ADAPTED BY: Dimitris Grammatikogiannis
- *
- */
-((customElements) => {
-	const KEYCODE = {
-		TAB: 9,
-		ESC: 27,
-	};
-
-	const colorNames = {
-		aliceblue:              '#f0f8ff',
-		antiquewhite:           '#faebd7',
-		aqua:                   '#00ffff',
-		aquamarine:             '#7fffd4',
-		azure:                  '#f0ffff',
-		beige:                  '#f5f5dc',
-		bisque:                 '#ffe4c4',
-		black:                  '#000000',
-		blanchedalmond:         '#ffebcd',
-		blue:                   '#0000ff',
-		blueviolet:             '#8a2be2',
-		brown:                  '#a52a2a',
-		burlywood:              '#deb887',
-		cadetblue:              '#5f9ea0',
-		chartreuse:             '#7fff00',
-		chocolate:              '#d2691e',
-		coral:                  '#ff7f50',
-		cornflowerblue:         '#6495ed',
-		cornsilk:               '#fff8dc',
-		crimson:                '#dc143c',
-		cyan:                   '#00ffff',
-		darkblue:               '#00008b',
-		darkcyan:               '#008b8b',
-		darkgoldenrod:          '#b8860b',
-		darkgray:               '#a9a9a9',
-		darkgreen:              '#006400',
-		darkgrey:               '#a9a9a9',
-		darkkhaki:              '#bdb76b',
-		darkmagenta:            '#8b008b',
-		darkolivegreen:         '#556b2f',
-		darkorange:             '#ff8c00',
-		darkorchid:             '#9932cc',
-		darkred:                '#8b0000',
-		darksalmon:             '#e9967a',
-		darkseagreen:           '#8fbc8f',
-		darkslateblue:          '#483d8b',
-		darkslategray:          '#2f4f4f',
-		darkslategrey:          '#2f4f4f',
-		darkturquoise:          '#00ced1',
-		darkviolet:             '#9400d3',
-		deeppink:               '#ff1493',
-		deepskyblue:            '#00bfff',
-		dimgray:                '#696969',
-		dimgrey:                '#696969',
-		dodgerblue:             '#1e90ff',
-		firebrick:              '#b22222',
-		floralwhite:            '#fffaf0',
-		forestgreen:            '#228b22',
-		fuchsia:                '#ff00ff',
-		gainsboro:              '#dcdcdc',
-		ghostwhite:             '#f8f8ff',
-		gold:                   '#ffd700',
-		goldenrod:              '#daa520',
-		gray:                   '#808080',
-		green:                  '#008000',
-		greenyellow:            '#adff2f',
-		grey:                   '#808080',
-		honeydew:               '#f0fff0',
-		hotpink:                '#ff69b4',
-		indianred:              '#cd5c5c',
-		indigo:                 '#4b0082',
-		ivory:                  '#fffff0',
-		khaki:                  '#f0e68c',
-		lavender:               '#e6e6fa',
-		lavenderblush:          '#fff0f5',
-		lawngreen:              '#7cfc00',
-		lemonchiffon:           '#fffacd',
-		lightblue:              '#add8e6',
-		lightcoral:             '#f08080',
-		lightcyan:              '#e0ffff',
-		lightgoldenrodyellow:   '#fafad2',
-		lightgray:              '#d3d3d3',
-		lightgreen:             '#90ee90',
-		lightgrey:              '#d3d3d3',
-		lightpink:              '#ffb6c1',
-		lightsalmon:            '#ffa07a',
-		lightseagreen:          '#20b2aa',
-		lightskyblue:           '#87cefa',
-		lightslategray:         '#778899',
-		lightslategrey:         '#778899',
-		lightsteelblue:         '#b0c4de',
-		lightyellow:            '#ffffe0',
-		lime:                   '#00ff00',
-		limegreen:              '#32cd32',
-		linen:                  '#faf0e6',
-		magenta:                '#ff00ff',
-		maroon:                 '#800000',
-		mediumaquamarine:       '#66cdaa',
-		mediumblue:             '#0000cd',
-		mediumorchid:           '#ba55d3',
-		mediumpurple:           '#9370db',
-		mediumseagreen:         '#3cb371',
-		mediumslateblue:        '#7b68ee',
-		mediumspringgreen:      '#00fa9a',
-		mediumturquoise:        '#48d1cc',
-		mediumvioletred:        '#c71585',
-		midnightblue:           '#191970',
-		mintcream:              '#f5fffa',
-		mistyrose:              '#ffe4e1',
-		moccasin:               '#ffe4b5',
-		navajowhite:            '#ffdead',
-		navy:                   '#000080',
-		oldlace:                '#fdf5e6',
-		olive:                  '#808000',
-		olivedrab:              '#6b8e23',
-		orange:                 '#ffa500',
-		orangered:              '#ff4500',
-		orchid:                 '#da70d6',
-		palegoldenrod:          '#eee8aa',
-		palegreen:              '#98fb98',
-		paleturquoise:          '#afeeee',
-		palevioletred:          '#db7093',
-		papayawhip:             '#ffefd5',
-		peachpuff:              '#ffdab9',
-		peru:                   '#cd853f',
-		pink:                   '#ffc0cb',
-		plum:                   '#dda0dd',
-		powderblue:             '#b0e0e6',
-		purple:                 '#800080',
-		red:                    '#ff0000',
-		rosybrown:              '#bc8f8f',
-		royalblue:              '#4169e1',
-		saddlebrown:            '#8b4513',
-		salmon:                 '#fa8072',
-		sandybrown:             '#f4a460',
-		seagreen:               '#2e8b57',
-		seashell:               '#fff5ee',
-		sienna:                 '#a0522d',
-		silver:                 '#c0c0c0',
-		skyblue:                '#87ceeb',
-		slateblue:              '#6a5acd',
-		slategray:              '#708090',
-		slategrey:              '#708090',
-		snow:                   '#fffafa',
-		springgreen:            '#00ff7f',
-		steelblue:              '#4682b4',
-		tan:                    '#d2b48c',
-		teal:                   '#008080',
-		thistle:                '#d8bfd8',
-		tomato:                 '#ff6347',
-		turquoise:              '#40e0d0',
-		violet:                 '#ee82ee',
-		wheat:                  '#f5deb3',
-		white:                  '#ffffff',
-		whitesmoke:             '#f5f5f5',
-		yellow:                 '#ffff00',
-		yellowgreen:            '#9acd32',
-	};
-
-	class JoomlaFieldSimpleColor extends HTMLElement {
-		constructor() {
-			super();
-
-			// Define some variables
-			this.select  = '';
-			this.options = [];
-			this.icon    = '';
-			this.panel   = '';
-			this.buttons = [];
-			this.focusableElements = null;
-			this.focusableSelectors = ['a[href]', 'area[href]', 'input:not([disabled])', 'select:not([disabled])', 'textarea:not([disabled])', 'button:not([disabled])', 'iframe', 'object', 'embed', '[contenteditable]', '[tabindex]:not([tabindex^="-"])'];
-		}
-
-		connectedCallback() {
-			this.select = this.querySelector('select');
-
-			if (!this.select) {
-				throw new Error('Simple color field requires a select element')
-			}
-
-			this.options = [].slice.call(this.select.querySelectorAll('option'));
-
-			this.select.classList.add('hidden');
-
-			// Build the pop up
-			this.options.forEach((option) => {
-				let color = option.value;
-				let clss = 'swatch';
-
-				if (color === 'none') {
-					clss += ' nocolor';
-					color = 'transparent';
-				}
-				if (option.selected) {
-					clss += ' active';
-				}
-
-				const el = document.createElement('button');
-				el.setAttribute('class', clss);
-				el.style.backgroundColor = color;
-				el.setAttribute('type', 'button');
-				const a11yColor = color === 'transparent' ? this.textTransp : this.getColorName(color);
-				el.innerHTML = `<span class="sr-only">${a11yColor}</span>`;
-
-				this.buttons.push(el)
-			});
-
-			// Add a close button
-			const close = document.createElement('button');
-			close.setAttribute('class', 'btn-close');
-			close.setAttribute('type', 'button');
-			close.innerHTML = this.textClose;
-
-			this.buttons.push(close);
-
-			let color = this.select.value;
-			let clss  = '';
-
-			if (color === 'none') {
-				clss += ' nocolor';
-				color = 'transparent';
-			}
-
-			this.icon = document.createElement('button');
-
-			if (clss) {
-				this.icon.setAttribute('class', clss);
-			}
-
-			const uniqueId = `simple-color-${Math.random().toString(36).substr(2, 10)}`;
-			this.icon.setAttribute('type', 'button');
-			this.icon.setAttribute('tabindex', '0');
-			this.icon.style.backgroundColor = color
-			this.icon.innerHTML = '<span class="sr-only">' + this.textSelect + '</span>';
-			this.icon.id = uniqueId;
-			this.select.insertAdjacentElement('beforebegin', this.icon);
-			this.icon.addEventListener('click', this.show.bind(this));
-
-			this.panel = document.createElement('div');
-			this.panel.classList.add('simplecolors-panel');
-			this.panel.setAttribute('aria-labelledby', uniqueId);
-			this.hide = this.hide.bind(this);
-			this.colorSelect = this.colorSelect.bind(this);
-
-			this.buttons.forEach((el) => {
-				if (el.classList.contains('btn-close')) {
-					el.addEventListener('click', this.hide);
-				} else {
-					el.addEventListener('click', this.colorSelect);
-				}
-
-				this.panel.insertAdjacentElement('beforeend', el);
-			});
-
-			this.appendChild(this.panel);
-
-			this.focusableElements = [].slice.call(this.panel.querySelectorAll(this.focusableSelectors.join()));
-
-			this.keys = this.keys.bind(this);
-			this.hide = this.hide.bind(this);
-			this.mousedown = this.mousedown.bind(this);
-		}
-
-		disconnectedCallback() {
-
-		}
-
-		static get observedAttributes() {
-			return ['text-select', 'text-color', 'text-close', 'text-transparent'];
-		}
-
-		get textSelect() { return this.getAttribute('text-select'); }
-		get textColor() { return this.getAttribute('text-color'); }
-		get textClose() { return this.getAttribute('text-close'); }
-		get textTransp() { return this.getAttribute('text-transparent'); }
-
-		// Show the panel
-		show() {
-			document.addEventListener('mousedown', this.hide);
-			this.addEventListener('keydown', this.keys);
-			this.panel.addEventListener('mousedown', this.mousedown);
-			this.panel.setAttribute('data-open', '');
-
-			const focused = this.panel.querySelector('button');
-
-			if (focused) {
-				focused.focus();
-			}
-		}
-
-		// Hide panel
-		hide() {
-			document.removeEventListener('mousedown', this.hide, false);
-			this.removeEventListener('keydown', this.keys);
-
-			if (this.panel.hasAttribute('data-open')) {
-				this.panel.removeAttribute('data-open');
-			}
-
-			this.icon.focus();
-		}
-
-		colorSelect(e) {
-			let color   = '';
-			let bgcolor = '';
-			let clss    = '';
-
-			if (e.target.classList.contains('nocolor')) {
-				color   = 'none';
-				bgcolor = 'transparent';
-				clss    = 'nocolor';
-			} else {
-				color   = this.rgb2hex(e.target.style.backgroundColor);
-				bgcolor = color;
-			}
-
-			// Reset the active class
-			this.buttons.forEach((el) => {
-				if (el.classList.contains('active')) {
-					el.classList.remove('active')
-				}
-			});
-
-			// Add the active class to the selected button
-			e.target.classList.add('active');
-
-			this.icon.classList.remove('nocolor');
-			this.icon.setAttribute('class', clss);
-			this.icon.style.backgroundColor = bgcolor;
-
-			// Hide the panel
-			this.hide();
-
-			// Change select value
-			this.options.forEach((el) => {
-				if (el.selected) {
-					el.removeAttribute('selected');
-				}
-
-				if (el.value === bgcolor) {
-					el.setAttribute('selected', '');
-				}
-			});
-		}
-
-		keys(e) {
-			if (e.keyCode === KEYCODE.ESC) {
-				this.hide();
-			}
-
-			if (e.keyCode === KEYCODE.TAB) {
-				// Get the index of the current active element
-				const focusedIndex = this.focusableElements.indexOf(document.activeElement);
-
-				// If first element is focused and shiftkey is in use, focus last item within modal
-				if (e.shiftKey && (focusedIndex === 0 || focusedIndex === -1)) {
-					this.focusableElements[this.focusableElements.length - 1].focus();
-					e.preventDefault();
-				}
-				// If last element is focused and shiftkey is not in use, focus first item within modal
-				if (!e.shiftKey && focusedIndex === this.focusableElements.length - 1) {
-					this.focusableElements[0].focus();
-					e.preventDefault();
-				}
-			}
-		}
-
-		// Prevents the mousedown event from "eating" the click event.
-		mousedown(e) {
-			e.stopPropagation();
-			e.preventDefault();
-		}
-
-		getColorName(value) {
-			// Expand any short code
-			let newValue = value;
-			if (value.length === 4) {
-				const tmpValue = value.split('');
-				newValue = tmpValue[0] + tmpValue[1] + tmpValue[1] + tmpValue[2] + tmpValue[2] + tmpValue[3] + tmpValue[3];
-			}
-
-			for (const color in colorNames) {
-				if (colorNames.hasOwnProperty(color) && newValue.toLowerCase() === colorNames[color]) {
-					return color;
-				}
-			}
-
-			return this.textColor + ' ' + value.replace('#', '').split('').join(', ')
-		}
-
-		/**
-		 * Converts a RGB color to its hexadecimal value.
-		 * See http://stackoverflow.com/questions/1740700/get-hex-value-rather-than-rgb-value-using-$
-		 */
-		rgb2hex(rgb) {
-			const hex = (x) => {
-				return ("0" + parseInt(x, 10).toString(16)).slice(-2);
-			};
-			const matches = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
-
-			return '#' + hex(matches[1]) + hex(matches[2]) + hex(matches[3]);
-		}
-	}
-
-	customElements.define('joomla-field-simple-color', JoomlaFieldSimpleColor);
-})(customElements);
diff --git a/build/media/webcomponents/js/field-subform/field-subform.js b/build/media/webcomponents/js/field-subform/field-subform.js
deleted file mode 100644
index 7a672a9c20fde..0000000000000
--- a/build/media/webcomponents/js/field-subform/field-subform.js
+++ /dev/null
@@ -1,594 +0,0 @@
-/**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-;(function(customElements){
-    "use strict";
-
-    const KEYCODE = {
-        SPACE: 32,
-        ESC: 27,
-        ENTER: 13
-    };
-
-    // Find matchesFn with vendor prefix
-    let matchesFn = 'matches';
-    ['matches', 'msMatchesSelector'].some(function(fn) {
-        if (typeof document.body[fn] === 'function') {
-            matchesFn = fn;
-            return true;
-        }
-        return false;
-    });
-
-    class JoomlaFieldSubform extends HTMLElement {
-
-        // Attribute getters
-        get buttonAdd()         { return this.getAttribute('button-add'); }
-        get buttonRemove()      { return this.getAttribute('button-remove'); }
-        get buttonMove()        { return this.getAttribute('button-move'); }
-        get rowsContainer()     { return this.getAttribute('rows-container'); }
-        get repeatableElement() { return this.getAttribute('repeatable-element'); }
-        get minimum()           { return this.getAttribute('minimum'); }
-        get maximum()           { return this.getAttribute('maximum'); }
-        get name()              { return this.getAttribute('name'); }
-
-        set name(value)         {
-            // Update the template
-            this.template = this.template.replace(new RegExp(' name="' + this.name.replace(/[\[\]]/g, '\\$&'), 'g'), ' name="' + value);
-
-            return this.setAttribute('name', value);
-        }
-
-        constructor() {
-            super();
-
-            let that = this;
-
-            // Get the rows container
-            this.containerWithRows = this;
-
-            if (this.rowsContainer) {
-                let allContainers = this.querySelectorAll(this.rowsContainer);
-
-                // Find closest, and exclude nested
-                for (let i = 0, l = allContainers.length; i < l; i++) {
-                    if (closest(allContainers[i], 'joomla-field-subform') === this) {
-                        this.containerWithRows = allContainers[i];
-                        break;
-                    }
-                }
-            }
-
-            // Last row number, help to avoid the name duplications
-            this.lastRowNum = this.getRows().length;
-
-            // Template for the repeating group
-            this.template = '';
-
-            // Prepare a row template, and find available field names
-            this.prepareTemplate();
-
-            // Bind buttons
-            if (this.buttonAdd || this.buttonRemove) {
-                this.addEventListener('click', function(event) {
-                    let btnAdd = null, btnRem = null;
-
-                    if (that.buttonAdd) {
-                        btnAdd = event.target[matchesFn](that.buttonAdd) ? event.target : closest(event.target, that.buttonAdd);
-                    }
-
-                    if (that.buttonRemove) {
-                        btnRem = event.target[matchesFn](that.buttonRemove) ? event.target : closest(event.target, that.buttonRemove);
-                    }
-
-                    // Check actine, with extra check for nested joomla-field-subform
-                    if (btnAdd && closest(btnAdd, 'joomla-field-subform') === that) {
-                        let row = closest(btnAdd, that.repeatableElement);
-                        row = closest(row, 'joomla-field-subform') === that ? row : null;
-                        that.addRow(row);
-                        event.preventDefault();
-                    } else if (btnRem && closest(btnRem, 'joomla-field-subform') === that) {
-                        let row = closest(btnRem, that.repeatableElement);
-                        that.removeRow(row);
-                        event.preventDefault();
-                    }
-                });
-
-                this.addEventListener('keydown', function(event) {
-                    if (event.keyCode !== KEYCODE.SPACE) return;
-                    let isAdd = that.buttonAdd && event.target[matchesFn](that.buttonAdd);
-                    let isRem = that.buttonRemove && event.target[matchesFn](that.buttonRemove);
-
-                    if ((isAdd || isRem) && closest(event.target, 'joomla-field-subform') === that) {
-                        let row = closest(event.target, that.repeatableElement);
-                        row = closest(row, 'joomla-field-subform') === that ? row : null;
-                        if (isRem && row) {
-                            that.removeRow(row);
-                        } else if (isAdd) {
-                            that.addRow(row)
-                        }
-                        event.preventDefault();
-                    }
-                });
-            }
-
-            // Sorting
-            if (this.buttonMove) {
-                this.setUpDragSort();
-            }
-        }
-
-        /**
-         * Search for existing rows
-         * @returns {HTMLElement[]}
-         */
-        getRows () {
-            let rows = this.containerWithRows.children,
-                matchesFn = document.body['msMatchesSelector'] ? 'msMatchesSelector' : 'matches',
-                result = [];
-
-            // Filter out the rows
-            for (let i = 0, l = rows.length; i < l; i++) {
-                if (rows[i][matchesFn](this.repeatableElement)) {
-                    result.push(rows[i]);
-                }
-            }
-
-            return result;
-        }
-
-        /**
-         * Prepare a row template
-         */
-        prepareTemplate () {
-            let tmplElement = [].slice.call(this.children).filter(function(el){
-                return el.classList.contains('subform-repeatable-template-section');
-            });
-
-            if (tmplElement[0]) {
-                this.template = tmplElement[0].innerHTML;
-            }
-
-            if (!this.template) {
-                throw new Error('The row template are required to subform element to work')
-            }
-        }
-
-        /**
-         * Add new row
-         * @param {HTMLElement} after
-         * @returns {HTMLElement}
-         */
-        addRow (after) {
-            // Count how much we already have
-            const count = this.getRows().length;
-            if (count >= this.maximum){
-                return null;
-            }
-
-            // Make a new row from the template
-            let tmpEl;
-            if (this.containerWithRows.nodeName === 'TBODY' || this.containerWithRows.nodeName === 'TABLE') {
-                tmpEl = document.createElement('tbody');
-            } else {
-                tmpEl = document.createElement('div');
-            }
-            tmpEl.innerHTML = this.template;
-            let row = tmpEl.children[0];
-
-            // Add to container
-            if (after) {
-                after.parentNode.insertBefore(row, after.nextSibling);
-            } else {
-                this.containerWithRows.append(row);
-            }
-
-            // Add dragable attributes
-            if (this.buttonMove) {
-                row.setAttribute('draggable', 'false');
-                row.setAttribute('aria-grabbed', 'false');
-                row.setAttribute('tabindex', '0');
-            }
-
-            // Marker that it is new
-            row.setAttribute('data-new', '1');
-            // Fix names and ids, and reset values
-            this.fixUniqueAttributes(row, count);
-
-            // Tell about the new row
-            this.dispatchEvent(new CustomEvent('subform-row-add', {
-                detail:     {row: row},
-                bubbles:    true
-            }));
-
-            if (window.Joomla) {
-                Joomla.Event.dispatch(row, 'joomla:updated');
-            }
-
-            return row;
-        }
-
-        /**
-         * Remove the row
-         * @param {HTMLElement} row
-         */
-        removeRow (row) {
-            // Count how much we have
-            const count = this.getRows().length;
-            if (count <= this.minimum){
-                return;
-            }
-
-            // Tell about the row will be removed
-            this.dispatchEvent(new CustomEvent('subform-row-remove', {
-                detail:     {row: row},
-                bubbles:    true
-            }));
-
-            if (window.Joomla) {
-                Joomla.Event.dispatch(row, 'joomla:removed');
-            }
-
-            row.parentNode.removeChild(row);
-        }
-
-        /**
-         * Fix names ind id`s for field that in the row
-         * @param {HTMLElement} row
-         * @param {Number} count
-         */
-        fixUniqueAttributes(row, count) {
-            this.lastRowNum++;
-            count = count || 0;
-
-            let group    = row.getAttribute('data-group'), // current group name
-                basename = row.getAttribute('data-base-name'), // group base name, without count
-                countnew = Math.max(this.lastRowNum, count),
-                groupnew = basename + countnew; // new group name
-
-            this.lastRowNum = countnew + 1;
-            row.setAttribute('data-group', groupnew);
-
-            // Fix inputs that have a "name" attribute
-            let haveName = row.querySelectorAll('[name]'),
-                ids = {}; // Collect id for fix checkboxes and radio
-
-            // Filter out nested
-            haveName = [].slice.call(haveName).filter(el => {
-                return closest(el, 'joomla-field-subform') === this;
-            });
-
-            for (let i = 0, l = haveName.length; i < l; i++) {
-                let $el     = haveName[i],
-                    name    = $el.getAttribute('name'),
-                    id      = name.replace(/(\[\]$)/g, '').replace(/(\]\[)/g, '__').replace(/\[/g, '_').replace(/\]/g, ''), // id from name
-                    nameNew = name.replace('[' + group + '][', '['+ groupnew +']['), // New name
-                    idNew   = id.replace(group, groupnew), // Count new id
-                    countMulti = 0,  // count for multiple radio/checkboxes
-                    forOldAttr = id; // Fix "for" in the labels
-
-                if ($el.type === 'checkbox' && name.match(/\[\]$/)) { // <input type="checkbox" name="name[]"> fix
-                    // Recount id
-                    countMulti = ids[id] ? ids[id].length : 0;
-                    if (!countMulti) {
-                        // Set the id for fieldset and group label
-                        let fieldset = closest($el, 'fieldset.checkboxes'),
-                            elLbl = row.querySelector('label[for="' + id + '"]');
-
-                        if (fieldset) {
-                            fieldset.setAttribute('id', idNew);
-                        }
-
-                        if (elLbl) {
-                            elLbl.setAttribute('for', idNew);
-                            elLbl.setAttribute('id', idNew + '-lbl');
-                        }
-                    }
-                    forOldAttr = forOldAttr + countMulti;
-                    idNew = idNew + countMulti;
-                }
-                else if ($el.type === 'radio') { // <input type="radio"> fix
-                    // Recount id
-                    countMulti = ids[id] ? ids[id].length : 0;
-                    if (!countMulti) {
-                        // Set the id for fieldset and group label
-                        let fieldset = closest($el, 'fieldset.radio'),
-                            elLbl = row.querySelector('label[for="' + id + '"]');
-
-                        if (fieldset) {
-                            fieldset.setAttribute('id', idNew);
-                        }
-
-                        if (elLbl) {
-                            elLbl.setAttribute('for', idNew);
-                            elLbl.setAttribute('id', idNew + '-lbl');
-                        }
-                    }
-                    forOldAttr = forOldAttr + countMulti;
-                    idNew = idNew + countMulti;
-                }
-
-                // Cache already used id
-                if (ids[id]) {
-                    ids[id].push(true);
-                } else {
-                    ids[id] = [true];
-                }
-
-                // Replace the name to new one
-                $el.name = nameNew;
-                if ($el.id) {
-                    $el.id = idNew;
-                }
-
-                // Guess there a label for this input
-                let lbl = row.querySelector('label[for="' + forOldAttr + '"]');
-                if (lbl) {
-                    lbl.setAttribute('for', idNew);
-                    lbl.setAttribute('id', idNew + '-lbl');
-                }
-            }
-        }
-
-        /**
-         * Use of HTML Drag and Drop API
-         * https://developer.mozilla.org/en-US/docs/Web/API/HTML_Drag_and_Drop_API
-         * https://www.sitepoint.com/accessible-drag-drop/
-         */
-        setUpDragSort() {
-            let that = this; // Self reference
-            let item = null; // Storing the selected item
-            let touched = false; // We have a touch events
-
-            // Find all existing rows and add dragable attributes
-            let rows = this.getRows();
-            for (let ir = 0, lr = rows.length; ir < lr; ir++) {
-                let childRow = rows[ir];
-
-                childRow.setAttribute('draggable', 'false');
-                childRow.setAttribute('aria-grabbed', 'false');
-                childRow.setAttribute('tabindex', '0');
-            }
-
-            // Helper method to test whether Handler was clicked
-            function getMoveHandler(element) {
-                return !element.form // This need to test whether the element is :input
-                && element[matchesFn](that.buttonMove) ? element : closest(element, that.buttonMove);
-            }
-
-            // Helper method to mover row to selected position
-            function switchRowPositions(src, dest) {
-                let isRowBefore = false;
-                if (src.parentNode === dest.parentNode) {
-                    for (let cur = src; cur; cur = cur.previousSibling) {
-                        if (cur === dest) {
-                            isRowBefore = true;
-                            break;
-                        }
-                    }
-                }
-
-                if (isRowBefore) {
-                    dest.parentNode.insertBefore(src, dest);
-                }
-                else {
-                    dest.parentNode.insertBefore(src, dest.nextSibling);
-                }
-            }
-
-            // Touch interaction:
-            // - a touch of "move button" mark a row dragable / "selected", or deselect previous selected
-            // - a touch of "move button" in the destination row will move a selected row to a new position
-            this.addEventListener('touchstart', function(event) {
-                touched = true;
-
-                // Check for .move button
-                let handler = getMoveHandler(event.target),
-                    row = handler ? closest(handler, that.repeatableElement) : null;
-
-                if (!row || closest(row, 'joomla-field-subform') !== that) {
-                    return;
-                }
-
-                // First selection
-                if (!item) {
-                    row.setAttribute('draggable', 'true');
-                    row.setAttribute('aria-grabbed', 'true');
-                    item = row;
-                }
-                // Second selection
-                else {
-                    // Move to selected position
-                    if (row !== item) {
-                        switchRowPositions(item, row);
-                    }
-
-                    item.setAttribute('draggable', 'false');
-                    item.setAttribute('aria-grabbed', 'false');
-                    item = null;
-                }
-
-                event.preventDefault();
-            });
-
-            // Mouse interaction
-            // - mouse down, enable "draggable" and allow to drag the row,
-            // - mouse up, disable "draggable"
-            this.addEventListener('mousedown', function(event) {
-                if (touched) return;
-
-                // Check for .move button
-                let handler = getMoveHandler(event.target),
-                    row = handler ? closest(handler, that.repeatableElement) : null;
-
-                if (!row || closest(row, 'joomla-field-subform') !== that) {
-                    return;
-                }
-
-                row.setAttribute('draggable', 'true');
-                row.setAttribute('aria-grabbed', 'true');
-                item = row;
-            });
-
-            this.addEventListener('mouseup', function(event) {
-                if (item && !touched) {
-                    item.setAttribute('draggable', 'false');
-                    item.setAttribute('aria-grabbed', 'false');
-                    item = null;
-                }
-            });
-
-            // Keyboard interaction
-            // - "tab" to navigate to needed row,
-            // - modifier (ctr,alt,shift) + "space" select the row,
-            // - "tab" to select destination,
-            // - "enter" to place selected row in to destination
-            // - "esc" to cancel selection
-            this.addEventListener('keydown', function(event) {
-                if ((event.keyCode !== KEYCODE.ESC && event.keyCode !== KEYCODE.SPACE && event.keyCode !== KEYCODE.ENTER)
-                    || event.target.form || !event.target[matchesFn](that.repeatableElement)) {
-                    return;
-                }
-
-                let row = event.target;
-
-                // Make sure we handle correct children
-                if (!row || closest(row, 'joomla-field-subform') !== that) {
-                    return;
-                }
-
-                // Space is the selection or unselection keystroke
-                if (event.keyCode === KEYCODE.SPACE && hasModifier(event)) {
-                    // Unselect previously selected
-                    if (row.getAttribute('aria-grabbed') === 'true') {
-                        row.setAttribute('draggable', 'false');
-                        row.setAttribute('aria-grabbed', 'false');
-                        item = null;
-                    }
-                    // Select new
-                    else {
-                        // If there was previously selected
-                        if (item) {
-                            item.setAttribute('draggable', 'false');
-                            item.setAttribute('aria-grabbed', 'false');
-                            item = null;
-                        }
-
-                        // Mark new selection
-                        row.setAttribute('draggable', 'true');
-                        row.setAttribute('aria-grabbed', 'true');
-                        item = row;
-                    }
-
-                    // Prevent default to suppress any native actions
-                    event.preventDefault();
-                }
-
-
-                // Escape is the abort keystroke (for any target element)
-                if (event.keyCode === KEYCODE.ESC && item) {
-                    item.setAttribute('draggable', 'false');
-                    item.setAttribute('aria-grabbed', 'false');
-                    item = null;
-                }
-
-                // Enter, to place selected item in selected position
-                if (event.keyCode === KEYCODE.ENTER && item) {
-                    item.setAttribute('draggable', 'false');
-                    item.setAttribute('aria-grabbed', 'false');
-
-                    // Do nothing here
-                    if (row === item) {
-                        item = null;
-                        return;
-                    }
-
-                    // Move the item to selected position
-                    switchRowPositions(item, row);
-
-                    event.preventDefault();
-                    item = null;
-                }
-            });
-
-            // dragstart event to initiate mouse dragging
-            this.addEventListener('dragstart', function(event) {
-                if (item) {
-                    // We going to move the row
-                    event.dataTransfer.effectAllowed = 'move';
-
-                    // This need to work in Firefox and IE10+
-                    event.dataTransfer.setData('text', '');
-                }
-            });
-
-            this.addEventListener('dragover', function(event) {
-                if (item) {
-                    event.preventDefault();
-                }
-            });
-
-            // Handle drag action, move element to hovered position
-            this.addEventListener('dragenter', function(event) {
-                // Make sure the target in the correct container
-                if (!item || that.rowsContainer && closest(event.target, that.rowsContainer) !== that.containerWithRows) {
-                    return;
-                }
-
-                // Find a hovered row, and replace it
-                let row = event.target[matchesFn](that.repeatableElement) ? event.target : closest(event.target, that.repeatableElement);
-                if (!row) return;
-
-                switchRowPositions(item, row);
-            });
-
-            // dragend event to clean-up after drop or abort
-            // which fires whether or not the drop target was valid
-            this.addEventListener('dragend', function() {
-                if (item) {
-                    item.setAttribute('draggable', 'false');
-                    item.setAttribute('aria-grabbed', 'false');
-                    item = null;
-                }
-            });
-        }
-    }
-
-    customElements.define('joomla-field-subform', JoomlaFieldSubform);
-
-    /**
-     * Helper to find a closest parent element
-     *
-     * @param {HTMLElement} element
-     * @param {String}      selector
-     *
-     * @returns {HTMLElement|null}
-     */
-    function closest(element, selector) {
-        let parent;
-
-        // Traverse parents
-        while (element) {
-            parent = element.parentElement;
-            if (parent && parent[matchesFn](selector)) {
-                return parent;
-            }
-            element = parent;
-        }
-
-        return null;
-    }
-
-    /**
-     * Helper for testing whether a selection modifier is pressed
-     * @param {Event} event
-     *
-     * @returns {boolean|*}
-     */
-    function hasModifier(event) {
-        return (event.ctrlKey || event.metaKey || event.shiftKey);
-    }
-
-})(customElements);
diff --git a/build/media/webcomponents/js/hidden-mail/hidden-mail.js b/build/media/webcomponents/js/hidden-mail/hidden-mail.js
deleted file mode 100644
index a8bfb250dba4b..0000000000000
--- a/build/media/webcomponents/js/hidden-mail/hidden-mail.js
+++ /dev/null
@@ -1,50 +0,0 @@
-;customElements.define('joomla-hidden-mail', class extends HTMLElement {
-	connectedCallback() {
-		let newEl;
-		let base = this.getAttribute('base') + '/';
-
-		if (this.getAttribute('is-link') === '1') {
-			newEl = document.createElement('a');
-			newEl.setAttribute('href', 'mailto:' + this.b64DecodeUnicode(this.getAttribute('first')) + '@' + this.b64DecodeUnicode(this.getAttribute('last')));
-
-			// Get all of the original element attributes, and pass them to the link
-			for(let i = 0, l = this.attributes.length; i < l; ++i){
-				const nodeName  = this.attributes.item(i).nodeName;
-
-				if (nodeName) {
-					// We do care for some attributes
-					if (['is-link', 'is-email', 'first', 'last', 'text'].indexOf(nodeName) > -1) {
-						continue;
-					}
-
-					const nodeValue = this.attributes.item(i).nodeValue;
-
-					newEl.setAttribute(nodeName, nodeValue);
-				}
-			}
-		} else {
-			newEl = document.createElement('span');
-		}
-
-		if (this.getAttribute('text')) {
-			let innerStr = this.b64DecodeUnicode(this.getAttribute('text'));
-
-			innerStr = innerStr.replace('src="images/', `src="${base}images/`).replace('src="media/', `src="${base}media/`);
-			newEl.innerHTML = innerStr;
-		} else {
-			newEl.innerText = window.atob(this.getAttribute('first')) + '@' + window.atob(this.getAttribute('last'));
-		}
-
-		// Remove the noscript message
-		this.innerText = '';
-
-		// Display the new element
-		this.appendChild(newEl);
-	}
-
-	b64DecodeUnicode(str) {
-		return decodeURIComponent(Array.prototype.map.call(atob(str), (c) => {
-			return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2)
-		}).join(''))
-	}
-});
diff --git a/build/media/webcomponents/js/toolbar-button/toolbar-button.js b/build/media/webcomponents/js/toolbar-button/toolbar-button.js
deleted file mode 100755
index dfdf0af65e526..0000000000000
--- a/build/media/webcomponents/js/toolbar-button/toolbar-button.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-((customElements) => {
-  'use strict';
-
-  class JoomlaToolbarButton extends HTMLElement {
-    // Attribute getters
-    get task() { return this.getAttribute('task'); }
-    get listSelection() { return this.hasAttribute('list-selection'); }
-    get form() { return this.getAttribute('form'); }
-    get formValidation() { return this.hasAttribute('form-validation'); }
-    get confirmMessage() { return this.getAttribute('confirm-message'); }
-
-    constructor() {
-      super();
-
-      // We need a button to support button behavior,
-      // because we cannot currently extend HTMLButtonElement
-      this.buttonElement = this.querySelector('button, a');
-      this.disabled = false;
-
-      // If list selection are required, set button to disabled by default
-      if (this.listSelection) {
-        this.setDisabled(true);
-      }
-
-      this.addEventListener('click', e => this.executeTask(e));
-    }
-
-    connectedCallback() {
-      // Check whether we have a form
-      const formSelector = this.form || 'adminForm';
-      this.formElement = document.getElementById(formSelector);
-
-      if (this.listSelection) {
-        if (!this.formElement) {
-          throw new Error(`The form "${formSelector}" is required to perform the task, but the form not found on the page.`);
-        }
-
-        // Watch on list selection
-        this.formElement.boxchecked.addEventListener('change', (event) => {
-          // Check whether we have selected something
-          this.setDisabled(event.target.value < 1);
-        });
-      }
-    }
-
-    setDisabled(disabled) {
-      // Make sure we have a boolean value
-      this.disabled = !!disabled;
-
-      // Switch attribute for current element
-      if (this.disabled) {
-        this.setAttribute('disabled', true);
-      } else {
-        this.removeAttribute('disabled');
-      }
-
-      // Switch attribute for native element
-      // An anchor do not support "disabled" attribute, so use class
-      if (this.buttonElement) {
-        if (this.disabled) {
-          if (this.buttonElement.nodeName === 'BUTTON') {
-            this.buttonElement.setAttribute('disabled', true)
-          } else {
-            this.buttonElement.classList.add('disabled');
-          }
-        } else {
-          if (this.buttonElement.nodeName === 'BUTTON') {
-            this.buttonElement.removeAttribute('disabled');
-          } else {
-            this.buttonElement.classList.remove('disabled');
-          }
-        }
-      }
-    }
-
-    executeTask() {
-      if (this.disabled) {
-        return false;
-      }
-
-      // eslint-disable-next-line no-restricted-globals
-      if (this.confirmMessage && !confirm(this.confirmMessage)) {
-        return false;
-      }
-
-      if (this.task) {
-        Joomla.submitbutton(this.task, this.form, this.formValidation);
-      }
-
-      return true;
-    }
-  }
-
-  customElements.define('joomla-toolbar-button', JoomlaToolbarButton);
-})(customElements);
diff --git a/build/media/webcomponents/scss/field-media/field-media.scss b/build/media/webcomponents/scss/field-media/field-media.scss
deleted file mode 100644
index aa868e564a0e7..0000000000000
--- a/build/media/webcomponents/scss/field-media/field-media.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-joomla-field-media .field-media-preview {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  max-width: 356px;
-  height: 180px;
-  padding: 10px;
-  overflow: hidden;
-  background-color: #f2f2f2;
-  border: 1px solid rgba(0, 0, 0, .15);
-  border-width: 1px 1px 0;
-  border-radius: .25rem .25rem 0 0;
-}
-joomla-field-media .field-media-preview-icon {
-  font-size: 5rem;
-  opacity: .25;
-}
-joomla-field-media .field-media-input {
-  border-top-left-radius: 0;
-}
-joomla-field-media .button-clear {
-  border-top-right-radius: 0;
-}
-joomla-field-media img {
-  max-width: 100%;
-  max-height: 100%;
-}
diff --git a/build/media/cache/index.html b/build/media_source/cache/index.html
similarity index 100%
rename from build/media/cache/index.html
rename to build/media_source/cache/index.html
diff --git a/build/media/com_associations/css/sidebyside.css b/build/media_source/com_associations/css/sidebyside.css
similarity index 94%
rename from build/media/com_associations/css/sidebyside.css
rename to build/media_source/com_associations/css/sidebyside.css
index e9ca76326530a..c2ddde2af6da2 100644
--- a/build/media/com_associations/css/sidebyside.css
+++ b/build/media_source/com_associations/css/sidebyside.css
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_associations/js/admin-associations-default.es6.js b/build/media_source/com_associations/js/admin-associations-default.es6.js
similarity index 88%
rename from build/media_src/com_associations/js/admin-associations-default.es6.js
rename to build/media_source/com_associations/js/admin-associations-default.es6.js
index fd2a617923df8..cf078ebdd53f1 100644
--- a/build/media_src/com_associations/js/admin-associations-default.es6.js
+++ b/build/media_source/com_associations/js/admin-associations-default.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 Joomla.submitbutton = (pressbutton) => {
diff --git a/build/media_src/com_associations/js/admin-associations-modal.es6.js b/build/media_source/com_associations/js/admin-associations-modal.es6.js
similarity index 92%
rename from build/media_src/com_associations/js/admin-associations-modal.es6.js
rename to build/media_source/com_associations/js/admin-associations-modal.es6.js
index 741712d9d93db..7e0462219ad1f 100644
--- a/build/media_src/com_associations/js/admin-associations-modal.es6.js
+++ b/build/media_source/com_associations/js/admin-associations-modal.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 Joomla = window.Joomla || {};
diff --git a/build/media_source/com_associations/js/associations-edit.es6.js b/build/media_source/com_associations/js/associations-edit.es6.js
new file mode 100644
index 0000000000000..6b38d65c64b5b
--- /dev/null
+++ b/build/media_source/com_associations/js/associations-edit.es6.js
@@ -0,0 +1,209 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+Joomla = window.Joomla || {};
+
+((Joomla, document) => {
+  'use strict';
+
+  Joomla.hideAssociation = (formControl, languageCode) => {
+    const controlGroup = [].slice.call(document.querySelectorAll('#associations .control-group'));
+
+    controlGroup.forEach((element) => {
+      // Current selected language. Hide it
+      const el = element.querySelector('.control-label label');
+
+      if (el) {
+        const attribute = el.getAttribute('for');
+
+        if (attribute.replace('_id', '') === `${formControl}_associations_${languageCode.replace('-', '_')}`) {
+          element.style.display = 'none';
+        }
+      }
+    });
+  };
+
+  Joomla.showAssociationMessage = () => {
+    const controlGroup = [].slice.call(document.querySelectorAll('#associations .control-group'));
+    const associations = document.getElementById('associations');
+
+    if (associations) {
+      const html = document.createElement('joomla-alert');
+      html.innerHTML = Joomla.JText._('JGLOBAL_ASSOC_NOT_POSSIBLE');
+
+      associations.insertAdjacentElement('afterbegin', html);
+    }
+
+    controlGroup.forEach((element) => {
+      element.style.display = 'none';
+    });
+  };
+
+  /**
+   * Inject associations into other association fields
+   *
+   * This function is called whenever the Ajax request within propagateAssociation() completes
+   * successfully.
+   * Its purpose is to inject the associations which have been returned in the Ajax response into
+   * the other association fields in the form.
+   * It does this by invoking the various callback functions of those association fields (i.e. the
+   * function which gets called whenever the administrator selects an association via the modal),
+   * and passing the appropriate associated record details.
+   *
+   * @param   result                  The response from the Ajax request.
+   *                                  Its structure is that generated by the JResponseJson class,
+   *                                  with the data field containing the associations
+   * @param   callbackFunctionPrefix  The name of the callback function which the modal window uses
+   *                                  to set the selected item as the association, but minus the
+   *                                  language tag at the end
+   *
+   * @return  boolean
+   *
+   * @since   3.9.0
+   */
+  Joomla.injectAssociations = (result, callbackFunctionPrefix) => {
+    let functionName;
+
+    if (result.success) {
+      if (result.data.length !== 0) {
+        [].slice.call(Object.keys(result.data)).forEach((lang) => {
+          functionName = callbackFunctionPrefix + lang.replace('-', '_');
+          // eslint-disable-next-line max-len
+          window[functionName](result.data[lang].id, result.data[lang].title, result.data[lang].catid, null, null, lang);
+        });
+      }
+
+      if (result.message) {
+        Joomla.renderMessages({ notice: [result.message] });
+      }
+    } else {
+      Joomla.renderMessages({ warning: [(Joomla.JText._('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED'))] });
+    }
+  };
+
+  /**
+   * Propagate associations from this field into other association fields
+   *
+   * This function is called whenever an administrator populates an association (in the association
+   * modal field) and then clicks on the Propagate button.
+   * The purpose of this function is to find what other records (if any) are associated with the
+   * one which the administrator has selected, and populate the other association fields with these
+   * records. (Otherwise, if the administrator just clicks on Save without clicking on Propagate,
+   * those other associations will be deleted). It does this by finding the id of the selected
+   * associated record (from a hidden field) and makes an Ajax call to the server to find the other
+   * associations, also passing up the language of the record currently being edited, as it should
+   * be excluded. Once it has received from the server the other associations it calls
+   * injectAssociations to inject them into the other association fields within the form.
+   *
+   * @param   fieldPrefix             The stem of the html ids for the elements comprising the
+   *                                  modal field
+   * @param   callbackFunctionPrefix  The name of the callback function which the modal window uses
+   *                                  to set the selected item as the association, but minus the
+   *                                  language tag at the end
+   *
+   * @return  boolean
+   *
+   * @since   3.9.0
+   */
+  Joomla.propagateAssociation = (fieldPrefix, callbackFunctionPrefix) => {
+    // Find the id of the record which has been set as an association
+    const assocId = document.getElementById(`${fieldPrefix}_id`).value;
+
+    // Find the language of the record being edited
+    const languageField = document.getElementById('jform_language');
+    const currentLang = languageField.options[languageField.selectedIndex].value;
+
+    const data = {
+      task: 'ajax.fetchAssociations',
+      format: 'json',
+      assocId,
+      excludeLang: currentLang,
+    };
+    data[Joomla.getOptions('csrf.token', '')] = 1;
+    const queryString = Object.keys(data).reduce((a, k) => { a.push(`${k}=${encodeURIComponent(data[k])}`); return a; }, []).join('&');
+    const url = `${document.forms.adminForm.action}&${queryString}`;
+
+    Joomla.request({
+      // Find the action url associated with the form - we need to add the token to this
+      url,
+      method: 'GET',
+      data: JSON.stringify(data),
+      headers: { 'Content-Type': 'application/json' },
+      onSuccess: (response) => {
+        Joomla.injectAssociations(JSON.parse(response), callbackFunctionPrefix);
+      },
+      onError: () => {
+        Joomla.renderMessages({ warning: [(Joomla.JText._('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED'))] });
+      },
+    });
+
+    return false;
+  };
+
+  document.addEventListener('DOMContentLoaded', () => {
+    const associationsEditOptions = Joomla.getOptions('system.associations.edit');
+    const formControl = associationsEditOptions.formControl || 'jform';
+    const formControlLanguage = document.getElementById(`${formControl}_language`);
+
+    // Hide the associations tab if needed
+    if (parseInt(associationsEditOptions.hidden, 10) === 1) {
+      Joomla.showAssociationMessage();
+    } else if (formControlLanguage) {
+      // Hide only the associations for the current language
+      Joomla.hideAssociation(formControl, formControlLanguage.value);
+    }
+
+    // When changing the language
+    if (formControlLanguage) {
+      formControlLanguage.addEventListener('change', (event) => {
+        // Remove message if any
+        Joomla.removeMessages();
+
+        let existsAssociations = false;
+
+        /** For each language, remove the associations, ie,
+         *  empty the associations fields and reset the buttons to Select/Create
+         */
+        const controlGroup = [].slice.call(document.querySelectorAll('#associations .control-group'));
+
+        controlGroup.forEach((element) => {
+          const attribute = element.querySelector('.control-label label').getAttribute('for');
+          const languageCode = attribute.replace('_id', '').replace('jform_associations_', '');
+
+          // Show the association fields
+          element.style.display = 'block';
+
+          // Check if there was an association selected for this language
+          if (!existsAssociations && document.getElementById(`${formControl}_associations_${languageCode}_id`).value !== '') {
+            existsAssociations = true;
+          }
+
+          // Call the modal clear button
+          const clear = document.getElementById(`${formControl}_associations_${languageCode}_clear`);
+
+          if (clear.onclick) {
+            clear.onclick();
+          } else if (clear.click) {
+            clear.click();
+          }
+        });
+
+        // If associations existed, send a warning to the user
+        if (existsAssociations) {
+          Joomla.renderMessages({ warning: [Joomla.JText._('JGLOBAL_ASSOCIATIONS_RESET_WARNING')] });
+        }
+
+        // If the selected language is All hide the fields and add a message
+        const selectedLanguage = event.target.value;
+
+        if (selectedLanguage === '*') {
+          Joomla.showAssociationMessage();
+        } else {
+          // Else show the associations fields/buttons and hide the current selected language
+          Joomla.hideAssociation(formControl, selectedLanguage);
+        }
+      });
+    }
+  });
+})(Joomla, document);
diff --git a/build/media/com_associations/js/sidebyside.js b/build/media_source/com_associations/js/sidebyside.es5.js
similarity index 92%
rename from build/media/com_associations/js/sidebyside.js
rename to build/media_source/com_associations/js/sidebyside.es5.js
index 67982faac38bb..eb889f7d7d75e 100644
--- a/build/media/com_associations/js/sidebyside.js
+++ b/build/media_source/com_associations/js/sidebyside.es5.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 // @TODO remove jQuery dependency
@@ -133,6 +133,17 @@ jQuery(document).ready(function($) {
 
 	// Attach behaviour to reference frame load event.
 	$('#reference-association').on('load', function() {
+		// Waiting until the reference has loaded before loading the target to avoid race conditions
+		var targetURL = Joomla.getOptions('targetSrc', false);
+
+		if (targetURL)
+		{
+			targetURL = targetURL.split('&amp;').join('&');
+			document.getElementById('target-association').setAttribute('src', targetURL);
+			Joomla.loadOptions({'targetSrc': false});
+			return;
+		}
+
 		// Load Target Pane AFTER reference pane has loaded to prevent session conflict with checkout
 		document.getElementById('target-association').setAttribute('src', document.getElementById('target-association').getAttribute('src'));
 
@@ -228,9 +239,10 @@ jQuery(document).ready(function($) {
 				}
 
 				// Update the reference item associations tab.
-				var reference     = document.getElementById('reference-association');
-				var languageCode  = targetLanguage.replace(/-/, '_');
-				var title         = $(this).contents().find('#jform_title').val();
+				var reference      = document.getElementById('reference-association');
+				var languageCode   = targetLanguage.replace(/-/, '_');
+				var referenceTitle = reference.getAttribute('data-title');
+				var title          = $(this).contents().find('#jform_' + referenceTitle).val();
 
 				// - For modal association selectors.
 				$(reference).contents().find('#jform_associations_' + languageCode + '_id').val(targetLoadedId);
@@ -245,7 +257,9 @@ jQuery(document).ready(function($) {
 			var reference    = document.getElementById('reference-association');
 			var referenceId  = reference.getAttribute('data-id');
 			var languageCode = reference.getAttribute('data-language').replace(/-/, '_');
-			var title        = $(reference).contents().find('#jform_title').val();
+			var target       = document.getElementById('target-association');
+			var targetTitle  = target.getAttribute('data-title');
+			var title        = $(this).contents().find('#jform_' + targetTitle).val();
 			var target       = $(this).contents();
 
 			// - For modal association selectors.
diff --git a/build/media_src/com_banners/js/admin-banner-edit.es6.js b/build/media_source/com_banners/js/admin-banner-edit.es6.js
similarity index 94%
rename from build/media_src/com_banners/js/admin-banner-edit.es6.js
rename to build/media_source/com_banners/js/admin-banner-edit.es6.js
index 70037df1bbad1..eb0cf3d637e91 100644
--- a/build/media_src/com_banners/js/admin-banner-edit.es6.js
+++ b/build/media_source/com_banners/js/admin-banner-edit.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_cache/js/admin-cache-default.es6.js b/build/media_source/com_cache/js/admin-cache-default.es6.js
similarity index 88%
rename from build/media_src/com_cache/js/admin-cache-default.es6.js
rename to build/media_source/com_cache/js/admin-cache-default.es6.js
index 2b39acc2e0436..108c3e8169289 100644
--- a/build/media_src/com_cache/js/admin-cache-default.es6.js
+++ b/build/media_source/com_cache/js/admin-cache-default.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_config/js/admin-application-default.es6.js b/build/media_source/com_config/js/admin-application-default.es6.js
similarity index 81%
rename from build/media_src/com_config/js/admin-application-default.es6.js
rename to build/media_source/com_config/js/admin-application-default.es6.js
index 54009ede6b7c4..13378e82057ef 100644
--- a/build/media_src/com_config/js/admin-application-default.es6.js
+++ b/build/media_source/com_config/js/admin-application-default.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_config/js/config-default.es6.js b/build/media_source/com_config/js/config-default.es6.js
similarity index 93%
rename from build/media_src/com_config/js/config-default.es6.js
rename to build/media_source/com_config/js/config-default.es6.js
index fd3e9afe82e37..1109d0850f55c 100644
--- a/build/media_src/com_config/js/config-default.es6.js
+++ b/build/media_source/com_config/js/config-default.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((document, submitForm) => {
diff --git a/build/media_src/com_config/js/modules-default.es6.js b/build/media_source/com_config/js/modules-default.es6.js
similarity index 93%
rename from build/media_src/com_config/js/modules-default.es6.js
rename to build/media_source/com_config/js/modules-default.es6.js
index c14573b15b35a..64c6ff9d024e2 100644
--- a/build/media_src/com_config/js/modules-default.es6.js
+++ b/build/media_source/com_config/js/modules-default.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((document, submitForm) => {
diff --git a/build/media_src/com_config/js/templates-default.es6.js b/build/media_source/com_config/js/templates-default.es6.js
similarity index 93%
rename from build/media_src/com_config/js/templates-default.es6.js
rename to build/media_source/com_config/js/templates-default.es6.js
index eb6f0c6db2b24..f84d9db6eff73 100644
--- a/build/media_src/com_config/js/templates-default.es6.js
+++ b/build/media_source/com_config/js/templates-default.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((document, submitForm) => {
diff --git a/build/media_src/com_contact/js/admin-contacts-modal.es6.js b/build/media_source/com_contact/js/admin-contacts-modal.es6.js
similarity index 96%
rename from build/media_src/com_contact/js/admin-contacts-modal.es6.js
rename to build/media_source/com_contact/js/admin-contacts-modal.es6.js
index a4ab7ea1ca647..d46e54f14d890 100644
--- a/build/media_src/com_contact/js/admin-contacts-modal.es6.js
+++ b/build/media_source/com_contact/js/admin-contacts-modal.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 (() => {
diff --git a/build/media_src/com_contact/js/categories-default.es6.js b/build/media_source/com_contact/js/categories-default.es6.js
similarity index 95%
rename from build/media_src/com_contact/js/categories-default.es6.js
rename to build/media_source/com_contact/js/categories-default.es6.js
index ca80ba5e6fd00..f7b2cd04d9f7d 100644
--- a/build/media_src/com_contact/js/categories-default.es6.js
+++ b/build/media_source/com_contact/js/categories-default.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((Joomla) => {
diff --git a/build/media_src/com_content/js/admin-article-pagebreak.es6.js b/build/media_source/com_content/js/admin-article-pagebreak.es6.js
similarity index 93%
rename from build/media_src/com_content/js/admin-article-pagebreak.es6.js
rename to build/media_source/com_content/js/admin-article-pagebreak.es6.js
index 99cf21d50a182..b609f6d1b790d 100644
--- a/build/media_src/com_content/js/admin-article-pagebreak.es6.js
+++ b/build/media_source/com_content/js/admin-article-pagebreak.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_content/js/admin-article-readmore.es6.js b/build/media_source/com_content/js/admin-article-readmore.es6.js
similarity index 92%
rename from build/media_src/com_content/js/admin-article-readmore.es6.js
rename to build/media_source/com_content/js/admin-article-readmore.es6.js
index 7d3932b8d49d6..530a146f9b2c3 100644
--- a/build/media_src/com_content/js/admin-article-readmore.es6.js
+++ b/build/media_source/com_content/js/admin-article-readmore.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 (() => {
diff --git a/build/media_src/com_content/js/admin-articles-default-batch-footer.es6.js b/build/media_source/com_content/js/admin-articles-default-batch-footer.es6.js
similarity index 92%
rename from build/media_src/com_content/js/admin-articles-default-batch-footer.es6.js
rename to build/media_source/com_content/js/admin-articles-default-batch-footer.es6.js
index 4e854e871d354..4c9f94b2be01b 100644
--- a/build/media_src/com_content/js/admin-articles-default-batch-footer.es6.js
+++ b/build/media_source/com_content/js/admin-articles-default-batch-footer.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((document, submitForm) => {
diff --git a/build/media_src/com_content/js/admin-articles-default-stage-footer.es6.js b/build/media_source/com_content/js/admin-articles-default-stage-footer.es6.js
similarity index 92%
rename from build/media_src/com_content/js/admin-articles-default-stage-footer.es6.js
rename to build/media_source/com_content/js/admin-articles-default-stage-footer.es6.js
index 4625fc317da0d..cd9f29a68ceb8 100644
--- a/build/media_src/com_content/js/admin-articles-default-stage-footer.es6.js
+++ b/build/media_source/com_content/js/admin-articles-default-stage-footer.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((document, submitForm) => {
diff --git a/build/media_src/com_content/js/admin-articles-modal.es6.js b/build/media_source/com_content/js/admin-articles-modal.es6.js
similarity index 97%
rename from build/media_src/com_content/js/admin-articles-modal.es6.js
rename to build/media_source/com_content/js/admin-articles-modal.es6.js
index adeb46dbc8fd0..6b19e1b585504 100644
--- a/build/media_src/com_content/js/admin-articles-modal.es6.js
+++ b/build/media_source/com_content/js/admin-articles-modal.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 (() => {
diff --git a/build/media_src/com_content/js/admin-articles-workflow-buttons.es6.js b/build/media_source/com_content/js/admin-articles-workflow-buttons.es6.js
similarity index 99%
rename from build/media_src/com_content/js/admin-articles-workflow-buttons.es6.js
rename to build/media_source/com_content/js/admin-articles-workflow-buttons.es6.js
index 1bb282c4361c7..acff801d26130 100644
--- a/build/media_src/com_content/js/admin-articles-workflow-buttons.es6.js
+++ b/build/media_source/com_content/js/admin-articles-workflow-buttons.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_content/js/form-edit.es6.js b/build/media_source/com_content/js/form-edit.es6.js
similarity index 93%
rename from build/media_src/com_content/js/form-edit.es6.js
rename to build/media_source/com_content/js/form-edit.es6.js
index cb8b2b5768f54..70801985637b7 100644
--- a/build/media_src/com_content/js/form-edit.es6.js
+++ b/build/media_source/com_content/js/form-edit.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((document, submitForm) => {
diff --git a/build/media_src/com_contenthistory/js/admin-compare-compare.es6.js b/build/media_source/com_contenthistory/js/admin-compare-compare.es6.js
similarity index 94%
rename from build/media_src/com_contenthistory/js/admin-compare-compare.es6.js
rename to build/media_source/com_contenthistory/js/admin-compare-compare.es6.js
index 3dd35ab31763c..a5a20f670120c 100644
--- a/build/media_src/com_contenthistory/js/admin-compare-compare.es6.js
+++ b/build/media_source/com_contenthistory/js/admin-compare-compare.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 (() => {
diff --git a/build/media_src/com_contenthistory/js/admin-history-modal.es6.js b/build/media_source/com_contenthistory/js/admin-history-modal.es6.js
similarity index 97%
rename from build/media_src/com_contenthistory/js/admin-history-modal.es6.js
rename to build/media_source/com_contenthistory/js/admin-history-modal.es6.js
index 3d6c478153285..df29160c0c654 100644
--- a/build/media_src/com_contenthistory/js/admin-history-modal.es6.js
+++ b/build/media_source/com_contenthistory/js/admin-history-modal.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((document, Joomla) => {
diff --git a/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js b/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js
new file mode 100644
index 0000000000000..4cfcf2f2a4e5c
--- /dev/null
+++ b/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js
@@ -0,0 +1,76 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+((window, document, Joomla) => {
+  let matchesFn = 'matches';
+
+  const closest = (element, selector) => {
+    let parent;
+    let el = element;
+
+    // Traverse parents
+    while (el) {
+      parent = el.parentElement;
+      if (parent && parent[matchesFn](selector)) {
+        return parent;
+      }
+      el = parent;
+    }
+
+    return null;
+  };
+
+  Joomla.unpublishModule = (element) => {
+    // Get variables
+    const baseUrl = 'index.php?option=com_modules&task=modules.unpublish&format=json';
+    const id = element.getAttribute('data-module-id');
+
+    Joomla.request({
+      url: `${baseUrl}&cid=${id}`,
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      onSuccess: () => {
+        const wrapper = closest(element, '.module-wrapper');
+        wrapper.parentNode.removeChild(wrapper);
+
+        Joomla.renderMessages({
+          message: [Joomla.JText._('COM_CPANEL_UNPUBLISH_MODULE_SUCCESS')],
+        });
+      },
+      onError: () => {
+        Joomla.renderMessages({
+          error: [Joomla.JText._('COM_CPANEL_UNPUBLISH_MODULE_ERROR')],
+        });
+      },
+    });
+  };
+
+  const onBoot = () => {
+    // Find matchesFn with vendor prefix
+    ['matches', 'msMatchesSelector'].some((fn) => {
+      if (typeof document.body[fn] === 'function') {
+        matchesFn = fn;
+        return true;
+      }
+      return false;
+    });
+
+    const cpanelModules = document.getElementById('cpanel-modules');
+    if (cpanelModules) {
+      const links = [].slice.call(cpanelModules.querySelectorAll('.unpublish-module'));
+      links.forEach((link) => {
+        link.addEventListener('click', event => Joomla.unpublishModule(event.target));
+      });
+    }
+
+    // Cleanup
+    document.removeEventListener('DOMContentLoaded', onBoot);
+  };
+
+  // Initialise
+  document.addEventListener('DOMContentLoaded', onBoot);
+})(window, document, window.Joomla);
diff --git a/build/media_source/com_cpanel/js/admin-system-loader.es6.js b/build/media_source/com_cpanel/js/admin-system-loader.es6.js
new file mode 100644
index 0000000000000..1c23b9122980a
--- /dev/null
+++ b/build/media_source/com_cpanel/js/admin-system-loader.es6.js
@@ -0,0 +1,67 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+((document, Joomla) => {
+  'use strict';
+
+  const init = () => {
+    // Cleanup
+    document.removeEventListener('DOMContentLoaded', init);
+
+    // Get the elements
+    const elements = [].slice.call(document.querySelectorAll('.system-counter'));
+
+    if (elements.length) {
+      elements.forEach((element) => {
+        const type = element.getAttribute('data-type');
+
+        if (type && Joomla && Joomla.request && typeof Joomla.request === 'function') {
+          Joomla.request({
+            url: 'index.php?option=com_cpanel&task=system.loadSystemInfo&format=json',
+            method: 'POST',
+            data: `type=${type}`,
+            onSuccess: (resp) => {
+              let response;
+              try {
+                response = JSON.parse(resp);
+              } catch (error) {
+                throw new Error('Failed to parse JSON');
+              }
+
+              if (response.error || !response.success) {
+                element.classList.remove('fa-spin');
+                element.classList.remove('fa-spinner');
+                element.classList.add('text-danger');
+                element.classList.add('fa-remove');
+              } else if (response.data) {
+                const elem = document.createElement('span');
+
+                elem.classList.add('pull-right');
+                elem.classList.add('badge');
+                elem.classList.add('badge-pill');
+                elem.classList.add('badge-warning');
+                elem.innerHTML = response.data;
+
+                element.parentNode.replaceChild(elem, element);
+              } else {
+                element.classList.remove('fa-spin');
+                element.classList.remove('fa-spinner');
+                element.classList.add('fa-check');
+                element.classList.add('text-success');
+              }
+            },
+            onError: () => {
+              element.classList.remove('fa-spin');
+              element.classList.remove('fa-spinner');
+              element.classList.add('text-danger');
+              element.classList.add('fa-remove');
+            },
+          });
+        }
+      });
+    }
+  };
+
+  document.addEventListener('DOMContentLoaded', init);
+})(document, Joomla);
diff --git a/build/media_src/com_fields/js/admin-field-edit.es6.js b/build/media_source/com_fields/js/admin-field-edit.es6.js
similarity index 89%
rename from build/media_src/com_fields/js/admin-field-edit.es6.js
rename to build/media_source/com_fields/js/admin-field-edit.es6.js
index 900569892c71f..3fcc01b346bee 100644
--- a/build/media_src/com_fields/js/admin-field-edit.es6.js
+++ b/build/media_source/com_fields/js/admin-field-edit.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_fields/js/admin-fields-default-batch.es6.js b/build/media_source/com_fields/js/admin-fields-default-batch.es6.js
similarity index 89%
rename from build/media_src/com_fields/js/admin-fields-default-batch.es6.js
rename to build/media_source/com_fields/js/admin-fields-default-batch.es6.js
index 2e82978ab1670..b6b3b774f1241 100644
--- a/build/media_src/com_fields/js/admin-fields-default-batch.es6.js
+++ b/build/media_source/com_fields/js/admin-fields-default-batch.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_fields/js/admin-fields-modal.es6.js b/build/media_source/com_fields/js/admin-fields-modal.es6.js
similarity index 92%
rename from build/media_src/com_fields/js/admin-fields-modal.es6.js
rename to build/media_source/com_fields/js/admin-fields-modal.es6.js
index ae397b1ab5ef0..26ae4a7181720 100644
--- a/build/media_src/com_fields/js/admin-fields-modal.es6.js
+++ b/build/media_source/com_fields/js/admin-fields-modal.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((Joomla) => {
diff --git a/build/media/com_finder/css/dates.css b/build/media_source/com_finder/css/dates.css
similarity index 100%
rename from build/media/com_finder/css/dates.css
rename to build/media_source/com_finder/css/dates.css
diff --git a/build/media/com_finder/css/finder.css b/build/media_source/com_finder/css/finder.css
similarity index 100%
rename from build/media/com_finder/css/finder.css
rename to build/media_source/com_finder/css/finder.css
diff --git a/build/media/com_finder/css/indexer.css b/build/media_source/com_finder/css/indexer.css
similarity index 100%
rename from build/media/com_finder/css/indexer.css
rename to build/media_source/com_finder/css/indexer.css
diff --git a/build/media_src/com_finder/js/filters.es6.js b/build/media_source/com_finder/js/filters.es6.js
similarity index 90%
rename from build/media_src/com_finder/js/filters.es6.js
rename to build/media_source/com_finder/js/filters.es6.js
index 6a4d1111d99ab..44cdf3a8c9ed2 100644
--- a/build/media_src/com_finder/js/filters.es6.js
+++ b/build/media_source/com_finder/js/filters.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((Joomla) => {
diff --git a/build/media_src/com_finder/js/finder-edit.es6.js b/build/media_source/com_finder/js/finder-edit.es6.js
similarity index 96%
rename from build/media_src/com_finder/js/finder-edit.es6.js
rename to build/media_source/com_finder/js/finder-edit.es6.js
index 34b479fac33ad..6d42729026bd5 100644
--- a/build/media_src/com_finder/js/finder-edit.es6.js
+++ b/build/media_source/com_finder/js/finder-edit.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_finder/js/finder.es6.js b/build/media_source/com_finder/js/finder.es6.js
similarity index 97%
rename from build/media_src/com_finder/js/finder.es6.js
rename to build/media_source/com_finder/js/finder.es6.js
index 53a4a954bed81..e621a2fbc499f 100644
--- a/build/media_src/com_finder/js/finder.es6.js
+++ b/build/media_source/com_finder/js/finder.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((Awesomplete, Joomla, window, document) => {
diff --git a/build/media_src/com_finder/js/index.es6.js b/build/media_source/com_finder/js/index.es6.js
similarity index 91%
rename from build/media_src/com_finder/js/index.es6.js
rename to build/media_source/com_finder/js/index.es6.js
index 51caa257cfecf..5927e6745190e 100644
--- a/build/media_src/com_finder/js/index.es6.js
+++ b/build/media_source/com_finder/js/index.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_finder/js/indexer.es6.js b/build/media_source/com_finder/js/indexer.es6.js
similarity index 98%
rename from build/media_src/com_finder/js/indexer.es6.js
rename to build/media_source/com_finder/js/indexer.es6.js
index efef4e05f5b81..763fc0aa3a872 100644
--- a/build/media_src/com_finder/js/indexer.es6.js
+++ b/build/media_source/com_finder/js/indexer.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 // eslint-disable no-alert
diff --git a/build/media_src/com_finder/js/maps.es6.js b/build/media_source/com_finder/js/maps.es6.js
similarity index 89%
rename from build/media_src/com_finder/js/maps.es6.js
rename to build/media_source/com_finder/js/maps.es6.js
index fc8e90be32b35..3a4d931fc5ec3 100644
--- a/build/media_src/com_finder/js/maps.es6.js
+++ b/build/media_source/com_finder/js/maps.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/com_installer/css/installer.css b/build/media_source/com_installer/css/installer.css
similarity index 92%
rename from build/media/com_installer/css/installer.css
rename to build/media_source/com_installer/css/installer.css
index 6e4c58db11624..29ca6b35ca95c 100644
--- a/build/media/com_installer/css/installer.css
+++ b/build/media_source/com_installer/css/installer.css
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_installer/js/installer.es6.js b/build/media_source/com_installer/js/installer.es6.js
similarity index 98%
rename from build/media_src/com_installer/js/installer.es6.js
rename to build/media_source/com_installer/js/installer.es6.js
index 107517ee8a8b9..d533b6d999723 100644
--- a/build/media_src/com_installer/js/installer.es6.js
+++ b/build/media_source/com_installer/js/installer.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_joomlaupdate/js/admin-update-default.es6.js b/build/media_source/com_joomlaupdate/js/admin-update-default.es6.js
similarity index 89%
rename from build/media_src/com_joomlaupdate/js/admin-update-default.es6.js
rename to build/media_source/com_joomlaupdate/js/admin-update-default.es6.js
index 9f0e003f04b46..c12439933b02a 100644
--- a/build/media_src/com_joomlaupdate/js/admin-update-default.es6.js
+++ b/build/media_source/com_joomlaupdate/js/admin-update-default.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/com_joomlaupdate/js/default.js b/build/media_source/com_joomlaupdate/js/default.es5.js
similarity index 99%
rename from build/media/com_joomlaupdate/js/default.js
rename to build/media_source/com_joomlaupdate/js/default.es5.js
index 0b6691c5b9dac..c3f8709d2f3b3 100644
--- a/build/media/com_joomlaupdate/js/default.js
+++ b/build/media_source/com_joomlaupdate/js/default.es5.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/com_joomlaupdate/js/encryption.js b/build/media_source/com_joomlaupdate/js/encryption.es5.js
similarity index 100%
rename from build/media/com_joomlaupdate/js/encryption.js
rename to build/media_source/com_joomlaupdate/js/encryption.es5.js
diff --git a/build/media/com_joomlaupdate/js/update.js b/build/media_source/com_joomlaupdate/js/update.es5.js
similarity index 100%
rename from build/media/com_joomlaupdate/js/update.js
rename to build/media_source/com_joomlaupdate/js/update.es5.js
diff --git a/build/media/com_languages/css/overrider.css b/build/media_source/com_languages/css/overrider.css
similarity index 89%
rename from build/media/com_languages/css/overrider.css
rename to build/media_source/com_languages/css/overrider.css
index 5fa203db7f069..36da33438f3c2 100644
--- a/build/media/com_languages/css/overrider.css
+++ b/build/media_source/com_languages/css/overrider.css
@@ -1,7 +1,7 @@
 /**
  * @package		Joomla.Administrator
  * @subpackage	com_languages
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_languages/js/admin-language-edit-change-flag.es6.js b/build/media_source/com_languages/js/admin-language-edit-change-flag.es6.js
similarity index 92%
rename from build/media_src/com_languages/js/admin-language-edit-change-flag.es6.js
rename to build/media_source/com_languages/js/admin-language-edit-change-flag.es6.js
index 04066b77de41a..d826827442bf1 100644
--- a/build/media_src/com_languages/js/admin-language-edit-change-flag.es6.js
+++ b/build/media_source/com_languages/js/admin-language-edit-change-flag.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 document.addEventListener('DOMContentLoaded', () => {
diff --git a/build/media_src/com_languages/js/admin-override-edit-refresh-searchstring.es6.js b/build/media_source/com_languages/js/admin-override-edit-refresh-searchstring.es6.js
similarity index 85%
rename from build/media_src/com_languages/js/admin-override-edit-refresh-searchstring.es6.js
rename to build/media_source/com_languages/js/admin-override-edit-refresh-searchstring.es6.js
index a84f8f33e6241..d033eccdc680f 100644
--- a/build/media_src/com_languages/js/admin-override-edit-refresh-searchstring.es6.js
+++ b/build/media_source/com_languages/js/admin-override-edit-refresh-searchstring.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,7 +12,7 @@ document.addEventListener('DOMContentLoaded', () => {
         Joomla.overrider.states.refreshed = true;
       }
     }
-    event.currentTarget.classList.remove('invalid');
+    event.srcElement.classList.remove('invalid');
   }, false);
 
   document.getElementById('more-results-button').addEventListener('click', () => {
diff --git a/build/media_src/com_languages/js/overrider.es6.js b/build/media_source/com_languages/js/overrider.es6.js
similarity index 99%
rename from build/media_src/com_languages/js/overrider.es6.js
rename to build/media_source/com_languages/js/overrider.es6.js
index 38d626176d4da..e935df7f51558 100644
--- a/build/media_src/com_languages/js/overrider.es6.js
+++ b/build/media_source/com_languages/js/overrider.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((Joomla, document) => {
diff --git a/build/media_src/com_mailto/js/mailto-default.es6.js b/build/media_source/com_mailto/js/mailto-default.es6.js
similarity index 94%
rename from build/media_src/com_mailto/js/mailto-default.es6.js
rename to build/media_source/com_mailto/js/mailto-default.es6.js
index 393e566a9e84e..9afe3908749c3 100644
--- a/build/media_src/com_mailto/js/mailto-default.es6.js
+++ b/build/media_source/com_mailto/js/mailto-default.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((window, document, Joomla) => {
diff --git a/build/media_src/com_media/js/edit-images.es6.js b/build/media_source/com_media/js/edit-images.es6.js
similarity index 95%
rename from build/media_src/com_media/js/edit-images.es6.js
rename to build/media_source/com_media/js/edit-images.es6.js
index ddf234cb17f20..4b7e5a918c78a 100644
--- a/build/media_src/com_media/js/edit-images.es6.js
+++ b/build/media_source/com_media/js/edit-images.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 Joomla = window.Joomla || {};
@@ -75,7 +75,7 @@ Joomla.MediaManager = Joomla.MediaManager || {};
     const links = [].slice.call(tabsUlElement.querySelectorAll('a'));
 
     links.forEach((link) => {
-      if (!link.classList.contains('active')) {
+      if (!link.hasAttribute('active')) {
         return;
       }
 
@@ -90,7 +90,7 @@ Joomla.MediaManager = Joomla.MediaManager || {};
 
       // Move the container to the correct tab
       const mediaContainer = document.getElementById('media-manager-edit-container');
-      const tab = document.getElementById(link.id.id.replace('tab-', ''));
+      const tab = document.getElementById(link.id.replace('tab-', ''));
       tab.insertAdjacentElement('afterbegin', mediaContainer);
 
       activate(link.id.replace('tab-attrib-', ''), data);
@@ -164,7 +164,11 @@ Joomla.MediaManager = Joomla.MediaManager || {};
         window.location = `${pathName}?option=com_media&path=${fileDirectory}`;
         break;
       case 'cancel':
-        window.location = `${pathName}?option=com_media&path=${fileDirectory}`;
+        if (window.self !== window.top) {
+          window.location = `${pathName}?option=com_media&path=${fileDirectory}&tmpl=component`;
+        } else {
+          window.location = `${pathName}?option=com_media&path=${fileDirectory}`;
+        }
         break;
       case 'reset':
         Joomla.MediaManager.Edit.Reset('initial');
diff --git a/build/media/com_menus/css/admin-item-edit_container.css b/build/media_source/com_menus/css/admin-item-edit_container.css
similarity index 87%
rename from build/media/com_menus/css/admin-item-edit_container.css
rename to build/media_source/com_menus/css/admin-item-edit_container.css
index 0f7801fdf3bb0..279ae6dec74c0 100644
--- a/build/media/com_menus/css/admin-item-edit_container.css
+++ b/build/media_source/com_menus/css/admin-item-edit_container.css
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/com_menus/css/admin-item-edit_modules.css b/build/media_source/com_menus/css/admin-item-edit_modules.css
similarity index 83%
rename from build/media/com_menus/css/admin-item-edit_modules.css
rename to build/media_source/com_menus/css/admin-item-edit_modules.css
index ae377f9c00788..4ba0e10d1d7c5 100644
--- a/build/media/com_menus/css/admin-item-edit_modules.css
+++ b/build/media_source/com_menus/css/admin-item-edit_modules.css
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_menus/js/admin-item-edit.es6.js b/build/media_source/com_menus/js/admin-item-edit.es6.js
similarity index 97%
rename from build/media_src/com_menus/js/admin-item-edit.es6.js
rename to build/media_source/com_menus/js/admin-item-edit.es6.js
index 0ebc844be3591..e77125b0819de 100644
--- a/build/media_src/com_menus/js/admin-item-edit.es6.js
+++ b/build/media_source/com_menus/js/admin-item-edit.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((Joomla) => {
diff --git a/build/media_src/com_menus/js/admin-item-edit_container.es6.js b/build/media_source/com_menus/js/admin-item-edit_container.es6.js
similarity index 95%
rename from build/media_src/com_menus/js/admin-item-edit_container.es6.js
rename to build/media_source/com_menus/js/admin-item-edit_container.es6.js
index 23916074f1e15..fc8d7dbe3dedc 100644
--- a/build/media_src/com_menus/js/admin-item-edit_container.es6.js
+++ b/build/media_source/com_menus/js/admin-item-edit_container.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_menus/js/admin-item-edit_modules.es6.js b/build/media_source/com_menus/js/admin-item-edit_modules.es6.js
similarity index 98%
rename from build/media_src/com_menus/js/admin-item-edit_modules.es6.js
rename to build/media_source/com_menus/js/admin-item-edit_modules.es6.js
index 2501a6eb82e5f..9ea35019d0674 100644
--- a/build/media_src/com_menus/js/admin-item-edit_modules.es6.js
+++ b/build/media_source/com_menus/js/admin-item-edit_modules.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_menus/js/admin-item-modal.es6.js b/build/media_source/com_menus/js/admin-item-modal.es6.js
similarity index 88%
rename from build/media_src/com_menus/js/admin-item-modal.es6.js
rename to build/media_source/com_menus/js/admin-item-modal.es6.js
index 99f5e597d25ab..91006d5e99e9b 100644
--- a/build/media_src/com_menus/js/admin-item-modal.es6.js
+++ b/build/media_source/com_menus/js/admin-item-modal.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 Joomla = window.Joomla || {};
diff --git a/build/media_src/com_menus/js/admin-items-modal.es6.js b/build/media_source/com_menus/js/admin-items-modal.es6.js
similarity index 97%
rename from build/media_src/com_menus/js/admin-items-modal.es6.js
rename to build/media_source/com_menus/js/admin-items-modal.es6.js
index f6cc9dae27a52..354cac266365c 100644
--- a/build/media_src/com_menus/js/admin-items-modal.es6.js
+++ b/build/media_source/com_menus/js/admin-items-modal.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((Joomla, document) => {
diff --git a/build/media_src/com_menus/js/admin-menus-default.es6.js b/build/media_source/com_menus/js/admin-menus-default.es6.js
similarity index 93%
rename from build/media_src/com_menus/js/admin-menus-default.es6.js
rename to build/media_source/com_menus/js/admin-menus-default.es6.js
index b629b7afbd2c9..b130ea6905cb3 100644
--- a/build/media_src/com_menus/js/admin-menus-default.es6.js
+++ b/build/media_source/com_menus/js/admin-menus-default.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((Joomla) => {
diff --git a/build/media_src/com_menus/js/default-batch-body.es6.js b/build/media_source/com_menus/js/default-batch-body.es6.js
similarity index 92%
rename from build/media_src/com_menus/js/default-batch-body.es6.js
rename to build/media_source/com_menus/js/default-batch-body.es6.js
index 409e7e22c6dd4..6f0545a975fa0 100644
--- a/build/media_src/com_menus/js/default-batch-body.es6.js
+++ b/build/media_source/com_menus/js/default-batch-body.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 (() => {
diff --git a/build/media_src/com_modules/js/admin-module-edit.es6.js b/build/media_source/com_modules/js/admin-module-edit.es6.js
similarity index 98%
rename from build/media_src/com_modules/js/admin-module-edit.es6.js
rename to build/media_source/com_modules/js/admin-module-edit.es6.js
index 65f27c19e45eb..33d835bff8e6d 100644
--- a/build/media_src/com_modules/js/admin-module-edit.es6.js
+++ b/build/media_source/com_modules/js/admin-module-edit.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 Joomla = window.Joomla || {};
diff --git a/build/media_src/com_modules/js/admin-module-edit_assignment.es6.js b/build/media_source/com_modules/js/admin-module-edit_assignment.es6.js
similarity index 92%
rename from build/media_src/com_modules/js/admin-module-edit_assignment.es6.js
rename to build/media_source/com_modules/js/admin-module-edit_assignment.es6.js
index dac6092e02e3d..02849889f872b 100644
--- a/build/media_src/com_modules/js/admin-module-edit_assignment.es6.js
+++ b/build/media_source/com_modules/js/admin-module-edit_assignment.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 (() => {
diff --git a/build/media_src/com_modules/js/admin-modules-modal.es6.js b/build/media_source/com_modules/js/admin-modules-modal.es6.js
similarity index 83%
rename from build/media_src/com_modules/js/admin-modules-modal.es6.js
rename to build/media_source/com_modules/js/admin-modules-modal.es6.js
index 72ef9da29793b..fc5042c162fb8 100644
--- a/build/media_src/com_modules/js/admin-modules-modal.es6.js
+++ b/build/media_source/com_modules/js/admin-modules-modal.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,16 +10,15 @@ document.addEventListener('DOMContentLoaded', () => {
   const modulesLinks = [].slice.call(document.querySelectorAll('.js-module-insert'));
   const positionsLinks = [].slice.call(document.querySelectorAll('.js-position-insert'));
 
-  /** Assign listener for click event (for single module insertion) * */
+  /** Assign listener for click event (for single module id insertion) * */
   modulesLinks.forEach((modulesLink) => {
     modulesLink.addEventListener('click', (event) => {
       event.preventDefault();
-      const type = event.target.getAttribute('data-module');
-      const name = event.target.getAttribute('data-title');
+      const modid = event.target.getAttribute('data-module');
       const editor = event.target.getAttribute('data-editor');
 
       // Insert the short tag in the editor
-      window.parent.Joomla.editors.instances[editor].replaceSelection(`{loadmodule ${type},${name}}`);
+      window.parent.Joomla.editors.instances[editor].replaceSelection(`{loadmoduleid ${modid}}`);
 
       // Close the modal
       if (window.parent.Joomla.Modal) {
diff --git a/build/media_src/com_newsfeeds/js/categories-default.es6.js b/build/media_source/com_newsfeeds/js/categories-default.es6.js
similarity index 95%
rename from build/media_src/com_newsfeeds/js/categories-default.es6.js
rename to build/media_source/com_newsfeeds/js/categories-default.es6.js
index 72ad0a83dbeb0..e6ac2eacb3d25 100644
--- a/build/media_src/com_newsfeeds/js/categories-default.es6.js
+++ b/build/media_source/com_newsfeeds/js/categories-default.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((JText) => {
diff --git a/build/media_src/com_tags/js/tag-default.es6.js b/build/media_source/com_tags/js/tag-default.es6.js
similarity index 91%
rename from build/media_src/com_tags/js/tag-default.es6.js
rename to build/media_source/com_tags/js/tag-default.es6.js
index 0ef1b39bd0781..d1705a370a049 100644
--- a/build/media_src/com_tags/js/tag-default.es6.js
+++ b/build/media_source/com_tags/js/tag-default.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((document) => {
diff --git a/build/media_src/com_tags/js/tag-list.es6.js b/build/media_source/com_tags/js/tag-list.es6.js
similarity index 91%
rename from build/media_src/com_tags/js/tag-list.es6.js
rename to build/media_source/com_tags/js/tag-list.es6.js
index 0ef1b39bd0781..d1705a370a049 100644
--- a/build/media_src/com_tags/js/tag-list.es6.js
+++ b/build/media_source/com_tags/js/tag-list.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((document) => {
diff --git a/build/media_src/com_tags/js/tags-default.es6.js b/build/media_source/com_tags/js/tags-default.es6.js
similarity index 91%
rename from build/media_src/com_tags/js/tags-default.es6.js
rename to build/media_source/com_tags/js/tags-default.es6.js
index 0ef1b39bd0781..d1705a370a049 100644
--- a/build/media_src/com_tags/js/tags-default.es6.js
+++ b/build/media_source/com_tags/js/tags-default.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((document) => {
diff --git a/build/media/com_templates/css/admin-templates-default.css b/build/media_source/com_templates/css/admin-templates-default.css
similarity index 94%
rename from build/media/com_templates/css/admin-templates-default.css
rename to build/media_source/com_templates/css/admin-templates-default.css
index 18cba450a533c..1d0555dabc798 100644
--- a/build/media/com_templates/css/admin-templates-default.css
+++ b/build/media_source/com_templates/css/admin-templates-default.css
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_templates/js/admin-template-compare.es6.js b/build/media_source/com_templates/js/admin-template-compare.es6.js
similarity index 96%
rename from build/media_src/com_templates/js/admin-template-compare.es6.js
rename to build/media_source/com_templates/js/admin-template-compare.es6.js
index 1b7245d6419bd..74a290a7cad24 100644
--- a/build/media_src/com_templates/js/admin-template-compare.es6.js
+++ b/build/media_source/com_templates/js/admin-template-compare.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 (() => {
diff --git a/build/media_src/com_templates/js/admin-template-toggle-switch.es6.js b/build/media_source/com_templates/js/admin-template-toggle-switch.es6.js
similarity index 98%
rename from build/media_src/com_templates/js/admin-template-toggle-switch.es6.js
rename to build/media_source/com_templates/js/admin-template-toggle-switch.es6.js
index 0ad9dfcf98f40..d7593f5a1ca44 100644
--- a/build/media_src/com_templates/js/admin-template-toggle-switch.es6.js
+++ b/build/media_source/com_templates/js/admin-template-toggle-switch.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 (() => {
diff --git a/build/media_src/com_templates/js/admin-templates-default.es6.js b/build/media_source/com_templates/js/admin-templates-default.es6.js
similarity index 95%
rename from build/media_src/com_templates/js/admin-templates-default.es6.js
rename to build/media_source/com_templates/js/admin-templates-default.es6.js
index 5c2ecee5aa59d..66efff3d21091 100644
--- a/build/media_src/com_templates/js/admin-templates-default.es6.js
+++ b/build/media_source/com_templates/js/admin-templates-default.es6.js
@@ -1,13 +1,13 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 (() => {
   'use strict';
 
   document.addEventListener('DOMContentLoaded', () => {
-    const folders = [].slice.call(document.querySelectorAll('.folder-url, .component-folder-url, .layout-folder-url'));
-    const innerLists = [].slice.call(document.querySelectorAll('.folder ul, .component-folder ul, .layout-folder ul'));
+    const folders = [].slice.call(document.querySelectorAll('.folder-url, .component-folder-url, .plugin-folder ul, .layout-folder-url'));
+    const innerLists = [].slice.call(document.querySelectorAll('.folder ul, .component-folder ul, .plugin-folder ul, .layout-folder ul'));
     const openLists = [].slice.call(document.querySelectorAll('.show > ul'));
     const fileModalFolders = [].slice.call(document.querySelectorAll('#fileModal .folder-url'));
     const folderModalFolders = [].slice.call(document.querySelectorAll('#folderModal .folder-url'));
diff --git a/build/media_src/com_users/js/admin-users-groups.es6.js b/build/media_source/com_users/js/admin-users-groups.es6.js
similarity index 92%
rename from build/media_src/com_users/js/admin-users-groups.es6.js
rename to build/media_source/com_users/js/admin-users-groups.es6.js
index d4b138f681478..56318f4997eb6 100644
--- a/build/media_src/com_users/js/admin-users-groups.es6.js
+++ b/build/media_source/com_users/js/admin-users-groups.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_users/js/admin-users-mail.es6.js b/build/media_source/com_users/js/admin-users-mail.es6.js
similarity index 94%
rename from build/media_src/com_users/js/admin-users-mail.es6.js
rename to build/media_source/com_users/js/admin-users-mail.es6.js
index 9762c8c666463..93a3ad17c33b2 100644
--- a/build/media_src/com_users/js/admin-users-mail.es6.js
+++ b/build/media_source/com_users/js/admin-users-mail.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_users/js/admin-users-user.es6.js b/build/media_source/com_users/js/admin-users-user.es6.js
similarity index 93%
rename from build/media_src/com_users/js/admin-users-user.es6.js
rename to build/media_source/com_users/js/admin-users-user.es6.js
index 9cc695a8df543..3b0d6df4cdd6c 100644
--- a/build/media_src/com_users/js/admin-users-user.es6.js
+++ b/build/media_source/com_users/js/admin-users-user.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_users/js/two-factor-switcher.es6.js b/build/media_source/com_users/js/two-factor-switcher.es6.js
similarity index 91%
rename from build/media_src/com_users/js/two-factor-switcher.es6.js
rename to build/media_source/com_users/js/two-factor-switcher.es6.js
index 64d89e5922097..78372f693d52a 100644
--- a/build/media_src/com_users/js/two-factor-switcher.es6.js
+++ b/build/media_source/com_users/js/two-factor-switcher.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/com_wrapper/js/iframe-height.es6.js b/build/media_source/com_wrapper/js/iframe-height.es6.js
similarity index 90%
rename from build/media_src/com_wrapper/js/iframe-height.es6.js
rename to build/media_source/com_wrapper/js/iframe-height.es6.js
index 5d3eca2276fc4..6476148ae2cff 100644
--- a/build/media_src/com_wrapper/js/iframe-height.es6.js
+++ b/build/media_source/com_wrapper/js/iframe-height.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/contacts/images/con_address.png b/build/media_source/contacts/images/con_address.png
similarity index 100%
rename from build/media/contacts/images/con_address.png
rename to build/media_source/contacts/images/con_address.png
diff --git a/build/media/contacts/images/con_fax.png b/build/media_source/contacts/images/con_fax.png
similarity index 100%
rename from build/media/contacts/images/con_fax.png
rename to build/media_source/contacts/images/con_fax.png
diff --git a/build/media/contacts/images/con_info.png b/build/media_source/contacts/images/con_info.png
similarity index 100%
rename from build/media/contacts/images/con_info.png
rename to build/media_source/contacts/images/con_info.png
diff --git a/build/media/contacts/images/con_mobile.png b/build/media_source/contacts/images/con_mobile.png
similarity index 100%
rename from build/media/contacts/images/con_mobile.png
rename to build/media_source/contacts/images/con_mobile.png
diff --git a/build/media/contacts/images/con_tel.png b/build/media_source/contacts/images/con_tel.png
similarity index 100%
rename from build/media/contacts/images/con_tel.png
rename to build/media_source/contacts/images/con_tel.png
diff --git a/build/media/contacts/images/emailButton.png b/build/media_source/contacts/images/emailButton.png
similarity index 100%
rename from build/media/contacts/images/emailButton.png
rename to build/media_source/contacts/images/emailButton.png
diff --git a/build/media/index.html b/build/media_source/index.html
similarity index 100%
rename from build/media/index.html
rename to build/media_source/index.html
diff --git a/build/media_src/layouts/js/joomla/form/field/category-change.es6.js b/build/media_source/layouts/js/joomla/form/field/category-change.es6.js
similarity index 63%
rename from build/media_src/layouts/js/joomla/form/field/category-change.es6.js
rename to build/media_source/layouts/js/joomla/form/field/category-change.es6.js
index dd866a66b3977..c1019c6a50216 100644
--- a/build/media_src/layouts/js/joomla/form/field/category-change.es6.js
+++ b/build/media_source/layouts/js/joomla/form/field/category-change.es6.js
@@ -11,15 +11,15 @@
     throw new Error('Category Id element not found');
   }
 
-  if (element.getAttribute('data-custom-fields-catid') && element.value !== element.getAttribute('data-cat-id')) {
-    element.value = element.getAttribute('data-custom-fields-catid');
+  if (element.getAttribute('data-refresh-catid') && element.value !== element.getAttribute('data-cat-id')) {
+    element.value = element.getAttribute('data-refresh-catid');
   } else {
     // No custom fields
-    element.setAttribute('data-custom-fields-catid', element.value);
+    element.setAttribute('data-refresh-catid', element.value);
   }
 
   window.Joomla.categoryHasChanged = (el) => {
-    if (el.value === el.getAttribute('data-custom-fields-catid')) {
+    if (el.value === el.getAttribute('data-refresh-catid')) {
       return;
     }
 
@@ -27,8 +27,8 @@
     document.body.appendChild(document.createElement('joomla-core-loader'));
 
     // Custom Fields
-    if (el.getAttribute('data-custom-fields-section')) {
-      document.querySelector('input[name=task]').value = `${el.getAttribute('data-custom-fields-section')}.reload`;
+    if (el.getAttribute('data-refresh-section')) {
+      document.querySelector('input[name=task]').value = `${el.getAttribute('data-refresh-section')}.reload`;
     }
 
     element.form.submit();
diff --git a/build/media_src/layouts/js/joomla/html/batch/batch-language.es6.js b/build/media_source/layouts/js/joomla/html/batch/batch-language.es6.js
similarity index 95%
rename from build/media_src/layouts/js/joomla/html/batch/batch-language.es6.js
rename to build/media_source/layouts/js/joomla/html/batch/batch-language.es6.js
index e8e6116ba4796..056a29e55572e 100644
--- a/build/media_src/layouts/js/joomla/html/batch/batch-language.es6.js
+++ b/build/media_source/layouts/js/joomla/html/batch/batch-language.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/system/css/sortablelist.css b/build/media_source/legacy/css/sortablelist.css
similarity index 97%
rename from build/media/system/css/sortablelist.css
rename to build/media_source/legacy/css/sortablelist.css
index 6794a31777f70..dee64e10a2b8a 100644
--- a/build/media/system/css/sortablelist.css
+++ b/build/media_source/legacy/css/sortablelist.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 .dnd-list-highlight {
diff --git a/build/media/legacy/joomla.asset.json b/build/media_source/legacy/joomla.asset.json
similarity index 100%
rename from build/media/legacy/joomla.asset.json
rename to build/media_source/legacy/joomla.asset.json
diff --git a/build/media/legacy/js/ajax-chosen.js b/build/media_source/legacy/js/ajax-chosen.es5.js
similarity index 98%
rename from build/media/legacy/js/ajax-chosen.js
rename to build/media_source/legacy/js/ajax-chosen.es5.js
index 587388a8926b2..01ad3ac3c738c 100644
--- a/build/media/legacy/js/ajax-chosen.js
+++ b/build/media_source/legacy/js/ajax-chosen.es5.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/legacy/js/bootstrap-init.js b/build/media_source/legacy/js/bootstrap-init.es5.js
similarity index 100%
rename from build/media/legacy/js/bootstrap-init.js
rename to build/media_source/legacy/js/bootstrap-init.es5.js
diff --git a/build/media/legacy/js/frontediting.js b/build/media_source/legacy/js/frontediting.es5.js
similarity index 98%
rename from build/media/legacy/js/frontediting.js
rename to build/media_source/legacy/js/frontediting.es5.js
index 6a22bdc440326..346ab31131dc3 100644
--- a/build/media/legacy/js/frontediting.js
+++ b/build/media_source/legacy/js/frontediting.es5.js
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/legacy/js/helpsite.js b/build/media_source/legacy/js/helpsite.es5.js
similarity index 95%
rename from build/media/legacy/js/helpsite.js
rename to build/media_source/legacy/js/helpsite.es5.js
index f5c611644ef0a..576058a00977e 100644
--- a/build/media/legacy/js/helpsite.js
+++ b/build/media_source/legacy/js/helpsite.es5.js
@@ -1,6 +1,6 @@
 /**
  * @package		Joomla.JavaScript
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/legacy/js/highlighter.js b/build/media_source/legacy/js/highlighter.es5.js
similarity index 98%
rename from build/media/legacy/js/highlighter.js
rename to build/media_source/legacy/js/highlighter.es5.js
index c868932de08c5..a2a6fa9f61adf 100644
--- a/build/media/legacy/js/highlighter.js
+++ b/build/media_source/legacy/js/highlighter.es5.js
@@ -1,6 +1,6 @@
 /**
  * @package     Joomla.JavaScript
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/legacy/js/html5.js b/build/media_source/legacy/js/html5.es5.js
similarity index 100%
rename from build/media/legacy/js/html5.js
rename to build/media_source/legacy/js/html5.es5.js
diff --git a/build/media/legacy/js/html5fallback.js b/build/media_source/legacy/js/html5fallback.es5.js
similarity index 99%
rename from build/media/legacy/js/html5fallback.js
rename to build/media_source/legacy/js/html5fallback.es5.js
index dbdb7d0c341da..d943c3dde346e 100644
--- a/build/media/legacy/js/html5fallback.js
+++ b/build/media_source/legacy/js/html5fallback.es5.js
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/legacy/js/joomla-chosen.js b/build/media_source/legacy/js/joomla-chosen.es5.js
similarity index 100%
rename from build/media/legacy/js/joomla-chosen.js
rename to build/media_source/legacy/js/joomla-chosen.es5.js
diff --git a/build/media/legacy/js/jquery-noconflict.js b/build/media_source/legacy/js/jquery-noconflict.es5.js
similarity index 100%
rename from build/media/legacy/js/jquery-noconflict.js
rename to build/media_source/legacy/js/jquery-noconflict.es5.js
diff --git a/build/media/legacy/js/sortablelist.js b/build/media_source/legacy/js/sortablelist.es5.js
similarity index 99%
rename from build/media/legacy/js/sortablelist.js
rename to build/media_source/legacy/js/sortablelist.es5.js
index 9be622d23b115..aa9c6fbf55d1c 100644
--- a/build/media/legacy/js/sortablelist.js
+++ b/build/media_source/legacy/js/sortablelist.es5.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 (function ($) {
diff --git a/build/media/legacy/js/tabs-state.js b/build/media_source/legacy/js/tabs-state.es5.js
similarity index 99%
rename from build/media/legacy/js/tabs-state.js
rename to build/media_source/legacy/js/tabs-state.es5.js
index 4f471bebc4b20..53c04410e4b20 100644
--- a/build/media/legacy/js/tabs-state.js
+++ b/build/media_source/legacy/js/tabs-state.es5.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/legacy/js/toolbar.js b/build/media_source/legacy/js/toolbar.es5.js
similarity index 95%
rename from build/media/legacy/js/toolbar.js
rename to build/media_source/legacy/js/toolbar.es5.js
index 9f1d8cf7adc2b..c48ada31a6974 100644
--- a/build/media/legacy/js/toolbar.js
+++ b/build/media_source/legacy/js/toolbar.es5.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/legacy/js/treeselectmenu.js b/build/media_source/legacy/js/treeselectmenu.es5.js
similarity index 98%
rename from build/media/legacy/js/treeselectmenu.js
rename to build/media_source/legacy/js/treeselectmenu.es5.js
index 02c46e79a8919..1b8d3a04f8f38 100644
--- a/build/media/legacy/js/treeselectmenu.js
+++ b/build/media_source/legacy/js/treeselectmenu.es5.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 jQuery(function($)
diff --git a/build/media/mailto/images/close-x.png b/build/media_source/mailto/images/close-x.png
similarity index 100%
rename from build/media/mailto/images/close-x.png
rename to build/media_source/mailto/images/close-x.png
diff --git a/build/media/mod_languages/css/template.css b/build/media_source/mod_languages/css/template.css
similarity index 100%
rename from build/media/mod_languages/css/template.css
rename to build/media_source/mod_languages/css/template.css
diff --git a/build/media/mod_languages/images/af.gif b/build/media_source/mod_languages/images/af.gif
similarity index 100%
rename from build/media/mod_languages/images/af.gif
rename to build/media_source/mod_languages/images/af.gif
diff --git a/build/media/mod_languages/images/af_za.gif b/build/media_source/mod_languages/images/af_za.gif
similarity index 100%
rename from build/media/mod_languages/images/af_za.gif
rename to build/media_source/mod_languages/images/af_za.gif
diff --git a/build/media/mod_languages/images/al.gif b/build/media_source/mod_languages/images/al.gif
similarity index 100%
rename from build/media/mod_languages/images/al.gif
rename to build/media_source/mod_languages/images/al.gif
diff --git a/build/media/mod_languages/images/ar.gif b/build/media_source/mod_languages/images/ar.gif
similarity index 100%
rename from build/media/mod_languages/images/ar.gif
rename to build/media_source/mod_languages/images/ar.gif
diff --git a/build/media/mod_languages/images/ar_aa.gif b/build/media_source/mod_languages/images/ar_aa.gif
similarity index 100%
rename from build/media/mod_languages/images/ar_aa.gif
rename to build/media_source/mod_languages/images/ar_aa.gif
diff --git a/build/media/mod_languages/images/at.gif b/build/media_source/mod_languages/images/at.gif
similarity index 100%
rename from build/media/mod_languages/images/at.gif
rename to build/media_source/mod_languages/images/at.gif
diff --git a/build/media/mod_languages/images/az.gif b/build/media_source/mod_languages/images/az.gif
similarity index 100%
rename from build/media/mod_languages/images/az.gif
rename to build/media_source/mod_languages/images/az.gif
diff --git a/build/media/mod_languages/images/az_az.gif b/build/media_source/mod_languages/images/az_az.gif
similarity index 100%
rename from build/media/mod_languages/images/az_az.gif
rename to build/media_source/mod_languages/images/az_az.gif
diff --git a/build/media/mod_languages/images/be.gif b/build/media_source/mod_languages/images/be.gif
similarity index 100%
rename from build/media/mod_languages/images/be.gif
rename to build/media_source/mod_languages/images/be.gif
diff --git a/build/media/mod_languages/images/be_by.gif b/build/media_source/mod_languages/images/be_by.gif
similarity index 100%
rename from build/media/mod_languages/images/be_by.gif
rename to build/media_source/mod_languages/images/be_by.gif
diff --git a/build/media/mod_languages/images/belg.gif b/build/media_source/mod_languages/images/belg.gif
similarity index 100%
rename from build/media/mod_languages/images/belg.gif
rename to build/media_source/mod_languages/images/belg.gif
diff --git a/build/media/mod_languages/images/bg.gif b/build/media_source/mod_languages/images/bg.gif
similarity index 100%
rename from build/media/mod_languages/images/bg.gif
rename to build/media_source/mod_languages/images/bg.gif
diff --git a/build/media/mod_languages/images/bg_bg.gif b/build/media_source/mod_languages/images/bg_bg.gif
similarity index 100%
rename from build/media/mod_languages/images/bg_bg.gif
rename to build/media_source/mod_languages/images/bg_bg.gif
diff --git a/build/media/mod_languages/images/bn.gif b/build/media_source/mod_languages/images/bn.gif
similarity index 100%
rename from build/media/mod_languages/images/bn.gif
rename to build/media_source/mod_languages/images/bn.gif
diff --git a/build/media/mod_languages/images/bn_bd.gif b/build/media_source/mod_languages/images/bn_bd.gif
similarity index 100%
rename from build/media/mod_languages/images/bn_bd.gif
rename to build/media_source/mod_languages/images/bn_bd.gif
diff --git a/build/media/mod_languages/images/br.gif b/build/media_source/mod_languages/images/br.gif
similarity index 100%
rename from build/media/mod_languages/images/br.gif
rename to build/media_source/mod_languages/images/br.gif
diff --git a/build/media/mod_languages/images/br_fr.gif b/build/media_source/mod_languages/images/br_fr.gif
similarity index 100%
rename from build/media/mod_languages/images/br_fr.gif
rename to build/media_source/mod_languages/images/br_fr.gif
diff --git a/build/media/mod_languages/images/bs.gif b/build/media_source/mod_languages/images/bs.gif
similarity index 100%
rename from build/media/mod_languages/images/bs.gif
rename to build/media_source/mod_languages/images/bs.gif
diff --git a/build/media/mod_languages/images/bs_ba.gif b/build/media_source/mod_languages/images/bs_ba.gif
similarity index 100%
rename from build/media/mod_languages/images/bs_ba.gif
rename to build/media_source/mod_languages/images/bs_ba.gif
diff --git a/build/media/mod_languages/images/ca.gif b/build/media_source/mod_languages/images/ca.gif
similarity index 100%
rename from build/media/mod_languages/images/ca.gif
rename to build/media_source/mod_languages/images/ca.gif
diff --git a/build/media/mod_languages/images/ca_es.gif b/build/media_source/mod_languages/images/ca_es.gif
similarity index 100%
rename from build/media/mod_languages/images/ca_es.gif
rename to build/media_source/mod_languages/images/ca_es.gif
diff --git a/build/media/mod_languages/images/cbk_iq.gif b/build/media_source/mod_languages/images/cbk_iq.gif
similarity index 100%
rename from build/media/mod_languages/images/cbk_iq.gif
rename to build/media_source/mod_languages/images/cbk_iq.gif
diff --git a/build/media/mod_languages/images/ch.gif b/build/media_source/mod_languages/images/ch.gif
similarity index 100%
rename from build/media/mod_languages/images/ch.gif
rename to build/media_source/mod_languages/images/ch.gif
diff --git a/build/media/mod_languages/images/cs.gif b/build/media_source/mod_languages/images/cs.gif
similarity index 100%
rename from build/media/mod_languages/images/cs.gif
rename to build/media_source/mod_languages/images/cs.gif
diff --git a/build/media/mod_languages/images/cs_cz.gif b/build/media_source/mod_languages/images/cs_cz.gif
similarity index 100%
rename from build/media/mod_languages/images/cs_cz.gif
rename to build/media_source/mod_languages/images/cs_cz.gif
diff --git a/build/media/mod_languages/images/cy.gif b/build/media_source/mod_languages/images/cy.gif
similarity index 100%
rename from build/media/mod_languages/images/cy.gif
rename to build/media_source/mod_languages/images/cy.gif
diff --git a/build/media/mod_languages/images/cy_gb.gif b/build/media_source/mod_languages/images/cy_gb.gif
similarity index 100%
rename from build/media/mod_languages/images/cy_gb.gif
rename to build/media_source/mod_languages/images/cy_gb.gif
diff --git a/build/media/mod_languages/images/cz.gif b/build/media_source/mod_languages/images/cz.gif
similarity index 100%
rename from build/media/mod_languages/images/cz.gif
rename to build/media_source/mod_languages/images/cz.gif
diff --git a/build/media/mod_languages/images/cz_cz.gif b/build/media_source/mod_languages/images/cz_cz.gif
similarity index 100%
rename from build/media/mod_languages/images/cz_cz.gif
rename to build/media_source/mod_languages/images/cz_cz.gif
diff --git a/build/media/mod_languages/images/da.gif b/build/media_source/mod_languages/images/da.gif
similarity index 100%
rename from build/media/mod_languages/images/da.gif
rename to build/media_source/mod_languages/images/da.gif
diff --git a/build/media/mod_languages/images/da_dk.gif b/build/media_source/mod_languages/images/da_dk.gif
similarity index 100%
rename from build/media/mod_languages/images/da_dk.gif
rename to build/media_source/mod_languages/images/da_dk.gif
diff --git a/build/media/mod_languages/images/de.gif b/build/media_source/mod_languages/images/de.gif
similarity index 100%
rename from build/media/mod_languages/images/de.gif
rename to build/media_source/mod_languages/images/de.gif
diff --git a/build/media/mod_languages/images/de_at.gif b/build/media_source/mod_languages/images/de_at.gif
similarity index 100%
rename from build/media/mod_languages/images/de_at.gif
rename to build/media_source/mod_languages/images/de_at.gif
diff --git a/build/media/mod_languages/images/de_ch.gif b/build/media_source/mod_languages/images/de_ch.gif
similarity index 100%
rename from build/media/mod_languages/images/de_ch.gif
rename to build/media_source/mod_languages/images/de_ch.gif
diff --git a/build/media/mod_languages/images/de_de.gif b/build/media_source/mod_languages/images/de_de.gif
similarity index 100%
rename from build/media/mod_languages/images/de_de.gif
rename to build/media_source/mod_languages/images/de_de.gif
diff --git a/build/media/mod_languages/images/de_li.gif b/build/media_source/mod_languages/images/de_li.gif
similarity index 100%
rename from build/media/mod_languages/images/de_li.gif
rename to build/media_source/mod_languages/images/de_li.gif
diff --git a/build/media/mod_languages/images/de_lu.gif b/build/media_source/mod_languages/images/de_lu.gif
similarity index 100%
rename from build/media/mod_languages/images/de_lu.gif
rename to build/media_source/mod_languages/images/de_lu.gif
diff --git a/build/media/mod_languages/images/dk.gif b/build/media_source/mod_languages/images/dk.gif
similarity index 100%
rename from build/media/mod_languages/images/dk.gif
rename to build/media_source/mod_languages/images/dk.gif
diff --git a/build/media/mod_languages/images/dz_bt.gif b/build/media_source/mod_languages/images/dz_bt.gif
similarity index 100%
rename from build/media/mod_languages/images/dz_bt.gif
rename to build/media_source/mod_languages/images/dz_bt.gif
diff --git a/build/media_source/mod_languages/images/el.gif b/build/media_source/mod_languages/images/el.gif
new file mode 100644
index 0000000000000..40b210383e952
Binary files /dev/null and b/build/media_source/mod_languages/images/el.gif differ
diff --git a/build/media_source/mod_languages/images/el_gr.gif b/build/media_source/mod_languages/images/el_gr.gif
new file mode 100644
index 0000000000000..40b210383e952
Binary files /dev/null and b/build/media_source/mod_languages/images/el_gr.gif differ
diff --git a/build/media/mod_languages/images/en.gif b/build/media_source/mod_languages/images/en.gif
similarity index 100%
rename from build/media/mod_languages/images/en.gif
rename to build/media_source/mod_languages/images/en.gif
diff --git a/build/media/mod_languages/images/en_au.gif b/build/media_source/mod_languages/images/en_au.gif
similarity index 100%
rename from build/media/mod_languages/images/en_au.gif
rename to build/media_source/mod_languages/images/en_au.gif
diff --git a/build/media/mod_languages/images/en_ca.gif b/build/media_source/mod_languages/images/en_ca.gif
similarity index 100%
rename from build/media/mod_languages/images/en_ca.gif
rename to build/media_source/mod_languages/images/en_ca.gif
diff --git a/build/media/mod_languages/images/en_gb.gif b/build/media_source/mod_languages/images/en_gb.gif
similarity index 100%
rename from build/media/mod_languages/images/en_gb.gif
rename to build/media_source/mod_languages/images/en_gb.gif
diff --git a/build/media/mod_languages/images/en_nz.gif b/build/media_source/mod_languages/images/en_nz.gif
similarity index 100%
rename from build/media/mod_languages/images/en_nz.gif
rename to build/media_source/mod_languages/images/en_nz.gif
diff --git a/build/media/mod_languages/images/en_us.gif b/build/media_source/mod_languages/images/en_us.gif
similarity index 100%
rename from build/media/mod_languages/images/en_us.gif
rename to build/media_source/mod_languages/images/en_us.gif
diff --git a/build/media/mod_languages/images/eo.gif b/build/media_source/mod_languages/images/eo.gif
similarity index 100%
rename from build/media/mod_languages/images/eo.gif
rename to build/media_source/mod_languages/images/eo.gif
diff --git a/build/media/mod_languages/images/eo_xx.gif b/build/media_source/mod_languages/images/eo_xx.gif
similarity index 100%
rename from build/media/mod_languages/images/eo_xx.gif
rename to build/media_source/mod_languages/images/eo_xx.gif
diff --git a/build/media/mod_languages/images/es.gif b/build/media_source/mod_languages/images/es.gif
similarity index 100%
rename from build/media/mod_languages/images/es.gif
rename to build/media_source/mod_languages/images/es.gif
diff --git a/build/media/mod_languages/images/es_co.gif b/build/media_source/mod_languages/images/es_co.gif
similarity index 100%
rename from build/media/mod_languages/images/es_co.gif
rename to build/media_source/mod_languages/images/es_co.gif
diff --git a/build/media/mod_languages/images/es_es.gif b/build/media_source/mod_languages/images/es_es.gif
similarity index 100%
rename from build/media/mod_languages/images/es_es.gif
rename to build/media_source/mod_languages/images/es_es.gif
diff --git a/build/media/mod_languages/images/et.gif b/build/media_source/mod_languages/images/et.gif
similarity index 100%
rename from build/media/mod_languages/images/et.gif
rename to build/media_source/mod_languages/images/et.gif
diff --git a/build/media/mod_languages/images/et_ee.gif b/build/media_source/mod_languages/images/et_ee.gif
similarity index 100%
rename from build/media/mod_languages/images/et_ee.gif
rename to build/media_source/mod_languages/images/et_ee.gif
diff --git a/build/media/mod_languages/images/eu_es.gif b/build/media_source/mod_languages/images/eu_es.gif
similarity index 100%
rename from build/media/mod_languages/images/eu_es.gif
rename to build/media_source/mod_languages/images/eu_es.gif
diff --git a/build/media/mod_languages/images/fa.gif b/build/media_source/mod_languages/images/fa.gif
similarity index 100%
rename from build/media/mod_languages/images/fa.gif
rename to build/media_source/mod_languages/images/fa.gif
diff --git a/build/media/mod_languages/images/fa_ir.gif b/build/media_source/mod_languages/images/fa_ir.gif
similarity index 100%
rename from build/media/mod_languages/images/fa_ir.gif
rename to build/media_source/mod_languages/images/fa_ir.gif
diff --git a/build/media/mod_languages/images/fi.gif b/build/media_source/mod_languages/images/fi.gif
similarity index 100%
rename from build/media/mod_languages/images/fi.gif
rename to build/media_source/mod_languages/images/fi.gif
diff --git a/build/media/mod_languages/images/fi_fi.gif b/build/media_source/mod_languages/images/fi_fi.gif
similarity index 100%
rename from build/media/mod_languages/images/fi_fi.gif
rename to build/media_source/mod_languages/images/fi_fi.gif
diff --git a/build/media/mod_languages/images/fr.gif b/build/media_source/mod_languages/images/fr.gif
similarity index 100%
rename from build/media/mod_languages/images/fr.gif
rename to build/media_source/mod_languages/images/fr.gif
diff --git a/build/media/mod_languages/images/fr_ca.gif b/build/media_source/mod_languages/images/fr_ca.gif
similarity index 100%
rename from build/media/mod_languages/images/fr_ca.gif
rename to build/media_source/mod_languages/images/fr_ca.gif
diff --git a/build/media/mod_languages/images/fr_fr.gif b/build/media_source/mod_languages/images/fr_fr.gif
similarity index 100%
rename from build/media/mod_languages/images/fr_fr.gif
rename to build/media_source/mod_languages/images/fr_fr.gif
diff --git a/build/media/mod_languages/images/ga_ie.gif b/build/media_source/mod_languages/images/ga_ie.gif
similarity index 100%
rename from build/media/mod_languages/images/ga_ie.gif
rename to build/media_source/mod_languages/images/ga_ie.gif
diff --git a/build/media/mod_languages/images/gd.gif b/build/media_source/mod_languages/images/gd.gif
similarity index 100%
rename from build/media/mod_languages/images/gd.gif
rename to build/media_source/mod_languages/images/gd.gif
diff --git a/build/media/mod_languages/images/gd_gb.gif b/build/media_source/mod_languages/images/gd_gb.gif
similarity index 100%
rename from build/media/mod_languages/images/gd_gb.gif
rename to build/media_source/mod_languages/images/gd_gb.gif
diff --git a/build/media/mod_languages/images/gl.gif b/build/media_source/mod_languages/images/gl.gif
similarity index 100%
rename from build/media/mod_languages/images/gl.gif
rename to build/media_source/mod_languages/images/gl.gif
diff --git a/build/media/mod_languages/images/gl_es.gif b/build/media_source/mod_languages/images/gl_es.gif
similarity index 100%
rename from build/media/mod_languages/images/gl_es.gif
rename to build/media_source/mod_languages/images/gl_es.gif
diff --git a/build/media/mod_languages/images/he.gif b/build/media_source/mod_languages/images/he.gif
similarity index 100%
rename from build/media/mod_languages/images/he.gif
rename to build/media_source/mod_languages/images/he.gif
diff --git a/build/media/mod_languages/images/he_il.gif b/build/media_source/mod_languages/images/he_il.gif
similarity index 100%
rename from build/media/mod_languages/images/he_il.gif
rename to build/media_source/mod_languages/images/he_il.gif
diff --git a/build/media/mod_languages/images/hi.gif b/build/media_source/mod_languages/images/hi.gif
similarity index 100%
rename from build/media/mod_languages/images/hi.gif
rename to build/media_source/mod_languages/images/hi.gif
diff --git a/build/media/mod_languages/images/hi_in.gif b/build/media_source/mod_languages/images/hi_in.gif
similarity index 100%
rename from build/media/mod_languages/images/hi_in.gif
rename to build/media_source/mod_languages/images/hi_in.gif
diff --git a/build/media/mod_languages/images/hk.gif b/build/media_source/mod_languages/images/hk.gif
similarity index 100%
rename from build/media/mod_languages/images/hk.gif
rename to build/media_source/mod_languages/images/hk.gif
diff --git a/build/media/mod_languages/images/hk_hk.gif b/build/media_source/mod_languages/images/hk_hk.gif
similarity index 100%
rename from build/media/mod_languages/images/hk_hk.gif
rename to build/media_source/mod_languages/images/hk_hk.gif
diff --git a/build/media/mod_languages/images/hr.gif b/build/media_source/mod_languages/images/hr.gif
similarity index 100%
rename from build/media/mod_languages/images/hr.gif
rename to build/media_source/mod_languages/images/hr.gif
diff --git a/build/media/mod_languages/images/hr_hr.gif b/build/media_source/mod_languages/images/hr_hr.gif
similarity index 100%
rename from build/media/mod_languages/images/hr_hr.gif
rename to build/media_source/mod_languages/images/hr_hr.gif
diff --git a/build/media/mod_languages/images/hu.gif b/build/media_source/mod_languages/images/hu.gif
similarity index 100%
rename from build/media/mod_languages/images/hu.gif
rename to build/media_source/mod_languages/images/hu.gif
diff --git a/build/media/mod_languages/images/hu_hu.gif b/build/media_source/mod_languages/images/hu_hu.gif
similarity index 100%
rename from build/media/mod_languages/images/hu_hu.gif
rename to build/media_source/mod_languages/images/hu_hu.gif
diff --git a/build/media/mod_languages/images/hy.gif b/build/media_source/mod_languages/images/hy.gif
similarity index 100%
rename from build/media/mod_languages/images/hy.gif
rename to build/media_source/mod_languages/images/hy.gif
diff --git a/build/media/mod_languages/images/hy_am.gif b/build/media_source/mod_languages/images/hy_am.gif
similarity index 100%
rename from build/media/mod_languages/images/hy_am.gif
rename to build/media_source/mod_languages/images/hy_am.gif
diff --git a/build/media/mod_languages/images/icon-16-language.png b/build/media_source/mod_languages/images/icon-16-language.png
similarity index 100%
rename from build/media/mod_languages/images/icon-16-language.png
rename to build/media_source/mod_languages/images/icon-16-language.png
diff --git a/build/media/mod_languages/images/id.gif b/build/media_source/mod_languages/images/id.gif
similarity index 100%
rename from build/media/mod_languages/images/id.gif
rename to build/media_source/mod_languages/images/id.gif
diff --git a/build/media/mod_languages/images/id_id.gif b/build/media_source/mod_languages/images/id_id.gif
similarity index 100%
rename from build/media/mod_languages/images/id_id.gif
rename to build/media_source/mod_languages/images/id_id.gif
diff --git a/build/media/mod_languages/images/is.gif b/build/media_source/mod_languages/images/is.gif
similarity index 100%
rename from build/media/mod_languages/images/is.gif
rename to build/media_source/mod_languages/images/is.gif
diff --git a/build/media/mod_languages/images/is_is.gif b/build/media_source/mod_languages/images/is_is.gif
similarity index 100%
rename from build/media/mod_languages/images/is_is.gif
rename to build/media_source/mod_languages/images/is_is.gif
diff --git a/build/media/mod_languages/images/it.gif b/build/media_source/mod_languages/images/it.gif
similarity index 100%
rename from build/media/mod_languages/images/it.gif
rename to build/media_source/mod_languages/images/it.gif
diff --git a/build/media/mod_languages/images/it_it.gif b/build/media_source/mod_languages/images/it_it.gif
similarity index 100%
rename from build/media/mod_languages/images/it_it.gif
rename to build/media_source/mod_languages/images/it_it.gif
diff --git a/build/media/mod_languages/images/ja.gif b/build/media_source/mod_languages/images/ja.gif
similarity index 100%
rename from build/media/mod_languages/images/ja.gif
rename to build/media_source/mod_languages/images/ja.gif
diff --git a/build/media/mod_languages/images/ja_jp.gif b/build/media_source/mod_languages/images/ja_jp.gif
similarity index 100%
rename from build/media/mod_languages/images/ja_jp.gif
rename to build/media_source/mod_languages/images/ja_jp.gif
diff --git a/build/media/mod_languages/images/ka.gif b/build/media_source/mod_languages/images/ka.gif
similarity index 100%
rename from build/media/mod_languages/images/ka.gif
rename to build/media_source/mod_languages/images/ka.gif
diff --git a/build/media/mod_languages/images/ka_ge.gif b/build/media_source/mod_languages/images/ka_ge.gif
similarity index 100%
rename from build/media/mod_languages/images/ka_ge.gif
rename to build/media_source/mod_languages/images/ka_ge.gif
diff --git a/build/media/mod_languages/images/km.gif b/build/media_source/mod_languages/images/km.gif
similarity index 100%
rename from build/media/mod_languages/images/km.gif
rename to build/media_source/mod_languages/images/km.gif
diff --git a/build/media/mod_languages/images/km_kh.gif b/build/media_source/mod_languages/images/km_kh.gif
similarity index 100%
rename from build/media/mod_languages/images/km_kh.gif
rename to build/media_source/mod_languages/images/km_kh.gif
diff --git a/build/media/mod_languages/images/ko.gif b/build/media_source/mod_languages/images/ko.gif
similarity index 100%
rename from build/media/mod_languages/images/ko.gif
rename to build/media_source/mod_languages/images/ko.gif
diff --git a/build/media/mod_languages/images/ko_kr.gif b/build/media_source/mod_languages/images/ko_kr.gif
similarity index 100%
rename from build/media/mod_languages/images/ko_kr.gif
rename to build/media_source/mod_languages/images/ko_kr.gif
diff --git a/build/media/mod_languages/images/ku.gif b/build/media_source/mod_languages/images/ku.gif
similarity index 100%
rename from build/media/mod_languages/images/ku.gif
rename to build/media_source/mod_languages/images/ku.gif
diff --git a/build/media/mod_languages/images/lo.gif b/build/media_source/mod_languages/images/lo.gif
similarity index 100%
rename from build/media/mod_languages/images/lo.gif
rename to build/media_source/mod_languages/images/lo.gif
diff --git a/build/media/mod_languages/images/lo_la.gif b/build/media_source/mod_languages/images/lo_la.gif
similarity index 100%
rename from build/media/mod_languages/images/lo_la.gif
rename to build/media_source/mod_languages/images/lo_la.gif
diff --git a/build/media/mod_languages/images/lt.gif b/build/media_source/mod_languages/images/lt.gif
similarity index 100%
rename from build/media/mod_languages/images/lt.gif
rename to build/media_source/mod_languages/images/lt.gif
diff --git a/build/media/mod_languages/images/lt_lt.gif b/build/media_source/mod_languages/images/lt_lt.gif
similarity index 100%
rename from build/media/mod_languages/images/lt_lt.gif
rename to build/media_source/mod_languages/images/lt_lt.gif
diff --git a/build/media/mod_languages/images/lv.gif b/build/media_source/mod_languages/images/lv.gif
similarity index 100%
rename from build/media/mod_languages/images/lv.gif
rename to build/media_source/mod_languages/images/lv.gif
diff --git a/build/media/mod_languages/images/lv_lv.gif b/build/media_source/mod_languages/images/lv_lv.gif
similarity index 100%
rename from build/media/mod_languages/images/lv_lv.gif
rename to build/media_source/mod_languages/images/lv_lv.gif
diff --git a/build/media/mod_languages/images/mk.gif b/build/media_source/mod_languages/images/mk.gif
similarity index 100%
rename from build/media/mod_languages/images/mk.gif
rename to build/media_source/mod_languages/images/mk.gif
diff --git a/build/media/mod_languages/images/mk_mk.gif b/build/media_source/mod_languages/images/mk_mk.gif
similarity index 100%
rename from build/media/mod_languages/images/mk_mk.gif
rename to build/media_source/mod_languages/images/mk_mk.gif
diff --git a/build/media/mod_languages/images/mn.gif b/build/media_source/mod_languages/images/mn.gif
similarity index 100%
rename from build/media/mod_languages/images/mn.gif
rename to build/media_source/mod_languages/images/mn.gif
diff --git a/build/media/mod_languages/images/mn_mn.gif b/build/media_source/mod_languages/images/mn_mn.gif
similarity index 100%
rename from build/media/mod_languages/images/mn_mn.gif
rename to build/media_source/mod_languages/images/mn_mn.gif
diff --git a/build/media/mod_languages/images/ms_my.gif b/build/media_source/mod_languages/images/ms_my.gif
similarity index 100%
rename from build/media/mod_languages/images/ms_my.gif
rename to build/media_source/mod_languages/images/ms_my.gif
diff --git a/build/media/mod_languages/images/nb_no.gif b/build/media_source/mod_languages/images/nb_no.gif
similarity index 100%
rename from build/media/mod_languages/images/nb_no.gif
rename to build/media_source/mod_languages/images/nb_no.gif
diff --git a/build/media/mod_languages/images/nl.gif b/build/media_source/mod_languages/images/nl.gif
similarity index 100%
rename from build/media/mod_languages/images/nl.gif
rename to build/media_source/mod_languages/images/nl.gif
diff --git a/build/media/mod_languages/images/nl_be.gif b/build/media_source/mod_languages/images/nl_be.gif
similarity index 100%
rename from build/media/mod_languages/images/nl_be.gif
rename to build/media_source/mod_languages/images/nl_be.gif
diff --git a/build/media/mod_languages/images/nl_nl.gif b/build/media_source/mod_languages/images/nl_nl.gif
similarity index 100%
rename from build/media/mod_languages/images/nl_nl.gif
rename to build/media_source/mod_languages/images/nl_nl.gif
diff --git a/build/media/mod_languages/images/nn_no.gif b/build/media_source/mod_languages/images/nn_no.gif
similarity index 100%
rename from build/media/mod_languages/images/nn_no.gif
rename to build/media_source/mod_languages/images/nn_no.gif
diff --git a/build/media/mod_languages/images/no.gif b/build/media_source/mod_languages/images/no.gif
similarity index 100%
rename from build/media/mod_languages/images/no.gif
rename to build/media_source/mod_languages/images/no.gif
diff --git a/build/media/mod_languages/images/pl.gif b/build/media_source/mod_languages/images/pl.gif
similarity index 100%
rename from build/media/mod_languages/images/pl.gif
rename to build/media_source/mod_languages/images/pl.gif
diff --git a/build/media/mod_languages/images/pl_pl.gif b/build/media_source/mod_languages/images/pl_pl.gif
similarity index 100%
rename from build/media/mod_languages/images/pl_pl.gif
rename to build/media_source/mod_languages/images/pl_pl.gif
diff --git a/build/media/mod_languages/images/prs_af.gif b/build/media_source/mod_languages/images/prs_af.gif
similarity index 100%
rename from build/media/mod_languages/images/prs_af.gif
rename to build/media_source/mod_languages/images/prs_af.gif
diff --git a/build/media/mod_languages/images/ps.gif b/build/media_source/mod_languages/images/ps.gif
similarity index 100%
rename from build/media/mod_languages/images/ps.gif
rename to build/media_source/mod_languages/images/ps.gif
diff --git a/build/media/mod_languages/images/ps_af.gif b/build/media_source/mod_languages/images/ps_af.gif
similarity index 100%
rename from build/media/mod_languages/images/ps_af.gif
rename to build/media_source/mod_languages/images/ps_af.gif
diff --git a/build/media/mod_languages/images/pt.gif b/build/media_source/mod_languages/images/pt.gif
similarity index 100%
rename from build/media/mod_languages/images/pt.gif
rename to build/media_source/mod_languages/images/pt.gif
diff --git a/build/media/mod_languages/images/pt_br.gif b/build/media_source/mod_languages/images/pt_br.gif
similarity index 100%
rename from build/media/mod_languages/images/pt_br.gif
rename to build/media_source/mod_languages/images/pt_br.gif
diff --git a/build/media/mod_languages/images/pt_pt.gif b/build/media_source/mod_languages/images/pt_pt.gif
similarity index 100%
rename from build/media/mod_languages/images/pt_pt.gif
rename to build/media_source/mod_languages/images/pt_pt.gif
diff --git a/build/media/mod_languages/images/ro.gif b/build/media_source/mod_languages/images/ro.gif
similarity index 100%
rename from build/media/mod_languages/images/ro.gif
rename to build/media_source/mod_languages/images/ro.gif
diff --git a/build/media/mod_languages/images/ro_ro.gif b/build/media_source/mod_languages/images/ro_ro.gif
similarity index 100%
rename from build/media/mod_languages/images/ro_ro.gif
rename to build/media_source/mod_languages/images/ro_ro.gif
diff --git a/build/media/mod_languages/images/ru.gif b/build/media_source/mod_languages/images/ru.gif
similarity index 100%
rename from build/media/mod_languages/images/ru.gif
rename to build/media_source/mod_languages/images/ru.gif
diff --git a/build/media/mod_languages/images/ru_ru.gif b/build/media_source/mod_languages/images/ru_ru.gif
similarity index 100%
rename from build/media/mod_languages/images/ru_ru.gif
rename to build/media_source/mod_languages/images/ru_ru.gif
diff --git a/build/media/mod_languages/images/si.gif b/build/media_source/mod_languages/images/si.gif
similarity index 100%
rename from build/media/mod_languages/images/si.gif
rename to build/media_source/mod_languages/images/si.gif
diff --git a/build/media/mod_languages/images/si_lk.gif b/build/media_source/mod_languages/images/si_lk.gif
similarity index 100%
rename from build/media/mod_languages/images/si_lk.gif
rename to build/media_source/mod_languages/images/si_lk.gif
diff --git a/build/media/mod_languages/images/sk.gif b/build/media_source/mod_languages/images/sk.gif
similarity index 100%
rename from build/media/mod_languages/images/sk.gif
rename to build/media_source/mod_languages/images/sk.gif
diff --git a/build/media/mod_languages/images/sk_sk.gif b/build/media_source/mod_languages/images/sk_sk.gif
similarity index 100%
rename from build/media/mod_languages/images/sk_sk.gif
rename to build/media_source/mod_languages/images/sk_sk.gif
diff --git a/build/media/mod_languages/images/sl.gif b/build/media_source/mod_languages/images/sl.gif
similarity index 100%
rename from build/media/mod_languages/images/sl.gif
rename to build/media_source/mod_languages/images/sl.gif
diff --git a/build/media/mod_languages/images/sl_si.gif b/build/media_source/mod_languages/images/sl_si.gif
similarity index 100%
rename from build/media/mod_languages/images/sl_si.gif
rename to build/media_source/mod_languages/images/sl_si.gif
diff --git a/build/media/mod_languages/images/sq_al.gif b/build/media_source/mod_languages/images/sq_al.gif
similarity index 100%
rename from build/media/mod_languages/images/sq_al.gif
rename to build/media_source/mod_languages/images/sq_al.gif
diff --git a/build/media/mod_languages/images/sr.gif b/build/media_source/mod_languages/images/sr.gif
similarity index 100%
rename from build/media/mod_languages/images/sr.gif
rename to build/media_source/mod_languages/images/sr.gif
diff --git a/build/media/mod_languages/images/sr_rs.gif b/build/media_source/mod_languages/images/sr_rs.gif
similarity index 100%
rename from build/media/mod_languages/images/sr_rs.gif
rename to build/media_source/mod_languages/images/sr_rs.gif
diff --git a/build/media/mod_languages/images/sr_yu.gif b/build/media_source/mod_languages/images/sr_yu.gif
similarity index 100%
rename from build/media/mod_languages/images/sr_yu.gif
rename to build/media_source/mod_languages/images/sr_yu.gif
diff --git a/build/media/mod_languages/images/srp_me.gif b/build/media_source/mod_languages/images/srp_me.gif
similarity index 100%
rename from build/media/mod_languages/images/srp_me.gif
rename to build/media_source/mod_languages/images/srp_me.gif
diff --git a/build/media/mod_languages/images/sv.gif b/build/media_source/mod_languages/images/sv.gif
similarity index 100%
rename from build/media/mod_languages/images/sv.gif
rename to build/media_source/mod_languages/images/sv.gif
diff --git a/build/media/mod_languages/images/sv_se.gif b/build/media_source/mod_languages/images/sv_se.gif
similarity index 100%
rename from build/media/mod_languages/images/sv_se.gif
rename to build/media_source/mod_languages/images/sv_se.gif
diff --git a/build/media/mod_languages/images/sw.gif b/build/media_source/mod_languages/images/sw.gif
similarity index 100%
rename from build/media/mod_languages/images/sw.gif
rename to build/media_source/mod_languages/images/sw.gif
diff --git a/build/media/mod_languages/images/sw_ke.gif b/build/media_source/mod_languages/images/sw_ke.gif
similarity index 100%
rename from build/media/mod_languages/images/sw_ke.gif
rename to build/media_source/mod_languages/images/sw_ke.gif
diff --git a/build/media/mod_languages/images/sy.gif b/build/media_source/mod_languages/images/sy.gif
similarity index 100%
rename from build/media/mod_languages/images/sy.gif
rename to build/media_source/mod_languages/images/sy.gif
diff --git a/build/media/mod_languages/images/sy_iq.gif b/build/media_source/mod_languages/images/sy_iq.gif
similarity index 100%
rename from build/media/mod_languages/images/sy_iq.gif
rename to build/media_source/mod_languages/images/sy_iq.gif
diff --git a/build/media/mod_languages/images/ta.gif b/build/media_source/mod_languages/images/ta.gif
similarity index 100%
rename from build/media/mod_languages/images/ta.gif
rename to build/media_source/mod_languages/images/ta.gif
diff --git a/build/media/mod_languages/images/ta_in.gif b/build/media_source/mod_languages/images/ta_in.gif
similarity index 100%
rename from build/media/mod_languages/images/ta_in.gif
rename to build/media_source/mod_languages/images/ta_in.gif
diff --git a/build/media/mod_languages/images/th.gif b/build/media_source/mod_languages/images/th.gif
similarity index 100%
rename from build/media/mod_languages/images/th.gif
rename to build/media_source/mod_languages/images/th.gif
diff --git a/build/media/mod_languages/images/th_th.gif b/build/media_source/mod_languages/images/th_th.gif
similarity index 100%
rename from build/media/mod_languages/images/th_th.gif
rename to build/media_source/mod_languages/images/th_th.gif
diff --git a/build/media/mod_languages/images/tk_tm.gif b/build/media_source/mod_languages/images/tk_tm.gif
similarity index 100%
rename from build/media/mod_languages/images/tk_tm.gif
rename to build/media_source/mod_languages/images/tk_tm.gif
diff --git a/build/media/mod_languages/images/tr.gif b/build/media_source/mod_languages/images/tr.gif
similarity index 100%
rename from build/media/mod_languages/images/tr.gif
rename to build/media_source/mod_languages/images/tr.gif
diff --git a/build/media/mod_languages/images/tr_tr.gif b/build/media_source/mod_languages/images/tr_tr.gif
similarity index 100%
rename from build/media/mod_languages/images/tr_tr.gif
rename to build/media_source/mod_languages/images/tr_tr.gif
diff --git a/build/media/mod_languages/images/tw.gif b/build/media_source/mod_languages/images/tw.gif
similarity index 100%
rename from build/media/mod_languages/images/tw.gif
rename to build/media_source/mod_languages/images/tw.gif
diff --git a/build/media/mod_languages/images/ug_cn.gif b/build/media_source/mod_languages/images/ug_cn.gif
similarity index 100%
rename from build/media/mod_languages/images/ug_cn.gif
rename to build/media_source/mod_languages/images/ug_cn.gif
diff --git a/build/media/mod_languages/images/uk.gif b/build/media_source/mod_languages/images/uk.gif
similarity index 100%
rename from build/media/mod_languages/images/uk.gif
rename to build/media_source/mod_languages/images/uk.gif
diff --git a/build/media/mod_languages/images/uk_ua.gif b/build/media_source/mod_languages/images/uk_ua.gif
similarity index 100%
rename from build/media/mod_languages/images/uk_ua.gif
rename to build/media_source/mod_languages/images/uk_ua.gif
diff --git a/build/media/mod_languages/images/ur.gif b/build/media_source/mod_languages/images/ur.gif
similarity index 100%
rename from build/media/mod_languages/images/ur.gif
rename to build/media_source/mod_languages/images/ur.gif
diff --git a/build/media/mod_languages/images/ur_pk.gif b/build/media_source/mod_languages/images/ur_pk.gif
similarity index 100%
rename from build/media/mod_languages/images/ur_pk.gif
rename to build/media_source/mod_languages/images/ur_pk.gif
diff --git a/build/media/mod_languages/images/us.gif b/build/media_source/mod_languages/images/us.gif
similarity index 100%
rename from build/media/mod_languages/images/us.gif
rename to build/media_source/mod_languages/images/us.gif
diff --git a/build/media/mod_languages/images/uz.gif b/build/media_source/mod_languages/images/uz.gif
similarity index 100%
rename from build/media/mod_languages/images/uz.gif
rename to build/media_source/mod_languages/images/uz.gif
diff --git a/build/media/mod_languages/images/uz_uz.gif b/build/media_source/mod_languages/images/uz_uz.gif
similarity index 100%
rename from build/media/mod_languages/images/uz_uz.gif
rename to build/media_source/mod_languages/images/uz_uz.gif
diff --git a/build/media/mod_languages/images/vi.gif b/build/media_source/mod_languages/images/vi.gif
similarity index 100%
rename from build/media/mod_languages/images/vi.gif
rename to build/media_source/mod_languages/images/vi.gif
diff --git a/build/media/mod_languages/images/vi_vn.gif b/build/media_source/mod_languages/images/vi_vn.gif
similarity index 100%
rename from build/media/mod_languages/images/vi_vn.gif
rename to build/media_source/mod_languages/images/vi_vn.gif
diff --git a/build/media/mod_languages/images/zh.gif b/build/media_source/mod_languages/images/zh.gif
similarity index 100%
rename from build/media/mod_languages/images/zh.gif
rename to build/media_source/mod_languages/images/zh.gif
diff --git a/build/media/mod_languages/images/zh_cn.gif b/build/media_source/mod_languages/images/zh_cn.gif
similarity index 100%
rename from build/media/mod_languages/images/zh_cn.gif
rename to build/media_source/mod_languages/images/zh_cn.gif
diff --git a/build/media/mod_languages/images/zh_tw.gif b/build/media_source/mod_languages/images/zh_tw.gif
similarity index 100%
rename from build/media/mod_languages/images/zh_tw.gif
rename to build/media_source/mod_languages/images/zh_tw.gif
diff --git a/build/media_src/mod_login/js/admin-login.es6.js b/build/media_source/mod_login/js/admin-login.es6.js
similarity index 91%
rename from build/media_src/mod_login/js/admin-login.es6.js
rename to build/media_source/mod_login/js/admin-login.es6.js
index 28444bf1861a1..5cd4114c508dd 100644
--- a/build/media_src/mod_login/js/admin-login.es6.js
+++ b/build/media_source/mod_login/js/admin-login.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/mod_menu/js/admin-menu.es6.js b/build/media_source/mod_menu/js/admin-menu.es6.js
similarity index 99%
rename from build/media_src/mod_menu/js/admin-menu.es6.js
rename to build/media_source/mod_menu/js/admin-menu.es6.js
index f81941c0ad120..cfddc5cb9eb30 100644
--- a/build/media_src/mod_menu/js/admin-menu.es6.js
+++ b/build/media_source/mod_menu/js/admin-menu.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((Joomla, document) => {
diff --git a/build/media_source/mod_menu/js/menu.es6.js b/build/media_source/mod_menu/js/menu.es6.js
new file mode 100644
index 0000000000000..5ed4492a534c3
--- /dev/null
+++ b/build/media_source/mod_menu/js/menu.es6.js
@@ -0,0 +1,151 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+(() => {
+  'use strict';
+
+  function topLevelMouseOver(el, settings) {
+    const ulChild = el.querySelector('ul');
+    if (ulChild) {
+      ulChild.setAttribute('aria-hidden', 'false');
+      ulChild.classList.add(settings.menuHoverClass);
+    }
+  }
+
+  function topLevelMouseOut(el, settings) {
+    const ulChild = el.querySelector('ul');
+    if (ulChild) {
+      ulChild.setAttribute('aria-hidden', 'true');
+      ulChild.classList.remove(settings.menuHoverClass);
+    }
+  }
+
+  function setupNavigation(nav) {
+    const settings = {
+      menuHoverClass: 'show-menu',
+      dir: 'ltr',
+    };
+    const topLevelChilds = nav.querySelectorAll(':scope > li');
+
+    // Set tabIndex to -1 so that top_level_childs can't receive focus until menu is open
+    topLevelChilds.forEach((topLevelEl) => {
+      const linkEl = topLevelEl.querySelector('a');
+      if (linkEl) {
+        linkEl.tabIndex = '0';
+        linkEl.addEventListener('mouseover', topLevelMouseOver(topLevelEl, settings));
+        linkEl.addEventListener('mouseout', topLevelMouseOut(topLevelEl, settings));
+      }
+      const spanEl = topLevelEl.querySelector('span');
+      if (spanEl) {
+        spanEl.tabIndex = '0';
+        spanEl.addEventListener('mouseover', topLevelMouseOver(topLevelEl, settings));
+        spanEl.addEventListener('mouseout', topLevelMouseOut(topLevelEl, settings));
+      }
+
+      topLevelEl.addEventListener('mouseover', (event) => {
+        const curEl = event.target;
+        const ulChild = curEl.querySelector('ul');
+        if (ulChild) {
+          ulChild.setAttribute('aria-hidden', 'false');
+          ulChild.classList.add(settings.menuHoverClass);
+        }
+      });
+
+      topLevelEl.addEventListener('mouseout', (event) => {
+        const curEl = event.target;
+        const ulChild = curEl.querySelector('ul');
+        if (ulChild) {
+          ulChild.setAttribute('aria-hidden', 'true');
+          ulChild.classList.remove(settings.menuHoverClass);
+        }
+      });
+
+      topLevelEl.addEventListener('focus', (event) => {
+        const curEl = event.target;
+        const ulChild = curEl.querySelector('ul');
+        if (ulChild) {
+          ulChild.setAttribute('aria-hidden', 'true');
+          ulChild.classList.add(settings.menuHoverClass);
+        }
+      });
+
+      topLevelEl.addEventListener('blur', (event) => {
+        const curEl = event.target;
+        const ulChild = curEl.querySelector('ul');
+        if (ulChild) {
+          ulChild.setAttribute('aria-hidden', 'false');
+          ulChild.classList.remove(settings.menuHoverClass);
+        }
+      });
+
+      topLevelEl.addEventListener('keydown', (event) => {
+        const keyName = event.key;
+        const curEl = event.target;
+        const curLiEl = curEl.parentElement;
+        const curUlEl = curLiEl.parentElement;
+        let prevLiEl = curLiEl.previousElementSibling;
+        let nextLiEl = curLiEl.nextElementSibling;
+        if (!prevLiEl) {
+          prevLiEl = curUlEl.children[curUlEl.children.length - 1];
+        }
+        if (!nextLiEl) {
+          [nextLiEl] = curUlEl.children;
+        }
+        switch (keyName) {
+          case 'ArrowLeft':
+            event.preventDefault();
+            if (settings.dir === 'rtl') {
+              nextLiEl.children[0].focus();
+            } else {
+              prevLiEl.children[0].focus();
+            }
+            break;
+          case 'ArrowRight':
+            event.preventDefault();
+            if (settings.dir === 'rtl') {
+              prevLiEl.children[0].focus();
+            } else {
+              nextLiEl.children[0].focus();
+            }
+            break;
+          case 'ArrowUp':
+          {
+            event.preventDefault();
+            const parent = curLiEl.parentElement.parentElement;
+            if (parent.nodeName === 'LI') {
+              parent.children[0].focus();
+            } else {
+              prevLiEl.children[0].focus();
+            }
+            break;
+          }
+          case 'ArrowDown':
+            event.preventDefault();
+            if (curLiEl.classList.contains('parent')) {
+              const child = curLiEl.querySelector('ul');
+              if (child != null) {
+                const childLi = child.querySelector('li');
+                childLi.children[0].focus();
+              } else {
+                nextLiEl.children[0].focus();
+              }
+            } else {
+              nextLiEl.children[0].focus();
+            }
+            break;
+          default:
+            break;
+        }
+      });
+    });
+  }
+
+  document.addEventListener('DOMContentLoaded', () => {
+    const navs = document.querySelectorAll('.nav');
+    [].forEach.call(navs, (nav) => {
+      setupNavigation(nav);
+    });
+  });
+})();
diff --git a/build/media_src/mod_multilangstatus/js/admin-multilangstatus.es6.js b/build/media_source/mod_multilangstatus/js/admin-multilangstatus.es6.js
similarity index 91%
rename from build/media_src/mod_multilangstatus/js/admin-multilangstatus.es6.js
rename to build/media_source/mod_multilangstatus/js/admin-multilangstatus.es6.js
index 501efb702485d..f10a77af2ea85 100644
--- a/build/media_src/mod_multilangstatus/js/admin-multilangstatus.es6.js
+++ b/build/media_source/mod_multilangstatus/js/admin-multilangstatus.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/mod_sampledata/js/sampledata-process.es6.js b/build/media_source/mod_sampledata/js/sampledata-process.es6.js
similarity index 98%
rename from build/media_src/mod_sampledata/js/sampledata-process.es6.js
rename to build/media_source/mod_sampledata/js/sampledata-process.es6.js
index 9168b3c23fba9..fab45aa31ec50 100644
--- a/build/media_src/mod_sampledata/js/sampledata-process.es6.js
+++ b/build/media_source/mod_sampledata/js/sampledata-process.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((window, document, Joomla) => {
diff --git a/build/media_source/plg_captcha_recaptcha/js/recaptcha.es6.js b/build/media_source/plg_captcha_recaptcha/js/recaptcha.es6.js
new file mode 100644
index 0000000000000..f3e3041519d08
--- /dev/null
+++ b/build/media_source/plg_captcha_recaptcha/js/recaptcha.es6.js
@@ -0,0 +1,35 @@
+/**
+ * @package     Joomla.JavaScript
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+window.JoomlaInitReCaptcha2 = () => {
+  'use strict';
+
+  const itemNodes = document.getElementsByClassName('g-recaptcha');
+  const optionKeys = ['sitekey', 'theme', 'size', 'tabindex', 'callback', 'expired-callback', 'error-callback'];
+  const items = [].slice.call(itemNodes);
+
+  items.forEach((item) => {
+    let options = {};
+
+    if (item.dataset) {
+      options = item.dataset;
+    } else {
+      [].slice.call(optionKeys).forEach((optionData) => {
+        const optionKeyFq = `data-${optionData}`;
+        if (item.hasAttribute(optionKeyFq)) {
+          options[optionData] = item.getAttribute(optionKeyFq);
+        }
+      });
+    }
+
+    // Set the widget id of the recaptcha item
+    item.setAttribute(
+      'data-recaptcha-widget-id',
+      /* global grecaptcha */
+      grecaptcha.render(item, options),
+    );
+  });
+};
diff --git a/build/media_source/plg_captcha_recaptcha_invisible/js/recaptcha.js b/build/media_source/plg_captcha_recaptcha_invisible/js/recaptcha.js
new file mode 100644
index 0000000000000..199e2ec1a9c5d
--- /dev/null
+++ b/build/media_source/plg_captcha_recaptcha_invisible/js/recaptcha.js
@@ -0,0 +1,37 @@
+/**
+ * @package		Joomla.JavaScript
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+window.JoomlaInitReCaptchaInvisible = function() {
+	'use strict';
+
+	var items = document.getElementsByClassName('g-recaptcha'),
+	    item,
+	    option_keys = ['sitekey', 'badge', 'size', 'tabindex', 'callback', 'expired-callback', 'error-callback'],
+	    options = {},
+	    option_key_fq
+	;
+
+	for (var i = 0, l = items.length; i < l; i++) {
+		item = items[i];
+		if (item.dataset) {
+			options = item.dataset;
+		} else {
+			for (var j = 0; j < option_keys.length; j++) {
+				option_key_fq = ('data-' + option_keys[j]);
+				if (item.hasAttribute(option_key_fq)) {
+					options[option_keys[j]] = item.getAttribute(option_key_fq);
+				}
+			}
+		}
+
+		// Set the widget id of the recaptcha item
+		item.setAttribute(
+			'data-recaptcha-widget-id',
+			grecaptcha.render(item, options)
+		);
+		// Execute the invisible reCAPTCHA
+		grecaptcha.execute(item.getAttribute('data-recaptcha-widget-id'));
+	}
+};
diff --git a/build/media_source/plg_captcha_recaptcha_invisible/js/recaptcha.min.js b/build/media_source/plg_captcha_recaptcha_invisible/js/recaptcha.min.js
new file mode 100644
index 0000000000000..04a75ce6a8e6a
--- /dev/null
+++ b/build/media_source/plg_captcha_recaptcha_invisible/js/recaptcha.min.js
@@ -0,0 +1 @@
+window.JoomlaInitReCaptchaInvisible=function(){"use strict";for(var t,e,a=document.getElementsByClassName("g-recaptcha"),i=["sitekey","badge","type","size","tabindex","callback"],c={},r=0,d=a.length;r<d;r++){if((t=a[r]).dataset)c=t.dataset;else for(var s=0;s<i.length;s++)e="data-"+i[s],t.hasAttribute(e)&&(c[i[s]]=t.getAttribute(e));t.setAttribute("data-recaptcha-widget-id",grecaptcha.render(t,c)),grecaptcha.execute(t.getAttribute("data-recaptcha-widget-id"))}};
diff --git a/build/media/plg_editors_codemirror/css/codemirror.css b/build/media_source/plg_editors_codemirror/css/codemirror.css
similarity index 93%
rename from build/media/plg_editors_codemirror/css/codemirror.css
rename to build/media_source/plg_editors_codemirror/css/codemirror.css
index 9b2613d030930..c3c7fd1f969a3 100644
--- a/build/media/plg_editors_codemirror/css/codemirror.css
+++ b/build/media_source/plg_editors_codemirror/css/codemirror.css
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/webcomponents/js/editor-codemirror/editor-codemirror.js b/build/media_source/plg_editors_codemirror/js/joomla-editor-codemirror.w-c.es6.js
similarity index 94%
rename from build/media/webcomponents/js/editor-codemirror/editor-codemirror.js
rename to build/media_source/plg_editors_codemirror/js/joomla-editor-codemirror.w-c.es6.js
index c17538546c00b..c008e76027c30 100644
--- a/build/media/webcomponents/js/editor-codemirror/editor-codemirror.js
+++ b/build/media_source/plg_editors_codemirror/js/joomla-editor-codemirror.w-c.es6.js
@@ -27,6 +27,7 @@ customElements.define('joomla-editor-codemirror', class extends HTMLElement {
   }
 
   get options() { return JSON.parse(this.getAttribute('options')); }
+
   set options(value) { this.setAttribute('options', value); }
 
   attributeChangedCallback(attr, oldValue, newValue) {
@@ -64,14 +65,14 @@ customElements.define('joomla-editor-codemirror', class extends HTMLElement {
             // Fire this function any time an editor is created.
             window.CodeMirror.defineInitHook((editor) => {
               // Try to set up the mode
-              const mode = window.CodeMirror.findModeByName(editor.options.mode || '') ||
-              window.CodeMirror.findModeByName(editor.options.mode || '') ||
-              window.CodeMirror.findModeByExtension(editor.options.mode || '');
+              const mode = window.CodeMirror.findModeByName(editor.options.mode || '')
+              || window.CodeMirror.findModeByName(editor.options.mode || '')
+              || window.CodeMirror.findModeByExtension(editor.options.mode || '');
 
               window.CodeMirror.autoLoadMode(editor, mode ? mode.mode : editor.options.mode);
 
-              if (mode) {
-                editor.setOption('mode', mode.mode);
+              if (mode && mode.mime) {
+                editor.setOption('mode', mode.mime);
               }
 
               const map = {
diff --git a/build/media/webcomponents/js/editor-none/editor-none.js b/build/media_source/plg_editors_none/js/joomla-editor-none.w-c.es6.js
similarity index 91%
rename from build/media/webcomponents/js/editor-none/editor-none.js
rename to build/media_source/plg_editors_none/js/joomla-editor-none.w-c.es6.js
index 307a60106c1c6..0371e21d41096 100644
--- a/build/media/webcomponents/js/editor-none/editor-none.js
+++ b/build/media_source/plg_editors_none/js/joomla-editor-none.w-c.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 window.customElements.define('joomla-editor-none', class extends HTMLElement {
@@ -45,12 +45,11 @@ window.customElements.define('joomla-editor-none', class extends HTMLElement {
       // IE support
       this.editor.focus();
       return document.selection.createRange();
-    } else if (this.editor.selectionStart || this.editor.selectionStart === 0) {
+    } if (this.editor.selectionStart || this.editor.selectionStart === 0) {
       // MOZILLA/NETSCAPE support
       return this.editor.value.substring(this.editor.selectionStart, this.editor.selectionEnd);
-    } else {
-      return this.editor.value;
     }
+    return this.editor.value;
   }
 
   /**
@@ -71,9 +70,9 @@ window.customElements.define('joomla-editor-none', class extends HTMLElement {
       // eslint-disable-next-line no-return-assign
       setValue: text => this.editor.value = text,
       // eslint-disable-next-line no-return-assign
-      getSelection: () => { return this.getSelection(); },
+      getSelection: () => this.getSelection(),
       // eslint-disable-next-line no-return-assign
-      replaceSelection: text => {
+      replaceSelection: (text) => {
         if (this.editor.selectionStart || this.editor.selectionStart === 0) {
           this.editor.value = this.editor.value.substring(0, this.editor.selectionStart)
             + text
diff --git a/build/media/plg_editors_tinymce/css/tinymce-builder.css b/build/media_source/plg_editors_tinymce/css/tinymce-builder.css
similarity index 90%
rename from build/media/plg_editors_tinymce/css/tinymce-builder.css
rename to build/media_source/plg_editors_tinymce/css/tinymce-builder.css
index ff9cf923f8e00..a9ad10dabdf8c 100644
--- a/build/media/plg_editors_tinymce/css/tinymce-builder.css
+++ b/build/media_source/plg_editors_tinymce/css/tinymce-builder.css
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/plg_editors_tinymce/js/plugins/dragdrop/plugin.es6.js b/build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es6.js
similarity index 100%
rename from build/media_src/plg_editors_tinymce/js/plugins/dragdrop/plugin.es6.js
rename to build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es6.js
diff --git a/build/media/plg_editors_tinymce/js/tinymce-builder.js b/build/media_source/plg_editors_tinymce/js/tinymce-builder.es5.js
similarity index 99%
rename from build/media/plg_editors_tinymce/js/tinymce-builder.js
rename to build/media_source/plg_editors_tinymce/js/tinymce-builder.es5.js
index 65e74891caac0..6a1fd023ed33d 100644
--- a/build/media/plg_editors_tinymce/js/tinymce-builder.js
+++ b/build/media_source/plg_editors_tinymce/js/tinymce-builder.es5.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/plg_editors_tinymce/js/tinymce.es6.js b/build/media_source/plg_editors_tinymce/js/tinymce.es6.js
similarity index 98%
rename from build/media_src/plg_editors_tinymce/js/tinymce.es6.js
rename to build/media_source/plg_editors_tinymce/js/tinymce.es6.js
index 8ef31510c9d9f..428159fceed17 100644
--- a/build/media_src/plg_editors_tinymce/js/tinymce.es6.js
+++ b/build/media_source/plg_editors_tinymce/js/tinymce.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/plg_installer_webinstaller/js/client.es6.js b/build/media_source/plg_installer_webinstaller/js/client.es6.js
similarity index 99%
rename from build/media_src/plg_installer_webinstaller/js/client.es6.js
rename to build/media_source/plg_installer_webinstaller/js/client.es6.js
index b9c7b10cb27de..cd501903eb4ea 100644
--- a/build/media_src/plg_installer_webinstaller/js/client.es6.js
+++ b/build/media_source/plg_installer_webinstaller/js/client.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/plg_installer_webinstaller/scss/client.scss b/build/media_source/plg_installer_webinstaller/scss/client.scss
similarity index 100%
rename from build/media_src/plg_installer_webinstaller/scss/client.scss
rename to build/media_source/plg_installer_webinstaller/scss/client.scss
diff --git a/build/media_src/plg_media-action_crop/js/crop.es6.js b/build/media_source/plg_media-action_crop/js/crop.es6.js
similarity index 98%
rename from build/media_src/plg_media-action_crop/js/crop.es6.js
rename to build/media_source/plg_media-action_crop/js/crop.es6.js
index f23bc12c506c8..07faabf502714 100644
--- a/build/media_src/plg_media-action_crop/js/crop.es6.js
+++ b/build/media_source/plg_media-action_crop/js/crop.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/plg_media-action_resize/js/resize.es6.js b/build/media_source/plg_media-action_resize/js/resize.es6.js
similarity index 98%
rename from build/media_src/plg_media-action_resize/js/resize.es6.js
rename to build/media_source/plg_media-action_resize/js/resize.es6.js
index adc9c1622f1ce..b5494306c3577 100644
--- a/build/media_src/plg_media-action_resize/js/resize.es6.js
+++ b/build/media_source/plg_media-action_resize/js/resize.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 Joomla = window.Joomla || {};
diff --git a/build/media_src/plg_media-action_rotate/js/rotate.es6.js b/build/media_source/plg_media-action_rotate/js/rotate.es6.js
similarity index 97%
rename from build/media_src/plg_media-action_rotate/js/rotate.es6.js
rename to build/media_source/plg_media-action_rotate/js/rotate.es6.js
index 1382b84eb993a..31d98650366f5 100644
--- a/build/media_src/plg_media-action_rotate/js/rotate.es6.js
+++ b/build/media_source/plg_media-action_rotate/js/rotate.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 Joomla = window.Joomla || {};
diff --git a/build/media_src/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js b/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
similarity index 97%
rename from build/media_src/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
rename to build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
index 20737b8304906..e193253dbe10b 100644
--- a/build/media_src/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
+++ b/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js b/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
similarity index 97%
rename from build/media_src/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
rename to build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
index 5016a92d52b5a..a2953cd21047b 100644
--- a/build/media_src/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
+++ b/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 /**
diff --git a/build/media_src/plg_quickicon_overridecheck/js/overridecheck.es6.js b/build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js
similarity index 97%
rename from build/media_src/plg_quickicon_overridecheck/js/overridecheck.es6.js
rename to build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js
index 64df65daea866..13748eba97f91 100644
--- a/build/media_src/plg_quickicon_overridecheck/js/overridecheck.es6.js
+++ b/build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_source/plg_quickicon_privacycheck/js/privacycheck.js b/build/media_source/plg_quickicon_privacycheck/js/privacycheck.js
new file mode 100644
index 0000000000000..221fb20036f96
--- /dev/null
+++ b/build/media_source/plg_quickicon_privacycheck/js/privacycheck.js
@@ -0,0 +1,53 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+jQuery(document).ready(function() {
+	var variables  = Joomla.getOptions('js-privacy-check'),
+	    plg_quickicon_privacycheck_ajax_url = variables.plg_quickicon_privacycheck_ajax_url,
+	    plg_quickicon_privacycheck_url = variables.plg_quickicon_privacycheck_url,
+	    plg_quickicon_privacycheck_text = variables.plg_quickicon_privacycheck_text;
+	var ajax_structure = {
+		success: function(data, textStatus, jqXHR) {
+			var link = jQuery('#plg_quickicon_privacycheck').find('span.j-links-link');
+
+			try {
+				var requestList = jQuery.parseJSON(data);
+			} catch (e) {
+				// An error occurred
+				link.html(plg_quickicon_privacycheck_text.ERROR);
+			}
+
+			if (requestList.data.number_urgent_requests == 0) {
+				// No requests
+				link.html(plg_quickicon_privacycheck_text.NOREQUEST);
+			} else {
+				// Requests
+				var msgString = '<span class="label label-important">'
+					+ requestList.data.number_urgent_requests + '</span>&nbsp;'
+					+ plg_quickicon_privacycheck_text.REQUESTFOUND_MESSAGE;
+
+				jQuery('#system-message-container').prepend(
+					'<div class="alert alert-error alert-joomlaupdate">'
+					+ msgString
+					+ ' <button class="btn btn-primary" onclick="document.location=\'' + plg_quickicon_privacycheck_url + '\'">'
+					+ plg_quickicon_privacycheck_text.REQUESTFOUND_BUTTON + '</button>'
+					+ '</div>'
+				);
+
+				var msgString = plg_quickicon_privacycheck_text.REQUESTFOUND
+					+ '&nbsp;<span class="label label-important">'
+					+ requestList.data.number_urgent_requests + '</span>'
+
+				link.html(msgString);
+			}
+		},
+		error: function(jqXHR, textStatus, errorThrown) {
+			// An error occurred
+			jQuery('#plg_quickicon_privacycheck').find('span.j-links-link').html(plg_quickicon_privacycheck_text.ERROR);
+		},
+		url: plg_quickicon_privacycheck_ajax_url
+	};
+	ajax_object = new jQuery.ajax(ajax_structure);
+});
diff --git a/build/media/plg_system_debug/css/debug.css b/build/media_source/plg_system_debug/css/debug.css
similarity index 96%
rename from build/media/plg_system_debug/css/debug.css
rename to build/media_source/plg_system_debug/css/debug.css
index 9d1848062a2bd..5c1f42f226ad6 100644
--- a/build/media/plg_system_debug/css/debug.css
+++ b/build/media_source/plg_system_debug/css/debug.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/plg_system_debug/js/debug.es6.js b/build/media_source/plg_system_debug/js/debug.es6.js
similarity index 94%
rename from build/media_src/plg_system_debug/js/debug.es6.js
rename to build/media_source/plg_system_debug/js/debug.es6.js
index 92b8d19ab0c9b..9dd58af902c50 100644
--- a/build/media_src/plg_system_debug/js/debug.es6.js
+++ b/build/media_source/plg_system_debug/js/debug.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/plg_system_debug/widgets/info/widget.css b/build/media_source/plg_system_debug/widgets/info/widget.css
similarity index 100%
rename from build/media/plg_system_debug/widgets/info/widget.css
rename to build/media_source/plg_system_debug/widgets/info/widget.css
diff --git a/build/media/plg_system_debug/widgets/info/widget.js b/build/media_source/plg_system_debug/widgets/info/widget.es5.js
similarity index 100%
rename from build/media/plg_system_debug/widgets/info/widget.js
rename to build/media_source/plg_system_debug/widgets/info/widget.es5.js
diff --git a/build/media/plg_system_debug/widgets/languageErrors/widget.css b/build/media_source/plg_system_debug/widgets/languageErrors/widget.css
similarity index 100%
rename from build/media/plg_system_debug/widgets/languageErrors/widget.css
rename to build/media_source/plg_system_debug/widgets/languageErrors/widget.css
diff --git a/build/media/plg_system_debug/widgets/languageErrors/widget.js b/build/media_source/plg_system_debug/widgets/languageErrors/widget.es5.js
similarity index 100%
rename from build/media/plg_system_debug/widgets/languageErrors/widget.js
rename to build/media_source/plg_system_debug/widgets/languageErrors/widget.es5.js
diff --git a/build/media/plg_system_debug/widgets/languageFiles/widget.css b/build/media_source/plg_system_debug/widgets/languageFiles/widget.css
similarity index 100%
rename from build/media/plg_system_debug/widgets/languageFiles/widget.css
rename to build/media_source/plg_system_debug/widgets/languageFiles/widget.css
diff --git a/build/media/plg_system_debug/widgets/languageFiles/widget.js b/build/media_source/plg_system_debug/widgets/languageFiles/widget.es5.js
similarity index 100%
rename from build/media/plg_system_debug/widgets/languageFiles/widget.js
rename to build/media_source/plg_system_debug/widgets/languageFiles/widget.es5.js
diff --git a/build/media/plg_system_debug/widgets/languageStrings/widget.css b/build/media_source/plg_system_debug/widgets/languageStrings/widget.css
similarity index 100%
rename from build/media/plg_system_debug/widgets/languageStrings/widget.css
rename to build/media_source/plg_system_debug/widgets/languageStrings/widget.css
diff --git a/build/media/plg_system_debug/widgets/languageStrings/widget.js b/build/media_source/plg_system_debug/widgets/languageStrings/widget.es5.js
similarity index 100%
rename from build/media/plg_system_debug/widgets/languageStrings/widget.js
rename to build/media_source/plg_system_debug/widgets/languageStrings/widget.es5.js
diff --git a/build/media/plg_system_debug/widgets/sqlqueries/widget.css b/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css
similarity index 100%
rename from build/media/plg_system_debug/widgets/sqlqueries/widget.css
rename to build/media_source/plg_system_debug/widgets/sqlqueries/widget.css
diff --git a/build/media/plg_system_debug/widgets/sqlqueries/widget.js b/build/media_source/plg_system_debug/widgets/sqlqueries/widget.es5.js
similarity index 100%
rename from build/media/plg_system_debug/widgets/sqlqueries/widget.js
rename to build/media_source/plg_system_debug/widgets/sqlqueries/widget.es5.js
diff --git a/build/media/plg_system_highlight/highlight.css b/build/media_source/plg_system_highlight/highlight.css
similarity index 100%
rename from build/media/plg_system_highlight/highlight.css
rename to build/media_source/plg_system_highlight/highlight.css
diff --git a/build/media_src/plg_system_stats/js/stats-message.es6.js b/build/media_source/plg_system_stats/js/stats-message.es6.js
similarity index 97%
rename from build/media_src/plg_system_stats/js/stats-message.es6.js
rename to build/media_source/plg_system_stats/js/stats-message.es6.js
index f5c284ffc9c83..ce636de801c7b 100644
--- a/build/media_src/plg_system_stats/js/stats-message.es6.js
+++ b/build/media_source/plg_system_stats/js/stats-message.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  * @since      3.5.0
  */
diff --git a/build/media_src/plg_system_stats/js/stats.es6.js b/build/media_source/plg_system_stats/js/stats.es6.js
similarity index 95%
rename from build/media_src/plg_system_stats/js/stats.es6.js
rename to build/media_source/plg_system_stats/js/stats.es6.js
index 45600be05fafd..6f74c7d080c02 100644
--- a/build/media_src/plg_system_stats/js/stats.es6.js
+++ b/build/media_source/plg_system_stats/js/stats.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  * @since      3.5.0
  */
diff --git a/build/media/system/css/adminlist.css b/build/media_source/system/css/adminlist.css
similarity index 98%
rename from build/media/system/css/adminlist.css
rename to build/media_source/system/css/adminlist.css
index 8b7f35310dd3b..757856c535af7 100644
--- a/build/media/system/css/adminlist.css
+++ b/build/media_source/system/css/adminlist.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/system/css/calendar-jos.css b/build/media_source/system/css/calendar-jos.css
similarity index 98%
rename from build/media/system/css/calendar-jos.css
rename to build/media_source/system/css/calendar-jos.css
index d85ca99039056..da390a89871c8 100644
--- a/build/media/system/css/calendar-jos.css
+++ b/build/media_source/system/css/calendar-jos.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/system/css/debug.css b/build/media_source/system/css/debug.css
similarity index 98%
rename from build/media/system/css/debug.css
rename to build/media_source/system/css/debug.css
index 6a275b34912a6..07cad85eff657 100644
--- a/build/media/system/css/debug.css
+++ b/build/media_source/system/css/debug.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/system/css/fields/calendar-rtl.css b/build/media_source/system/css/fields/calendar-rtl.css
similarity index 79%
rename from build/media/system/css/fields/calendar-rtl.css
rename to build/media_source/system/css/fields/calendar-rtl.css
index 4635b51246088..106c3d1b4214a 100644
--- a/build/media/system/css/fields/calendar-rtl.css
+++ b/build/media_source/system/css/fields/calendar-rtl.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
  .js-calendar {
@@ -32,6 +32,10 @@ div.calendar-container table body td {
 	line-height: 2em;
 }
 
+.calendar-container table {
+	border-collapse: separate;
+}
+
 div.calendar-container table td.title { /* This holds the current "month, year" */
 	vertical-align: middle;
 	text-align: center;
@@ -150,7 +154,7 @@ a.js-btn.btn.btn-exit, a.js-btn.btn.btn-today, a.js-btn.btn.btn-clear {
 	padding: 8px 8px 8px 0;
 }
 .time .time-title {
-	background-image: url("data:image/png;base64, iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAdlJREFUeNqklUsohFEUx7/5kgWGjEcRJULJSmJhITQLr8UoFko2k2SDLGZD2SglJcXOxo6Fx0ayUt4jWXgNG2rIwsgMJZPn/+o/dRvfa8yp33zfPfecM+e795x7bYqxtIAaUA2KgA3cgn3gBcsgrMQg3eAAfJtwBYa0Atg0dAugg+/3YAUcgkvqCkAVcIIy6raBCwT0/mRdymYG5Bt8VQoYBe+0Pwdpik6mwuAVNMawbJXgmr7e6FVokzKt1XBOZnYuneB54Jn+w/LEMZXTOo65nN80yNxNmyBIF4o6Ku6AXccpmzbzJstyQbs+FT/1VC6CFyU+mePTqbIBhBwp8csGn8UqO0qIz8AhstNBk8BP4As4RGCVyk8LgUVVlFvIXFXZ+4qUuZY8gn6W1QmYBKkadklM9PfLJriTYxYyEYFXpZp3s8Yj0kv9mhi0cuCTlsVMuqRWbpL0Xuo8YpAotaQnhgoQSzEAMjhuZoywfMb0UCmyKP1HmSXzJBQxpqIn9zhxA0piCJoFdqXu/bOpmeCMBiF+ZoJJ0E7gp0/AKCF71M1xCkZ4NRWSCjAIdiQ7v9UlHAcPUdfQh1QJEd7ArOg0K1dTRHJAO2hg8zhoH2IVbYElvaPgR4ABAFM/gtHnpJfxAAAAAElFTkSuQmCC");
+	background-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='utf-8'%3F%3E%3Csvg width='22' height='22' viewBox='0 0 1792 1792' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M1024 544v448q0 14-9 23t-23 9h-320q-14 0-23-9t-9-23v-64q0-14 9-23t23-9h224v-352q0-14 9-23t23-9h64q14 0 23 9t9 23zm416 352q0-148-73-273t-198-198-273-73-273 73-198 198-73 273 73 273 198 198 273 73 273-73 198-198 73-273zm224 0q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z'/%3E%3C/svg%3E");
 	background-repeat: no-repeat;
 	background-position: center;
 }
diff --git a/build/media/system/css/fields/calendar.css b/build/media_source/system/css/fields/calendar.css
similarity index 79%
rename from build/media/system/css/fields/calendar.css
rename to build/media_source/system/css/fields/calendar.css
index 782c930aa1673..0abcf830abab4 100644
--- a/build/media/system/css/fields/calendar.css
+++ b/build/media_source/system/css/fields/calendar.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
  .js-calendar {
@@ -32,6 +32,10 @@ div.calendar-container table body td {
 	line-height: 2em;
 }
 
+.calendar-container table {
+	border-collapse: separate;
+}
+
 div.calendar-container table td.title { /* This holds the current "month, year" */
 	vertical-align: middle;
 	text-align: center;
@@ -149,7 +153,7 @@ a.js-btn.btn.btn-exit, a.js-btn.btn.btn-today, a.js-btn.btn.btn-clear {
 	padding: 8px 0 8px 8px;
 }
 .time .time-title {
-	background-image: url("data:image/png;base64, iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAdlJREFUeNqklUsohFEUx7/5kgWGjEcRJULJSmJhITQLr8UoFko2k2SDLGZD2SglJcXOxo6Fx0ayUt4jWXgNG2rIwsgMJZPn/+o/dRvfa8yp33zfPfecM+e795x7bYqxtIAaUA2KgA3cgn3gBcsgrMQg3eAAfJtwBYa0Atg0dAugg+/3YAUcgkvqCkAVcIIy6raBCwT0/mRdymYG5Bt8VQoYBe+0Pwdpik6mwuAVNMawbJXgmr7e6FVokzKt1XBOZnYuneB54Jn+w/LEMZXTOo65nN80yNxNmyBIF4o6Ku6AXccpmzbzJstyQbs+FT/1VC6CFyU+mePTqbIBhBwp8csGn8UqO0qIz8AhstNBk8BP4As4RGCVyk8LgUVVlFvIXFXZ+4qUuZY8gn6W1QmYBKkadklM9PfLJriTYxYyEYFXpZp3s8Yj0kv9mhi0cuCTlsVMuqRWbpL0Xuo8YpAotaQnhgoQSzEAMjhuZoywfMb0UCmyKP1HmSXzJBQxpqIn9zhxA0piCJoFdqXu/bOpmeCMBiF+ZoJJ0E7gp0/AKCF71M1xCkZ4NRWSCjAIdiQ7v9UlHAcPUdfQh1QJEd7ArOg0K1dTRHJAO2hg8zhoH2IVbYElvaPgR4ABAFM/gtHnpJfxAAAAAElFTkSuQmCC");
+	background-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='utf-8'%3F%3E%3Csvg width='22' height='22' viewBox='0 0 1792 1792' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M1024 544v448q0 14-9 23t-23 9h-320q-14 0-23-9t-9-23v-64q0-14 9-23t23-9h224v-352q0-14 9-23t23-9h64q14 0 23 9t9 23zm416 352q0-148-73-273t-198-198-273-73-273 73-198 198-73 273 73 273 198 198 273 73 273-73 198-198 73-273zm224 0q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z'/%3E%3C/svg%3E");
 	background-repeat: no-repeat;
 	background-position: center;
 }
diff --git a/build/media/system/css/frontediting.css b/build/media_source/system/css/frontediting.css
similarity index 88%
rename from build/media/system/css/frontediting.css
rename to build/media_source/system/css/frontediting.css
index adb5226fb23e3..9ade0ac5545e1 100644
--- a/build/media/system/css/frontediting.css
+++ b/build/media_source/system/css/frontediting.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/system/css/mootree.css b/build/media_source/system/css/mootree.css
similarity index 86%
rename from build/media/system/css/mootree.css
rename to build/media_source/system/css/mootree.css
index b60f4185513e2..763bfd8616302 100644
--- a/build/media/system/css/mootree.css
+++ b/build/media_source/system/css/mootree.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/system/css/mootree_rtl.css b/build/media_source/system/css/mootree_rtl.css
similarity index 67%
rename from build/media/system/css/mootree_rtl.css
rename to build/media_source/system/css/mootree_rtl.css
index abd28f98a559d..c7ff9e75e9ef9 100644
--- a/build/media/system/css/mootree_rtl.css
+++ b/build/media_source/system/css/mootree_rtl.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/system/css/searchtools.css b/build/media_source/system/css/searchtools.css
similarity index 100%
rename from build/media/system/css/searchtools.css
rename to build/media_source/system/css/searchtools.css
diff --git a/build/media/legacy/css/sortablelist.css b/build/media_source/system/css/sortablelist.css
similarity index 97%
rename from build/media/legacy/css/sortablelist.css
rename to build/media_source/system/css/sortablelist.css
index 6794a31777f70..dee64e10a2b8a 100644
--- a/build/media/legacy/css/sortablelist.css
+++ b/build/media_source/system/css/sortablelist.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 .dnd-list-highlight {
diff --git a/build/media/system/css/system.css b/build/media_source/system/css/system.css
similarity index 95%
rename from build/media/system/css/system.css
rename to build/media_source/system/css/system.css
index f12ec0ad78847..fc8ac7c6a56b7 100644
--- a/build/media/system/css/system.css
+++ b/build/media_source/system/css/system.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media/system/images/ajax-loader.gif b/build/media_source/system/images/ajax-loader.gif
similarity index 100%
rename from build/media/system/images/ajax-loader.gif
rename to build/media_source/system/images/ajax-loader.gif
diff --git a/build/media/system/images/arrow.png b/build/media_source/system/images/arrow.png
similarity index 100%
rename from build/media/system/images/arrow.png
rename to build/media_source/system/images/arrow.png
diff --git a/build/media/system/images/arrow_rtl.png b/build/media_source/system/images/arrow_rtl.png
similarity index 100%
rename from build/media/system/images/arrow_rtl.png
rename to build/media_source/system/images/arrow_rtl.png
diff --git a/build/media/system/images/blank.png b/build/media_source/system/images/blank.png
similarity index 100%
rename from build/media/system/images/blank.png
rename to build/media_source/system/images/blank.png
diff --git a/build/media/system/images/calendar.png b/build/media_source/system/images/calendar.png
similarity index 100%
rename from build/media/system/images/calendar.png
rename to build/media_source/system/images/calendar.png
diff --git a/build/media/system/images/checked_out.png b/build/media_source/system/images/checked_out.png
similarity index 100%
rename from build/media/system/images/checked_out.png
rename to build/media_source/system/images/checked_out.png
diff --git a/build/media/system/images/edit.png b/build/media_source/system/images/edit.png
similarity index 100%
rename from build/media/system/images/edit.png
rename to build/media_source/system/images/edit.png
diff --git a/build/media/system/images/edit_unpublished.png b/build/media_source/system/images/edit_unpublished.png
similarity index 100%
rename from build/media/system/images/edit_unpublished.png
rename to build/media_source/system/images/edit_unpublished.png
diff --git a/build/media/system/images/emailButton.png b/build/media_source/system/images/emailButton.png
similarity index 100%
rename from build/media/system/images/emailButton.png
rename to build/media_source/system/images/emailButton.png
diff --git a/build/media/system/images/icon-16-logout.png b/build/media_source/system/images/icon-16-logout.png
similarity index 100%
rename from build/media/system/images/icon-16-logout.png
rename to build/media_source/system/images/icon-16-logout.png
diff --git a/build/media/system/images/icon_error.gif b/build/media_source/system/images/icon_error.gif
similarity index 100%
rename from build/media/system/images/icon_error.gif
rename to build/media_source/system/images/icon_error.gif
diff --git a/build/media/system/images/indent.png b/build/media_source/system/images/indent.png
similarity index 100%
rename from build/media/system/images/indent.png
rename to build/media_source/system/images/indent.png
diff --git a/build/media/system/images/indent1.png b/build/media_source/system/images/indent1.png
similarity index 100%
rename from build/media/system/images/indent1.png
rename to build/media_source/system/images/indent1.png
diff --git a/build/media/system/images/indent2.png b/build/media_source/system/images/indent2.png
similarity index 100%
rename from build/media/system/images/indent2.png
rename to build/media_source/system/images/indent2.png
diff --git a/build/media/system/images/indent3.png b/build/media_source/system/images/indent3.png
similarity index 100%
rename from build/media/system/images/indent3.png
rename to build/media_source/system/images/indent3.png
diff --git a/build/media/system/images/indent4.png b/build/media_source/system/images/indent4.png
similarity index 100%
rename from build/media/system/images/indent4.png
rename to build/media_source/system/images/indent4.png
diff --git a/build/media/system/images/indent5.png b/build/media_source/system/images/indent5.png
similarity index 100%
rename from build/media/system/images/indent5.png
rename to build/media_source/system/images/indent5.png
diff --git a/build/media/system/images/joomla.png b/build/media_source/system/images/joomla.png
similarity index 100%
rename from build/media/system/images/joomla.png
rename to build/media_source/system/images/joomla.png
diff --git a/build/media/system/images/jquery.minicolors.png b/build/media_source/system/images/jquery.minicolors.png
similarity index 100%
rename from build/media/system/images/jquery.minicolors.png
rename to build/media_source/system/images/jquery.minicolors.png
diff --git a/build/media/system/images/livemarks-rtl.png b/build/media_source/system/images/livemarks-rtl.png
similarity index 100%
rename from build/media/system/images/livemarks-rtl.png
rename to build/media_source/system/images/livemarks-rtl.png
diff --git a/build/media/system/images/livemarks.png b/build/media_source/system/images/livemarks.png
similarity index 100%
rename from build/media/system/images/livemarks.png
rename to build/media_source/system/images/livemarks.png
diff --git a/build/media/system/images/mooRainbow/blank.gif b/build/media_source/system/images/mooRainbow/blank.gif
similarity index 100%
rename from build/media/system/images/mooRainbow/blank.gif
rename to build/media_source/system/images/mooRainbow/blank.gif
diff --git a/build/media/system/images/mooRainbow/moor_arrows.gif b/build/media_source/system/images/mooRainbow/moor_arrows.gif
similarity index 100%
rename from build/media/system/images/mooRainbow/moor_arrows.gif
rename to build/media_source/system/images/mooRainbow/moor_arrows.gif
diff --git a/build/media/system/images/mooRainbow/moor_boverlay.png b/build/media_source/system/images/mooRainbow/moor_boverlay.png
similarity index 100%
rename from build/media/system/images/mooRainbow/moor_boverlay.png
rename to build/media_source/system/images/mooRainbow/moor_boverlay.png
diff --git a/build/media/system/images/mooRainbow/moor_cursor.gif b/build/media_source/system/images/mooRainbow/moor_cursor.gif
similarity index 100%
rename from build/media/system/images/mooRainbow/moor_cursor.gif
rename to build/media_source/system/images/mooRainbow/moor_cursor.gif
diff --git a/build/media/system/images/mooRainbow/moor_slider.png b/build/media_source/system/images/mooRainbow/moor_slider.png
similarity index 100%
rename from build/media/system/images/mooRainbow/moor_slider.png
rename to build/media_source/system/images/mooRainbow/moor_slider.png
diff --git a/build/media/system/images/mooRainbow/moor_woverlay.png b/build/media_source/system/images/mooRainbow/moor_woverlay.png
similarity index 100%
rename from build/media/system/images/mooRainbow/moor_woverlay.png
rename to build/media_source/system/images/mooRainbow/moor_woverlay.png
diff --git a/build/media/system/images/mootree.gif b/build/media_source/system/images/mootree.gif
similarity index 100%
rename from build/media/system/images/mootree.gif
rename to build/media_source/system/images/mootree.gif
diff --git a/build/media/system/images/mootree_loader.gif b/build/media_source/system/images/mootree_loader.gif
similarity index 100%
rename from build/media/system/images/mootree_loader.gif
rename to build/media_source/system/images/mootree_loader.gif
diff --git a/build/media/system/images/new.png b/build/media_source/system/images/new.png
similarity index 100%
rename from build/media/system/images/new.png
rename to build/media_source/system/images/new.png
diff --git a/build/media/system/images/no_indent.png b/build/media_source/system/images/no_indent.png
similarity index 100%
rename from build/media/system/images/no_indent.png
rename to build/media_source/system/images/no_indent.png
diff --git a/build/media/system/images/notice-alert.png b/build/media_source/system/images/notice-alert.png
similarity index 100%
rename from build/media/system/images/notice-alert.png
rename to build/media_source/system/images/notice-alert.png
diff --git a/build/media/system/images/notice-download.png b/build/media_source/system/images/notice-download.png
similarity index 100%
rename from build/media/system/images/notice-download.png
rename to build/media_source/system/images/notice-download.png
diff --git a/build/media/system/images/notice-info.png b/build/media_source/system/images/notice-info.png
similarity index 100%
rename from build/media/system/images/notice-info.png
rename to build/media_source/system/images/notice-info.png
diff --git a/build/media/system/images/notice-note.png b/build/media_source/system/images/notice-note.png
similarity index 100%
rename from build/media/system/images/notice-note.png
rename to build/media_source/system/images/notice-note.png
diff --git a/build/media/system/images/pdf_button.png b/build/media_source/system/images/pdf_button.png
similarity index 100%
rename from build/media/system/images/pdf_button.png
rename to build/media_source/system/images/pdf_button.png
diff --git a/build/media/system/images/printButton.png b/build/media_source/system/images/printButton.png
similarity index 100%
rename from build/media/system/images/printButton.png
rename to build/media_source/system/images/printButton.png
diff --git a/build/media/system/images/rating_star.png b/build/media_source/system/images/rating_star.png
similarity index 100%
rename from build/media/system/images/rating_star.png
rename to build/media_source/system/images/rating_star.png
diff --git a/build/media/system/images/rating_star_blank.png b/build/media_source/system/images/rating_star_blank.png
similarity index 100%
rename from build/media/system/images/rating_star_blank.png
rename to build/media_source/system/images/rating_star_blank.png
diff --git a/build/media/system/images/sort0.png b/build/media_source/system/images/sort0.png
similarity index 100%
rename from build/media/system/images/sort0.png
rename to build/media_source/system/images/sort0.png
diff --git a/build/media/system/images/sort1.png b/build/media_source/system/images/sort1.png
similarity index 100%
rename from build/media/system/images/sort1.png
rename to build/media_source/system/images/sort1.png
diff --git a/build/media/system/images/sort_asc.png b/build/media_source/system/images/sort_asc.png
similarity index 100%
rename from build/media/system/images/sort_asc.png
rename to build/media_source/system/images/sort_asc.png
diff --git a/build/media/system/images/sort_desc.png b/build/media_source/system/images/sort_desc.png
similarity index 100%
rename from build/media/system/images/sort_desc.png
rename to build/media_source/system/images/sort_desc.png
diff --git a/build/media/system/images/sort_none.png b/build/media_source/system/images/sort_none.png
similarity index 100%
rename from build/media/system/images/sort_none.png
rename to build/media_source/system/images/sort_none.png
diff --git a/build/media/system/images/tooltip.png b/build/media_source/system/images/tooltip.png
similarity index 100%
rename from build/media/system/images/tooltip.png
rename to build/media_source/system/images/tooltip.png
diff --git a/build/media/system/images/weblink.png b/build/media_source/system/images/weblink.png
similarity index 100%
rename from build/media/system/images/weblink.png
rename to build/media_source/system/images/weblink.png
diff --git a/build/media_src/system/joomla.asset.json b/build/media_source/system/joomla.asset.json
similarity index 100%
rename from build/media_src/system/joomla.asset.json
rename to build/media_source/system/joomla.asset.json
diff --git a/build/media_src/system/js/core.es6.js b/build/media_source/system/js/core.es6.js
similarity index 97%
rename from build/media_src/system/js/core.es6.js
rename to build/media_source/system/js/core.es6.js
index cea404d47f96a..7d28c9bd4c25f 100644
--- a/build/media_src/system/js/core.es6.js
+++ b/build/media_source/system/js/core.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -724,6 +724,11 @@ window.Joomla.Modal = window.Joomla.Modal || {
    * @return  {HTMLElement}  The HTML loading layer element.
    *
    * @since  3.6.0
+   *
+   * @deprecated  4.0 No direct replacement.
+   *              4.0 will introduce a web component for the loading spinner, therefore the spinner
+   *              will need to explicitly be loaded in all relevant pages.
+   *
    */
   Joomla.loadingLayer = (task, parentElement) => {
     // Set default values.
@@ -732,6 +737,10 @@ window.Joomla.Modal = window.Joomla.Modal || {
 
     // Create the loading layer (hidden by default).
     if (newTask === 'load') {
+      // Prevent loading twice
+      if (document.getElementById('loading-logo')) {
+        return false;
+      }
       // Gets the site base path
       const systemPaths = Joomla.getOptions('system.paths') || {};
       const basePath = systemPaths.root || '';
@@ -910,6 +919,25 @@ window.Joomla.Modal = window.Joomla.Modal || {
     return xhr;
   };
 
+  /**
+   * Load the changelog data
+   *
+   * @param extensionId The extension ID to load the changelog for
+   * @param view The view the changelog is for,
+   *             this is used to determine which version number to show
+   *
+   * @since   4.0.0
+   */
+  Joomla.loadChangelog = (extensionId, view) => {
+    Joomla.request({
+      url: `index.php?option=com_installer&task=manage.loadChangelog&eid=${extensionId}&source=${view}&format=json`,
+      onSuccess: (response) => {
+        const result = JSON.parse(response);
+        document.querySelectorAll('#changelogModal .modal-body')[0].innerHTML = result.data;
+      },
+    });
+  };
+
   /**
    * Loads any needed polyfill for web components and async load any web components
    *
@@ -1087,14 +1115,14 @@ window.Joomla.Modal = window.Joomla.Modal || {
       // Load it from the right place.
       const replacement = `media/vendor/webcomponentsjs/js/webcomponents-${polyfills.join('-')}.min.js`;
 
-      const mediaVersion = script.src.match(/\?.*/)[0];
+      const mediaVersion = script.src.match(/\?.*/);
       const base = Joomla.getOptions('system.paths');
 
       if (!base) {
         throw new Error('core(.min).js is not registered correctly!');
       }
 
-      newScript.src = base.rootFull + replacement + (mediaVersion || '');
+      newScript.src = base.rootFull + replacement + (mediaVersion ? mediaVersion[0] : '');
 
       // if readyState is 'loading', this script is synchronous
       if (document.readyState === 'loading') {
diff --git a/build/media/system/js/draggable.js b/build/media_source/system/js/draggable.es5.js
similarity index 98%
rename from build/media/system/js/draggable.js
rename to build/media_source/system/js/draggable.es5.js
index 37c899d7374ea..6c0c5a94bdb59 100644
--- a/build/media/system/js/draggable.js
+++ b/build/media_source/system/js/draggable.es5.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 document.addEventListener('DOMContentLoaded', function() {
diff --git a/build/media/system/js/fields/calendar-locales/af.js b/build/media_source/system/js/fields/calendar-locales/af.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/af.js
rename to build/media_source/system/js/fields/calendar-locales/af.es5.js
index 7c4ec21568de2..0bab8839122ca 100644
--- a/build/media/system/js/fields/calendar-locales/af.js
+++ b/build/media_source/system/js/fields/calendar-locales/af.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Sluit",
-	save: "Stoor"
+	clear: "Stoor"
 };
diff --git a/build/media/system/js/fields/calendar-locales/ar.js b/build/media_source/system/js/fields/calendar-locales/ar.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/ar.js
rename to build/media_source/system/js/fields/calendar-locales/ar.es5.js
index 1215f2fc29b9d..7bd0b78a68487 100644
--- a/build/media/system/js/fields/calendar-locales/ar.js
+++ b/build/media_source/system/js/fields/calendar-locales/ar.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "إغلاق",
-	save: "الغاء"
+	clear: "الغاء"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/bg.js b/build/media_source/system/js/fields/calendar-locales/bg.js
similarity index 96%
rename from build/media/system/js/fields/calendar-locales/bg.js
rename to build/media_source/system/js/fields/calendar-locales/bg.js
index a869be06dc688..7c85757c05ef1 100644
--- a/build/media/system/js/fields/calendar-locales/bg.js
+++ b/build/media_source/system/js/fields/calendar-locales/bg.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Затвори",
-	save: "Изчисти"
+	clear: "Изчисти"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/bn.js b/build/media_source/system/js/fields/calendar-locales/bn.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/bn.js
rename to build/media_source/system/js/fields/calendar-locales/bn.js
index 0c8785b9533a9..d385c91396b26 100644
--- a/build/media/system/js/fields/calendar-locales/bn.js
+++ b/build/media_source/system/js/fields/calendar-locales/bn.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "প্রস্থান",
-	save: "সংরক্ষণ"
+	clear: "সংরক্ষণ"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/bs.js b/build/media_source/system/js/fields/calendar-locales/bs.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/bs.js
rename to build/media_source/system/js/fields/calendar-locales/bs.js
index 62e1614457b80..6376168ad46c7 100644
--- a/build/media/system/js/fields/calendar-locales/bs.js
+++ b/build/media_source/system/js/fields/calendar-locales/bs.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Zatvori",
-	save: "Snimi"
+	clear: "Snimi"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/ca.js b/build/media_source/system/js/fields/calendar-locales/ca.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/ca.js
rename to build/media_source/system/js/fields/calendar-locales/ca.js
index c873211debd71..6d3fbc880b5f9 100644
--- a/build/media/system/js/fields/calendar-locales/ca.js
+++ b/build/media_source/system/js/fields/calendar-locales/ca.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Tancar",
-	save: "Desar"
+	clear: "Desar"
 };
diff --git a/build/media/system/js/fields/calendar-locales/cs.js b/build/media_source/system/js/fields/calendar-locales/cs.js
similarity index 96%
rename from build/media/system/js/fields/calendar-locales/cs.js
rename to build/media_source/system/js/fields/calendar-locales/cs.js
index 7ae280bcec8da..db0dae13bf4df 100644
--- a/build/media/system/js/fields/calendar-locales/cs.js
+++ b/build/media_source/system/js/fields/calendar-locales/cs.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "zavřít",
-	save: "vymazat"
+	clear: "vymazat"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/cy.js b/build/media_source/system/js/fields/calendar-locales/cy.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/cy.js
rename to build/media_source/system/js/fields/calendar-locales/cy.js
index 9439441ee21c6..9c099f5d8b13f 100644
--- a/build/media/system/js/fields/calendar-locales/cy.js
+++ b/build/media_source/system/js/fields/calendar-locales/cy.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Cau",
-	save: "Clirio"
+	clear: "Clirio"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/da.js b/build/media_source/system/js/fields/calendar-locales/da.js
similarity index 96%
rename from build/media/system/js/fields/calendar-locales/da.js
rename to build/media_source/system/js/fields/calendar-locales/da.js
index 6f8510b04852e..0c4e31955c14a 100644
--- a/build/media/system/js/fields/calendar-locales/da.js
+++ b/build/media_source/system/js/fields/calendar-locales/da.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Luk",
-	save: "Nulstil"
+	clear: "Nulstil"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/date/gregorian/date-helper.js b/build/media_source/system/js/fields/calendar-locales/date/gregorian/date-helper.es5.js
similarity index 100%
rename from build/media/system/js/fields/calendar-locales/date/gregorian/date-helper.js
rename to build/media_source/system/js/fields/calendar-locales/date/gregorian/date-helper.es5.js
diff --git a/build/media/system/js/fields/calendar-locales/date/jalali/date-helper.js b/build/media_source/system/js/fields/calendar-locales/date/jalali/date-helper.es5.js
similarity index 100%
rename from build/media/system/js/fields/calendar-locales/date/jalali/date-helper.js
rename to build/media_source/system/js/fields/calendar-locales/date/jalali/date-helper.es5.js
diff --git a/build/media/system/js/fields/calendar-locales/de.js b/build/media_source/system/js/fields/calendar-locales/de.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/de.js
rename to build/media_source/system/js/fields/calendar-locales/de.es5.js
index b3b65f4a535af..98f2251026841 100644
--- a/build/media/system/js/fields/calendar-locales/de.js
+++ b/build/media_source/system/js/fields/calendar-locales/de.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Schließen",
-	save: "Leeren"
+	clear: "Leeren"
 };
diff --git a/build/media/system/js/fields/calendar-locales/el.js b/build/media_source/system/js/fields/calendar-locales/el.es5.js
similarity index 96%
rename from build/media/system/js/fields/calendar-locales/el.js
rename to build/media_source/system/js/fields/calendar-locales/el.es5.js
index 2aee52a806fe4..c2537d35ad6c1 100644
--- a/build/media/system/js/fields/calendar-locales/el.js
+++ b/build/media_source/system/js/fields/calendar-locales/el.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Κλείσιμο",
-	save: "Καθαρισμός"
+	clear: "Καθαρισμός"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/en.js b/build/media_source/system/js/fields/calendar-locales/en.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/en.js
rename to build/media_source/system/js/fields/calendar-locales/en.es5.js
index 4280fefcf8fe8..4789f2852bff7 100644
--- a/build/media/system/js/fields/calendar-locales/en.js
+++ b/build/media_source/system/js/fields/calendar-locales/en.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Close",
-	save: "Clear"
+	clear: "Clear"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/es.js b/build/media_source/system/js/fields/calendar-locales/es.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/es.js
rename to build/media_source/system/js/fields/calendar-locales/es.es5.js
index b89270b38d71d..e0ec73182a522 100644
--- a/build/media/system/js/fields/calendar-locales/es.js
+++ b/build/media_source/system/js/fields/calendar-locales/es.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Cerrar",
-	save: "Limpiar"
+	clear: "Limpiar"
 };
diff --git a/build/media/system/js/fields/calendar-locales/eu.js b/build/media_source/system/js/fields/calendar-locales/eu.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/eu.js
rename to build/media_source/system/js/fields/calendar-locales/eu.es5.js
index 0cf5d12b0b7e6..12310c6a787c9 100644
--- a/build/media/system/js/fields/calendar-locales/eu.js
+++ b/build/media_source/system/js/fields/calendar-locales/eu.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Itxi",
-	save: "Garbitu"
+	clear: "Garbitu"
 };
diff --git a/build/media/system/js/fields/calendar-locales/fa-ir.js b/build/media_source/system/js/fields/calendar-locales/fa-ir.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/fa-ir.js
rename to build/media_source/system/js/fields/calendar-locales/fa-ir.es5.js
index c9fb524e750c6..0edb05605a4eb 100644
--- a/build/media/system/js/fields/calendar-locales/fa-ir.js
+++ b/build/media_source/system/js/fields/calendar-locales/fa-ir.es5.js
@@ -15,6 +15,6 @@ window.JoomlaCalLocale = {
 	minYear : 1268,
 	maxYear : 1458,
 	exit: "بستن",
-	save: "پاک",
+	clear: "پاک",
 	localLangNumbers: ["۰","۱","۲","۳","۴","۵","۶","۷","۸","۹"]
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/fi.js b/build/media_source/system/js/fields/calendar-locales/fi.es5.js
similarity index 96%
rename from build/media/system/js/fields/calendar-locales/fi.js
rename to build/media_source/system/js/fields/calendar-locales/fi.es5.js
index ffe7fc384c5d1..a35c1e3cf2382 100644
--- a/build/media/system/js/fields/calendar-locales/fi.js
+++ b/build/media_source/system/js/fields/calendar-locales/fi.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Sulje",
-	save: "Tyhjennä"
+	clear: "Tyhjennä"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/fr.js b/build/media_source/system/js/fields/calendar-locales/fr.es5.js
similarity index 96%
rename from build/media/system/js/fields/calendar-locales/fr.js
rename to build/media_source/system/js/fields/calendar-locales/fr.es5.js
index 9fd1189b9e61c..e62ac80f6c319 100644
--- a/build/media/system/js/fields/calendar-locales/fr.js
+++ b/build/media_source/system/js/fields/calendar-locales/fr.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Fermer",
-	save: "Effacer"
+	clear: "Effacer"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/ga.js b/build/media_source/system/js/fields/calendar-locales/ga.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/ga.js
rename to build/media_source/system/js/fields/calendar-locales/ga.es5.js
index fde45f1c8a5de..824ace3ba7cb8 100644
--- a/build/media/system/js/fields/calendar-locales/ga.js
+++ b/build/media_source/system/js/fields/calendar-locales/ga.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Dún",
-	save: "Glan"
+	clear: "Glan"
 };
diff --git a/build/media/system/js/fields/calendar-locales/hr.js b/build/media_source/system/js/fields/calendar-locales/hr.es5.js
similarity index 96%
rename from build/media/system/js/fields/calendar-locales/hr.js
rename to build/media_source/system/js/fields/calendar-locales/hr.es5.js
index 48d02db5fe8de..918a016c43e07 100644
--- a/build/media/system/js/fields/calendar-locales/hr.js
+++ b/build/media_source/system/js/fields/calendar-locales/hr.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Zatvori",
-	save: "Otkaži"
+	clear: "Otkaži"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/hu.js b/build/media_source/system/js/fields/calendar-locales/hu.es5.js
similarity index 96%
rename from build/media/system/js/fields/calendar-locales/hu.js
rename to build/media_source/system/js/fields/calendar-locales/hu.es5.js
index fefea8e13289d..117c20ff3631c 100644
--- a/build/media/system/js/fields/calendar-locales/hu.js
+++ b/build/media_source/system/js/fields/calendar-locales/hu.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Bezárás",
-	save: "Törlés"
+	clear: "Törlés"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/it.js b/build/media_source/system/js/fields/calendar-locales/it.es5.js
similarity index 96%
rename from build/media/system/js/fields/calendar-locales/it.js
rename to build/media_source/system/js/fields/calendar-locales/it.es5.js
index c4c0dce7a43ee..026f3f8b225bb 100644
--- a/build/media/system/js/fields/calendar-locales/it.js
+++ b/build/media_source/system/js/fields/calendar-locales/it.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Chiudi",
-	save: "Annulla"
+	clear: "Annulla"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/ja.js b/build/media_source/system/js/fields/calendar-locales/ja.es5.js
similarity index 96%
rename from build/media/system/js/fields/calendar-locales/ja.js
rename to build/media_source/system/js/fields/calendar-locales/ja.es5.js
index f9662a9752d91..f9c3900a15289 100644
--- a/build/media/system/js/fields/calendar-locales/ja.js
+++ b/build/media_source/system/js/fields/calendar-locales/ja.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "閉じる",
-	save: "クリア"
+	clear: "クリア"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/ka.js b/build/media_source/system/js/fields/calendar-locales/ka.es5.js
similarity index 95%
rename from build/media/system/js/fields/calendar-locales/ka.js
rename to build/media_source/system/js/fields/calendar-locales/ka.es5.js
index 0d08776a9bf47..f05f34e084c19 100644
--- a/build/media/system/js/fields/calendar-locales/ka.js
+++ b/build/media_source/system/js/fields/calendar-locales/ka.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "დახურვა",
-	save: "გასუფთავება"
+	clear: "გასუფთავება"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/ko.js b/build/media_source/system/js/fields/calendar-locales/ko.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/ko.js
rename to build/media_source/system/js/fields/calendar-locales/ko.es5.js
index e0fbf7269b096..f9dbe3d76bdd8 100644
--- a/build/media/system/js/fields/calendar-locales/ko.js
+++ b/build/media_source/system/js/fields/calendar-locales/ko.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "닫기",
-	save: "Clear"
+	clear: "Clear"
 };
\ No newline at end of file
diff --git a/build/media_source/system/js/fields/calendar-locales/lt.js b/build/media_source/system/js/fields/calendar-locales/lt.js
new file mode 100644
index 0000000000000..1c9763b6549a3
--- /dev/null
+++ b/build/media_source/system/js/fields/calendar-locales/lt.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Šiandien",
+	weekend : [0, 6],
+	wk : "wk",
+	time : "Laikas:",
+	days : ["Sekmadienis", "Pirmadienis", "Antradienis", "Trečiadienis", "Ketvirtadienis", "Penktadienis", "Šeštadienis"],
+	shortDays : ["Sek", "Pir", "Ant", "Tre", "Ket", "Pen", "Šeš"],
+	months : ["Sausis", "Vasaris", "Kovas", "Balandis", "Gegužė", "Birželis", "Liepa", "Rugpjūtis", "Rugsšjis", "Spalis", "Lapkritis", "Gruodis"],
+	shortMonths : ["Sau", "Vas", "Kov", "Bal", "Geg", "Bir", "Lie", "Rug", "Rgs", "Spa", "Lap", "Grd"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Uždaryti",
+	clear: "Išvalyti"
+};
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/mk.js b/build/media_source/system/js/fields/calendar-locales/mk.es5.js
similarity index 96%
rename from build/media/system/js/fields/calendar-locales/mk.js
rename to build/media_source/system/js/fields/calendar-locales/mk.es5.js
index 2d952fc6d771c..ca56474ce76b3 100644
--- a/build/media/system/js/fields/calendar-locales/mk.js
+++ b/build/media_source/system/js/fields/calendar-locales/mk.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Затвори",
-	save: "Зачувај"
+	clear: "Зачувај"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/nb.js b/build/media_source/system/js/fields/calendar-locales/nb.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/nb.js
rename to build/media_source/system/js/fields/calendar-locales/nb.es5.js
index 6ab348c9995ca..61df3da8ef1be 100644
--- a/build/media/system/js/fields/calendar-locales/nb.js
+++ b/build/media_source/system/js/fields/calendar-locales/nb.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Lukk",
-	save: "Tøm"
+	clear: "Tøm"
 };
diff --git a/build/media/system/js/fields/calendar-locales/nl.js b/build/media_source/system/js/fields/calendar-locales/nl.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/nl.js
rename to build/media_source/system/js/fields/calendar-locales/nl.es5.js
index 2db399468c9e9..cb1fb612428d5 100644
--- a/build/media/system/js/fields/calendar-locales/nl.js
+++ b/build/media_source/system/js/fields/calendar-locales/nl.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Sluiten",
-	save: "Legen"
+	clear: "Legen"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/pl.js b/build/media_source/system/js/fields/calendar-locales/pl.es5.js
similarity index 96%
rename from build/media/system/js/fields/calendar-locales/pl.js
rename to build/media_source/system/js/fields/calendar-locales/pl.es5.js
index 62ad8eb54b276..a75c4128a5542 100644
--- a/build/media/system/js/fields/calendar-locales/pl.js
+++ b/build/media_source/system/js/fields/calendar-locales/pl.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Zamknij",
-	save: "Wyczyść"
+	clear: "Wyczyść"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/prs-af.js b/build/media_source/system/js/fields/calendar-locales/prs-af.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/prs-af.js
rename to build/media_source/system/js/fields/calendar-locales/prs-af.es5.js
index c9fb524e750c6..0edb05605a4eb 100644
--- a/build/media/system/js/fields/calendar-locales/prs-af.js
+++ b/build/media_source/system/js/fields/calendar-locales/prs-af.es5.js
@@ -15,6 +15,6 @@ window.JoomlaCalLocale = {
 	minYear : 1268,
 	maxYear : 1458,
 	exit: "بستن",
-	save: "پاک",
+	clear: "پاک",
 	localLangNumbers: ["۰","۱","۲","۳","۴","۵","۶","۷","۸","۹"]
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/pt.js b/build/media_source/system/js/fields/calendar-locales/pt.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/pt.js
rename to build/media_source/system/js/fields/calendar-locales/pt.es5.js
index b48dfd01bfd95..7f053a658b8a0 100644
--- a/build/media/system/js/fields/calendar-locales/pt.js
+++ b/build/media_source/system/js/fields/calendar-locales/pt.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Fechar",
-	save: "Limpar"
+	clear: "Limpar"
 };
diff --git a/build/media/system/js/fields/calendar-locales/ru.js b/build/media_source/system/js/fields/calendar-locales/ru.es5.js
similarity index 96%
rename from build/media/system/js/fields/calendar-locales/ru.js
rename to build/media_source/system/js/fields/calendar-locales/ru.es5.js
index 38370e7da769f..ee4cc729a50a0 100644
--- a/build/media/system/js/fields/calendar-locales/ru.js
+++ b/build/media_source/system/js/fields/calendar-locales/ru.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Закрыть",
-	save: "Очистить"
+	clear: "Очистить"
 };
diff --git a/build/media/system/js/fields/calendar-locales/sk.js b/build/media_source/system/js/fields/calendar-locales/sk.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/sk.js
rename to build/media_source/system/js/fields/calendar-locales/sk.es5.js
index 4ee734176b12d..bf30309e01c37 100644
--- a/build/media/system/js/fields/calendar-locales/sk.js
+++ b/build/media_source/system/js/fields/calendar-locales/sk.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Zavrieť",
-	save: "Vymazať"
+	clear: "Vymazať"
 };
diff --git a/build/media/system/js/fields/calendar-locales/sl.js b/build/media_source/system/js/fields/calendar-locales/sl.es5.js
similarity index 94%
rename from build/media/system/js/fields/calendar-locales/sl.js
rename to build/media_source/system/js/fields/calendar-locales/sl.es5.js
index 730bb9f61c7ac..33addc32dec2e 100644
--- a/build/media/system/js/fields/calendar-locales/sl.js
+++ b/build/media_source/system/js/fields/calendar-locales/sl.es5.js
@@ -1,7 +1,7 @@
 window.JoomlaCalLocale = {
 	today : "Danes",
 	weekend : [0, 6],
-	wk : "wk",
+	wk : "td",
 	time : "Čas:",
 	days : ["Nedelja", "Ponedeljek", "Torek", "Sreda", "Četrtek", "Petek", "Sobota"],
 	shortDays : ["Ned", "Pon", "Tor", "Sre", "Čet", "Pet", "Sob"],
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Zapri",
-	save: "Počisti"
+	clear: "Počisti"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/sr-rs.js b/build/media_source/system/js/fields/calendar-locales/sr-rs.es5.js
similarity index 96%
rename from build/media/system/js/fields/calendar-locales/sr-rs.js
rename to build/media_source/system/js/fields/calendar-locales/sr-rs.es5.js
index 5ff59b2654cbc..9861507383400 100644
--- a/build/media/system/js/fields/calendar-locales/sr-rs.js
+++ b/build/media_source/system/js/fields/calendar-locales/sr-rs.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Затвори",
-	save: "Зачувај"
+	clear: "Зачувај"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/sr-yu.js b/build/media_source/system/js/fields/calendar-locales/sr-yu.es5.js
similarity index 96%
rename from build/media/system/js/fields/calendar-locales/sr-yu.js
rename to build/media_source/system/js/fields/calendar-locales/sr-yu.es5.js
index d6745bd680552..f22131bda0de4 100644
--- a/build/media/system/js/fields/calendar-locales/sr-yu.js
+++ b/build/media_source/system/js/fields/calendar-locales/sr-yu.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Zatvori",
-	save: "Sačuvaj"
+	clear: "Sačuvaj"
 };
diff --git a/build/media/system/js/fields/calendar-locales/sv.js b/build/media_source/system/js/fields/calendar-locales/sv.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/sv.js
rename to build/media_source/system/js/fields/calendar-locales/sv.es5.js
index 6902f416658d4..3031020d61ee5 100644
--- a/build/media/system/js/fields/calendar-locales/sv.js
+++ b/build/media_source/system/js/fields/calendar-locales/sv.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Stäng",
-	save: "Rensa"
+	clear: "Rensa"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/sw.js b/build/media_source/system/js/fields/calendar-locales/sw.es5.js
similarity index 96%
rename from build/media/system/js/fields/calendar-locales/sw.js
rename to build/media_source/system/js/fields/calendar-locales/sw.es5.js
index a270f85d6dd4d..61317f929850e 100644
--- a/build/media/system/js/fields/calendar-locales/sw.js
+++ b/build/media_source/system/js/fields/calendar-locales/sw.es5.js
@@ -15,5 +15,5 @@
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Funga",
-	save: "Safisha"
+	clear: "Safisha"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/ta.js b/build/media_source/system/js/fields/calendar-locales/ta.es5.js
similarity index 88%
rename from build/media/system/js/fields/calendar-locales/ta.js
rename to build/media_source/system/js/fields/calendar-locales/ta.es5.js
index 408287cf1694e..9e258ce6b004f 100644
--- a/build/media/system/js/fields/calendar-locales/ta.js
+++ b/build/media_source/system/js/fields/calendar-locales/ta.es5.js
@@ -7,13 +7,13 @@ window.JoomlaCalLocale = {
 	shortDays : ["ஞா", "தி", "செ", "பு", "வி", "வெ", "ச"],
 	months : ["ஜனவரி", "பிப்ரவரி", "மார்ச்", "ஏப்ரல்", "மே", "ஜூன்", "ஜூலை", "ஆகஸ்ட்", "செப்டம்பர்", "அக்டோபர்", "நவம்பர்", "டிசம்பர்"],
 	shortMonths : ["ஜன", "பிப்", "மார்", "ஏப்", "மே", "ஜூன்", "ஜூலை", "ஆக", "செப்", "அக்", "நவ", "டிச"],
-	AM : "காலை",
-	PM : "மாலை",
-	am : "காலை",
-	pm : "மாலை",
+	AM : "முப",
+	PM : "பிப",
+	am : "முப",
+	pm : "பிப",
 	dateType : "gregorian",
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "மூடுக",
-	save: "துடைக்க"
+	clear: "துடைக்க"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/th.js b/build/media_source/system/js/fields/calendar-locales/th.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/th.js
rename to build/media_source/system/js/fields/calendar-locales/th.es5.js
index 2743692cb3136..c338c5c94180b 100644
--- a/build/media/system/js/fields/calendar-locales/th.js
+++ b/build/media_source/system/js/fields/calendar-locales/th.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "ปิด",
-	save: "ล้าง"
+	clear: "ล้าง"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/uk.js b/build/media_source/system/js/fields/calendar-locales/uk.es5.js
similarity index 96%
rename from build/media/system/js/fields/calendar-locales/uk.js
rename to build/media_source/system/js/fields/calendar-locales/uk.es5.js
index 6a31d866e6d73..dd6fc82f93722 100644
--- a/build/media/system/js/fields/calendar-locales/uk.js
+++ b/build/media_source/system/js/fields/calendar-locales/uk.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "Закрити",
-	save: "Очистити"
+	clear: "Очистити"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/zh-CN.js b/build/media_source/system/js/fields/calendar-locales/zh-CN.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/zh-CN.js
rename to build/media_source/system/js/fields/calendar-locales/zh-CN.es5.js
index b2c2f6b2fe522..b11305e31f64a 100644
--- a/build/media/system/js/fields/calendar-locales/zh-CN.js
+++ b/build/media_source/system/js/fields/calendar-locales/zh-CN.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "关闭",
-	save: "清除"
+	clear: "清除"
 };
\ No newline at end of file
diff --git a/build/media/system/js/fields/calendar-locales/zh-TW.js b/build/media_source/system/js/fields/calendar-locales/zh-TW.es5.js
similarity index 97%
rename from build/media/system/js/fields/calendar-locales/zh-TW.js
rename to build/media_source/system/js/fields/calendar-locales/zh-TW.es5.js
index dee824bd6a1ae..cf785942926b8 100644
--- a/build/media/system/js/fields/calendar-locales/zh-TW.js
+++ b/build/media_source/system/js/fields/calendar-locales/zh-TW.es5.js
@@ -15,5 +15,5 @@ window.JoomlaCalLocale = {
 	minYear : 1900,
 	maxYear : 2100,
 	exit: "關閉",
-	save: "清除"
+	clear: "清除"
 };
diff --git a/build/media/system/js/fields/calendar.js b/build/media_source/system/js/fields/calendar.es5.js
similarity index 99%
rename from build/media/system/js/fields/calendar.js
rename to build/media_source/system/js/fields/calendar.es5.js
index a4508389561b3..9e14aa508faa1 100644
--- a/build/media/system/js/fields/calendar.js
+++ b/build/media_source/system/js/fields/calendar.es5.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 !(function(window, document){
diff --git a/build/media/system/js/fields/color-field-adv-init.js b/build/media_source/system/js/fields/color-field-adv-init.es5.js
similarity index 94%
rename from build/media/system/js/fields/color-field-adv-init.js
rename to build/media_source/system/js/fields/color-field-adv-init.es5.js
index fadc342bb5b6e..bd50101ae77ae 100644
--- a/build/media/system/js/fields/color-field-adv-init.js
+++ b/build/media_source/system/js/fields/color-field-adv-init.es5.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
new file mode 100644
index 0000000000000..fa71e9286a9c3
--- /dev/null
+++ b/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
@@ -0,0 +1,209 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Fancy select field, which use Choices.js
+ *
+ * Example:
+ * <joomla-field-fancy-select ...attributes>
+ *   <select>...</select>
+ * </joomla-field-fancy-select>
+ *
+ * Possible attributes:
+ *
+ * allow-custom          Whether allow User to dynamically add a new value.
+ * new-item-prefix=""    Prefix for a dynamically added value.
+ *
+ * remote-search         Enable remote search.
+ * url=""                Url for remote search.
+ * term-key="term"       Variable key name for searched term, will be appended to Url.
+ *
+ * min-term-length="1"   The minimum length a search value should be before choices are searched.
+ * placeholder=""        The value of the inputs placeholder.
+ * search-placeholder="" The value of the search inputs placeholder.
+ */
+window.customElements.define('joomla-field-fancy-select', class extends HTMLElement {
+  // Attributes to monitor
+  get allowCustom() { return this.hasAttribute('allow-custom'); }
+
+  get remoteSearch() { return this.hasAttribute('remote-search'); }
+
+  get url() { return this.getAttribute('url'); }
+
+  get termKey() { return this.getAttribute('term-key') || 'term'; }
+
+  get minTermLength() { return parseInt(this.getAttribute('min-term-length')) || 1; }
+
+  get newItemPrefix() { return this.getAttribute('new-item-prefix') || ''; }
+
+  get placeholder() { return this.getAttribute('placeholder'); }
+
+  get searchPlaceholder() { return this.getAttribute('search-placeholder'); }
+
+  get value() {return this.choicesInstance.getValue(true); }
+
+  set value($val) { this.choicesInstance.setValueByChoice($val); }
+
+  /**
+   * Lifecycle
+   */
+  constructor() {
+    super();
+
+    // Keycodes
+    this.keyCode = {
+      ENTER: 13,
+    };
+
+    if (!Joomla) {
+      throw new Error('Joomla API is not properly initiated');
+    }
+
+    if (!window.Choices) {
+      throw new Error('JoomlaFieldFancySelect requires Choices.js to work');
+    }
+
+    this.choicesCache = {};
+    this.activeXHR = null;
+    this.choicesInstance = null;
+  }
+
+  /**
+   * Lifecycle
+   */
+  connectedCallback() {
+    // Get a <select> element
+    this.select = this.querySelector('select');
+
+    if (!this.select) {
+      throw new Error('JoomlaFieldFancySelect requires <select> element to work');
+    }
+
+    // Init Choices
+    this.choicesInstance = new Choices(this.select, {
+      placeholderValue: this.placeholder,
+      searchPlaceholderValue: this.searchPlaceholder,
+      removeItemButton: true,
+      searchFloor: this.minTermLength,
+      searchResultLimit: 10,
+      shouldSort: false,
+      fuseOptions: {
+        threshold: 0.3 // Strict search
+      },
+      noResultsText: Joomla.Text._('JGLOBAL_SELECT_NO_RESULTS_MATCH', 'No results found'),
+      noChoicesText: Joomla.Text._('JGLOBAL_SELECT_NO_RESULTS_MATCH', 'No results found'),
+      itemSelectText: Joomla.Text._('JGLOBAL_SELECT_PRESS_TO_SELECT', 'Press to select'),
+
+      // Redefine some classes
+      classNames: {
+        button: 'choices__button_joomla' // It is need because an original styling use unavailable Icon.svg file
+      }
+    });
+
+    // Handle typing of custom term
+    if (this.allowCustom) {
+      this.addEventListener('keydown', (event) => {
+        if (event.keyCode !== this.keyCode.ENTER || event.target !== this.choicesInstance.input) {
+          return;
+        }
+        event.preventDefault();
+
+        if (this.choicesInstance.highlightPosition || !event.target.value || this.choicesCache[event.target.value]) {
+          return;
+        }
+
+        // Make sure nothing is highlighted
+        const highlighted = this.choicesInstance.dropdown.querySelector(`.${this.choicesInstance.config.classNames.highlightedState}`);
+        if (highlighted) {
+          return;
+        };
+
+        this.choicesInstance.setChoices([{
+          value: this.newItemPrefix + event.target.value,
+          label: event.target.value,
+          selected: true,
+          customProperties: {
+            value: event.target.value // Store real value, just in case
+          }
+        }], 'value', 'label', false);
+
+        this.choicesCache[event.target.value] = event.target.value;
+
+        event.target.value = null;
+        this.choicesInstance.hideDropdown();
+
+        return false;
+      });
+    }
+
+    // Handle remote search
+    if (this.remoteSearch && this.url) {
+      // Cache existing
+      this.choicesInstance.presetChoices.forEach((choiceItem) => {
+        this.choicesCache[choiceItem.value] = choiceItem.label;
+      });
+
+      const lookupDelay = 300;
+      let lookupTimeout = null;
+      this.select.addEventListener('search', (event) => {
+        clearTimeout(lookupTimeout);
+        lookupTimeout = setTimeout(this.requestLookup.bind(this), lookupDelay);
+      });
+    }
+  }
+
+  /**
+   * Lifecycle
+   */
+  disconnectedCallback() {
+    // Destroy Choices instance, to unbind event listeners
+    if (this.choicesInstance) {
+      this.choicesInstance.destroy();
+      this.choicesInstance = null;
+    }
+    if (this.activeXHR) {
+      this.activeXHR.abort();
+      this.activeXHR = null;
+    }
+  }
+
+  requestLookup() {
+    let url = this.url;
+    url += (url.indexOf('?') === -1 ? '?' : '&');
+    url += `${encodeURIComponent(this.termKey)}=${encodeURIComponent(this.choicesInstance.input.value)}`;
+
+    // Stop previous request if any
+    if (this.activeXHR) {
+      this.activeXHR.abort();
+    }
+
+    this.activeXHR = Joomla.request({
+      url: url,
+      onSuccess: (response) => {
+        this.activeXHR = null;
+        const items = response ? JSON.parse(response) : [];
+        if (!items.length) {
+          return;
+        }
+
+        // Remove duplications
+        items.forEach((item, index) => {
+          if (this.choicesCache[item.value]) {
+            items.splice(index, 1);
+          }
+        });
+
+        // Add new options to field, assume that each item is object, eg {value: "foo", text: "bar"}
+        if (items.length) {
+          this.choicesInstance.setChoices(items, 'value', 'text', false);
+        }
+      },
+      onError: () => {
+        this.activeXHR = null;
+      }
+    });
+  }
+
+});
diff --git a/build/media/webcomponents/js/field-media/field-media.js b/build/media_source/system/js/fields/joomla-field-media.w-c.es6.js
similarity index 70%
rename from build/media/webcomponents/js/field-media/field-media.js
rename to build/media_source/system/js/fields/joomla-field-media.w-c.es6.js
index 996a587f58e59..18c10337911db 100644
--- a/build/media/webcomponents/js/field-media/field-media.js
+++ b/build/media_source/system/js/fields/joomla-field-media.w-c.es6.js
@@ -1,4 +1,4 @@
-((customElements, Joomla) => {
+((Joomla) => {
   if (!Joomla) {
     throw new Error('Joomla API is not properly initiated');
   }
@@ -13,29 +13,26 @@
     if (resp.success === true) {
       if (resp.data[0].url) {
         if (/local-/.test(resp.data[0].adapter)) {
-          const server = Joomla.getOptions('system.paths').rootFull;
+          const { rootFull } = Joomla.getOptions('system.paths');
 
-          Joomla.selectedFile.url = resp.data[0].url.split(server)[1];
+          // eslint-disable-next-line prefer-destructuring
+          Joomla.selectedFile.url = resp.data[0].url.split(rootFull)[1];
           if (resp.data[0].thumb_path) {
             Joomla.selectedFile.thumb = resp.data[0].thumb_path;
           } else {
             Joomla.selectedFile.thumb = false;
           }
-        } else {
-          if (resp.data[0].thumb_path) {
-            Joomla.selectedFile.thumb = resp.data[0].thumb_path;
-          }
+        } else if (resp.data[0].thumb_path) {
+          Joomla.selectedFile.thumb = resp.data[0].thumb_path;
         }
       } else {
         Joomla.selectedFile.url = false;
       }
 
-      const isElement = (o) => {
-        return (
-          typeof HTMLElement === 'object' ? o instanceof HTMLElement :
-            o && typeof o === 'object' && o !== null && o.nodeType === 1 && typeof o.nodeName === 'string'
-        );
-      };
+      const isElement = o => (
+        typeof HTMLElement === 'object' ? o instanceof HTMLElement
+          : o && typeof o === 'object' && o !== null && o.nodeType === 1 && typeof o.nodeName === 'string'
+      );
 
       if (Joomla.selectedFile.url) {
         if (!isElement(editor) && (typeof editor !== 'object')) {
@@ -57,102 +54,140 @@
    *
    * @returns {void}
    */
-  Joomla.getImage = (data, editor, fieldClass) => {
-    return new Promise((resolve, reject) => {
-      const apiBaseUrl = `${Joomla.getOptions('system.paths').rootFull}administrator/index.php?option=com_media&format=json`;
-
-      Joomla.request({
-        url: `${apiBaseUrl}&task=api.files&url=true&path=${data.path}&${Joomla.getOptions('csrf.token')}=1&format=json`,
-        method: 'GET',
-        perform: true,
-        headers: { 'Content-Type': 'application/json' },
-        onSuccess: (response) => {
-          const resp = JSON.parse(response);
-          resolve(Joomla.doIt(resp, editor, fieldClass));
-        },
-        onError: () => {
-          reject();
-        },
-      });
+  Joomla.getImage = (data, editor, fieldClass) => new Promise((resolve, reject) => {
+    const apiBaseUrl = `${Joomla.getOptions('system.paths').rootFull}administrator/index.php?option=com_media&format=json`;
+
+    Joomla.request({
+      url: `${apiBaseUrl}&task=api.files&url=true&path=${data.path}&${Joomla.getOptions('csrf.token')}=1&format=json`,
+      method: 'GET',
+      perform: true,
+      headers: { 'Content-Type': 'application/json' },
+      onSuccess: (response) => {
+        const resp = JSON.parse(response);
+        resolve(Joomla.doIt(resp, editor, fieldClass));
+      },
+      onError: () => {
+        reject();
+      },
     });
-  };
+  });
+})(Joomla);
 
+
+((customElements, Joomla) => {
   class JoomlaFieldMedia extends HTMLElement {
+    constructor() {
+      super();
+
+      this.onSelected = this.onSelected.bind(this);
+      this.show = this.show.bind(this);
+      this.clearValue = this.clearValue.bind(this);
+    }
+
     static get observedAttributes() {
       return ['type', 'base-path', 'root-folder', 'url', 'modal-container', 'modal-width', 'modal-height', 'input', 'button-select', 'button-clear', 'button-save-selected', 'preview', 'preview-width', 'preview-height'];
     }
 
     get type() { return this.getAttribute('type'); }
+
     set type(value) { this.setAttribute('type', value); }
+
     get basePath() { return this.getAttribute('base-path'); }
+
     set basePath(value) { this.setAttribute('base-path', value); }
+
     get rootFolder() { return this.getAttribute('root-folder'); }
+
     set rootFolder(value) { this.setAttribute('root-folder', value); }
+
     get url() { return this.getAttribute('url'); }
+
     set url(value) { this.setAttribute('url', value); }
+
     get modalContainer() { return this.getAttribute('modal-container'); }
+
     set modalContainer(value) { this.setAttribute('modal-container', value); }
+
     get input() { return this.getAttribute('input'); }
+
     set input(value) { this.setAttribute('input', value); }
+
     get buttonSelect() { return this.getAttribute('button-select'); }
+
     set buttonSelect(value) { this.setAttribute('button-select', value); }
+
     get buttonClear() { return this.getAttribute('button-clear'); }
+
     set buttonClear(value) { this.setAttribute('button-clear', value); }
+
     get buttonSaveSelected() { return this.getAttribute('button-save-selected'); }
+
     set buttonSaveSelected(value) { this.setAttribute('button-save-selected', value); }
+
     get modalWidth() { return this.getAttribute(parseInt('modal-width', 10)); }
+
     set modalWidth(value) { this.setAttribute('modal-width', value); }
+
     get modalHeight() { return this.getAttribute(parseInt('modal-height', 10)); }
+
     set modalHeight(value) { this.setAttribute('modal-height', value); }
+
     get previewWidth() { return this.getAttribute(parseInt('preview-width', 10)); }
+
     set previewWidth(value) { this.setAttribute('preview-width', value); }
+
     get previewHeight() { return this.getAttribute(parseInt('preview-height', 10)); }
+
     set previewHeight(value) { this.setAttribute('preview-height', value); }
+
     get preview() { return this.getAttribute('preview'); }
+
     set preview(value) { this.setAttribute('preview', value); }
+
     get previewContainer() { return this.getAttribute('preview-container'); }
 
     // attributeChangedCallback(attr, oldValue, newValue) {}
 
     connectedCallback() {
-      const button = this.querySelector(this.buttonSelect);
-      const buttonClear = this.querySelector(this.buttonClear);
+      this.button = this.querySelector(this.buttonSelect);
+      this.buttonClearEl = this.querySelector(this.buttonClear);
       this.show = this.show.bind(this);
       this.modalClose = this.modalClose.bind(this);
       this.clearValue = this.clearValue.bind(this);
       this.setValue = this.setValue.bind(this);
       this.updatePreview = this.updatePreview.bind(this);
 
-      button.addEventListener('click', this.show);
+      this.button.addEventListener('click', this.show);
 
-      if (buttonClear) {
-        buttonClear.addEventListener('click', this.clearValue);
+      if (this.buttonClearEl) {
+        this.buttonClearEl.addEventListener('click', this.clearValue);
       }
 
       this.updatePreview();
     }
 
     disconnectedCallback() {
-      const button = this.querySelector(this.buttonClear);
-      button.removeEventListener('click', this);
+      if (this.button) {
+        this.button.removeEventListener('click', this.show);
+      }
+      if (this.buttonClear) {
+        this.buttonClear.removeEventListener('click', this.clearValue);
+      }
     }
 
-    show() {
-      const self = this;
-
-      this.querySelector('[role="dialog"]').open();
+    onSelected(event) {
+      // event.target.removeEventListener('click', this.onSelected);
+      event.preventDefault();
+      event.stopPropagation();
 
-      this.querySelector(this.buttonSaveSelected).addEventListener('click', (e) => {
-        e.preventDefault();
-        e.stopPropagation();
+      this.modalClose();
+      return false;
+    }
 
-        if (this.selectedPath) {
-          self.setValue(this.selectedPath);
-        }
+    show() {
+      this.querySelector('[role="dialog"]').open();
 
-        self.modalClose();
-        return false;
-      });
+      this.querySelector(this.buttonSaveSelected).addEventListener('click', this.onSelected);
     }
 
     modalClose() {
@@ -179,18 +214,19 @@
       // Reset preview
       if (this.preview) {
         const input = this.querySelector(this.input);
-        const value = input.value;
+        const { value } = input;
         const div = this.querySelector('.field-media-preview');
 
         if (!value) {
-          div.innerHTML = '<span class="field-media-preview-icon fa fa-picture-o"></span>';
+          div.innerHTML = '<span class="field-media-preview-icon"></span>';
         } else {
           div.innerHTML = '';
           const imgPreview = new Image();
 
           switch (this.type) {
             case 'image':
-              imgPreview.src = imgPreview.src = /http/.test(value) ? value : Joomla.getOptions('system.paths').rootFull + value;
+              imgPreview.src = /http/.test(value) ? value : Joomla.getOptions('system.paths').rootFull + value;
+              imgPreview.setAttribute('alt', '');
               break;
             default:
               // imgPreview.src = dummy image path;
diff --git a/build/media_source/system/js/fields/joomla-field-module-order.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-module-order.w-c.es6.js
new file mode 100644
index 0000000000000..35e98d300d45f
--- /dev/null
+++ b/build/media_source/system/js/fields/joomla-field-module-order.w-c.es6.js
@@ -0,0 +1,129 @@
+/**
+ * @package         Joomla.JavaScript
+ * @copyright       Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license         GNU General Public License version 2 or later; see LICENSE.txt
+ */
+customElements.define('joomla-field-module-order', class extends HTMLElement {
+  constructor() {
+    super();
+
+    this.linkedFieldSelector = '';
+    this.linkedFieldElement = '';
+    this.originalPosition = '';
+
+    this.writeDynaList.bind(this);
+    this.getNewOrder.bind(this);
+  }
+
+  connectedCallback() {
+    this.linkedFieldSelector = this.getAttribute('data-linked-field') || 'jform_position';
+
+    if (!this.linkedFieldSelector) {
+      throw new Error('No linked field defined!');
+    }
+
+    this.linkedFieldElement = document.getElementById(this.linkedFieldSelector);
+
+    if (!this.linkedFieldElement) {
+      throw new Error('No linked field defined!');
+    }
+
+    const that = this;
+    this.originalPosition = this.linkedFieldElement.value;
+
+    /** Initialize the field * */
+    this.getNewOrder(this.originalPosition);
+
+    /** Watch for changes on the linked field * */
+    this.linkedFieldElement.addEventListener('change', () => {
+      that.originalPosition = that.linkedFieldElement.value;
+      that.getNewOrder(that.linkedFieldElement.value);
+    });
+  }
+
+  writeDynaList(selectProperties, source, originalPositionName, originalPositionValue) {
+    let i = 0;
+    const selectNode = document.createElement('select');
+    if (this.hasOwnProperty('disabled')) {
+      selectNode.setAttribute('disabled', '');
+    }
+
+    if (this.getAttribute('onchange')) {
+      selectNode.setAttribute('onchange', this.getAttribute('onchange'));
+    }
+
+    if (this.getAttribute('size')) {
+      selectNode.setAttribute('size', this.getAttribute('size'));
+    }
+
+    selectNode.classList.add(selectProperties.itemClass);
+    selectNode.setAttribute('name', selectProperties.name);
+    selectNode.id = selectProperties.id;
+
+    for (const x in source) {
+      if (!source.hasOwnProperty(x)) {
+        continue;
+      }
+
+      const node = document.createElement('option');
+      const item = source[x];
+
+      node.value = item[1];
+      node.innerHTML = item[2];
+
+      if ((originalPositionName && originalPositionValue === item[1]) || (!originalPositionName && i === 0)) {
+        node.setAttribute('selected', 'selected');
+      }
+
+      selectNode.appendChild(node);
+      i++;
+    }
+
+    this.innerHTML = '';
+    this.appendChild(selectNode);
+  }
+
+  getNewOrder(originalPosition) {
+    const url = this.getAttribute('data-url');
+    const clientId = this.getAttribute('data-client-id');
+    const originalOrder = this.getAttribute('data-ordering');
+    const name = this.getAttribute('data-name');
+    const attr = this.getAttribute('data-client-attr') ? this.getAttribute('data-client-attr') : 'custom-select';
+    const id = `${this.getAttribute('id')}_1`;
+    const orders = [];
+    const that = this;
+
+    Joomla.request({
+      url: `${url}&client_id=${clientId}&position=${originalPosition}`,
+      method: 'GET',
+      perform: true,
+      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      onSuccess(response, xhr) {
+        if (response) {
+          response = JSON.parse(response);
+
+          /** Check if everything is OK * */
+          if (response.data.length > 0) {
+            for (let i = 0; i < response.data.length; ++i) {
+              orders[i] = response.data[i].split(',');
+            }
+
+            that.writeDynaList({
+              name,
+              id,
+              itemClass: attr,
+            },
+            orders,
+            that.originalPosition,
+            originalOrder);
+          }
+        }
+
+        /** Render messages, if any. There are only message in case of errors. * */
+        if (typeof response.messages === 'object' && response.messages !== null) {
+          Joomla.renderMessages(response.messages);
+        }
+      },
+    });
+  }
+});
diff --git a/build/media_source/system/js/fields/joomla-field-permissions.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-permissions.w-c.es6.js
new file mode 100644
index 0000000000000..69ccdcf71446b
--- /dev/null
+++ b/build/media_source/system/js/fields/joomla-field-permissions.w-c.es6.js
@@ -0,0 +1,176 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+window.customElements.define('joomla-field-permissions', class extends HTMLElement {
+  constructor() {
+    super();
+
+    if (!Joomla) {
+      throw new Error('Joomla API is not properly initiated');
+    }
+
+    if (!this.getAttribute('data-uri')) {
+      throw new Error('No valid url for validation');
+    }
+
+    this.query = window.location.search.substring(1);
+    this.buttons = '';
+    this.buttonDataSelector = 'data-onchange-task';
+    this.onDropdownChange = this.onDropdownChange.bind(this);
+    this.getUrlParam = this.getUrlParam.bind(this);
+
+    this.component = this.getUrlParam('component');
+    this.extension = this.getUrlParam('extension');
+    this.option = this.getUrlParam('option');
+    this.view = this.getUrlParam('view');
+    this.title = this.component;
+    this.asset = 'not';
+    this.context = '';
+  }
+
+  /**
+   * Lifecycle
+   */
+  connectedCallback() {
+    this.buttons = [].slice.call(document.querySelectorAll(`[${this.buttonDataSelector}]`));
+    if (this.buttons) {
+      this.buttons.forEach((button) => {
+        button.addEventListener('change', this.onDropdownChange);
+      });
+    }
+  }
+
+  /**
+   * Lifecycle
+   */
+  disconnectedCallback() {
+    if (this.buttons) {
+      this.buttons.forEach((button) => {
+        button.removeEventListener('change', this.onDropdownChange);
+      });
+    }
+  }
+
+  /**
+   * Lifecycle
+   */
+  onDropdownChange(event) {
+    event.preventDefault();
+    const task = event.target.getAttribute(this.buttonDataSelector);
+    if (task === 'permissions.apply') {
+      this.sendPermissions(event);
+    }
+  }
+
+  sendPermissions(event) {
+    const { target } = event;
+
+    // Set the icon while storing the values
+    const icon = document.getElementById(`icon_${target.id}`);
+    icon.removeAttribute('class');
+    icon.setAttribute('class', 'joomla-icon joomla-field-permissions__spinner');
+
+    // Get values add prepare GET-Parameter
+    const { value } = target;
+
+    if (document.getElementById('jform_context')) {
+      this.context = document.getElementById('jform_context').value;
+      [this.context] = this.context.split('.');
+    }
+
+    if (this.option === 'com_config' && !this.component && !this.extension) {
+      this.asset = 'root.1';
+    } else if (!this.extension && this.view === 'component') {
+      this.asset = this.component;
+    } else if (this.context) {
+      if (this.view === 'group') {
+        this.asset = `${this.context}.fieldgroup.${this.getUrlParam('id')}`;
+      } else {
+        this.asset = `${this.context}.field.{this.getUrlParam('id')}`;
+      }
+      this.title = document.getElementById('jform_title').value;
+    } else if (this.extension && this.view) {
+      this.asset = `${this.extension}.${this.view}.${this.getUrlParam('id')}`;
+      this.title = document.getElementById('jform_title').value;
+    } else if (!this.extension && this.view) {
+      this.asset = `${this.option}.${this.view}.${this.getUrlParam('id')}`;
+      this.title = document.getElementById('jform_title').value;
+    }
+
+    const id = target.id.replace('jform_rules_', '');
+    const lastUnderscoreIndex = id.lastIndexOf('_');
+
+    const permissionData = {
+      comp: this.asset,
+      action: id.substring(0, lastUnderscoreIndex),
+      rule: id.substring(lastUnderscoreIndex + 1),
+      value,
+      title: this.title,
+    };
+
+    // Remove JS messages, if they exist.
+    Joomla.removeMessages();
+
+    // Ajax request
+    Joomla.request({
+      url: this.getAttribute('data-uri'),
+      method: 'POST',
+      data: JSON.stringify(permissionData),
+      perform: true,
+      headers: { 'Content-Type': 'application/json' },
+      onSuccess: (data) => {
+        let response;
+
+        try {
+          response = JSON.parse(data);
+        } catch (e) {
+          console.log(e);
+        }
+
+        icon.removeAttribute('class');
+
+        // Check if everything is OK
+        if (response.data && response.data.result) {
+          icon.setAttribute('class', 'joomla-icon joomla-field-permissions__allowed');
+
+          const badgeSpan = target.parentNode.parentNode.nextElementSibling.querySelector('span');
+          badgeSpan.removeAttribute('class');
+          badgeSpan.setAttribute('class', response.data.class);
+          badgeSpan.innerHTML = response.data.text;
+        }
+
+        // Render messages, if any. There are only message in case of errors.
+        if (typeof response.messages === 'object' && response.messages !== null) {
+          Joomla.renderMessages(response.messages);
+
+          if (response.data && response.data.result) {
+            icon.setAttribute('class', 'joomla-icon joomla-field-permissions__allowed');
+          } else {
+            icon.setAttribute('class', 'joomla-icon joomla-field-permissions__denied');
+          }
+        }
+      },
+      onError: (xhr) => {
+        // Remove the spinning icon.
+        icon.removeAttribute('style');
+
+        Joomla.renderMessages(Joomla.ajaxErrorsMessages(xhr, xhr.statusText));
+        icon.setAttribute('class', 'joomla-icon joomla-field-permissions__denied');
+      },
+    });
+  }
+
+  getUrlParam(variable) {
+    const vars = this.query.split('&');
+    let i = 0;
+
+    for (i; i < vars.length; i += 1) {
+      const pair = vars[i].split('=');
+      if (pair[0] === variable) {
+        return pair[1];
+      }
+    }
+    return false;
+  }
+});
diff --git a/build/media_source/system/js/fields/joomla-field-send-test-mail.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-send-test-mail.w-c.es6.js
new file mode 100644
index 0000000000000..c55024f076d66
--- /dev/null
+++ b/build/media_source/system/js/fields/joomla-field-send-test-mail.w-c.es6.js
@@ -0,0 +1,62 @@
+((customElements, Joomla) => {
+  class JoomlaFieldSendTestMail extends HTMLElement {
+    // attributeChangedCallback(attr, oldValue, newValue) {}
+    constructor() {
+      super();
+
+      if (!Joomla) {
+        throw new Error('Joomla API is not properly initiated');
+      }
+
+      if (!this.getAttribute('uri')) {
+        throw new Error('No valid url for validation');
+      }
+    }
+
+    connectedCallback() {
+      const self = this;
+      const button = document.getElementById('sendtestmail');
+
+      if (button) {
+        button.addEventListener('click', () => { self.sendTestMail(self); });
+      }
+    }
+
+    sendTestMail() {
+      const email_data = {
+        smtpauth: document.getElementById("jform_smtpauth1").checked ? 1 : 0,
+        smtpuser: this.querySelector('[name="jform[smtpuser]"]').value,
+        smtppass: this.querySelector('[name="jform[smtppass]"]').value,
+        smtphost: this.querySelector('[name="jform[smtphost]"]').value,
+        smtpsecure: this.querySelector('[name="jform[smtpsecure]"]').value,
+        smtpport: this.querySelector('[name="jform[smtpport]"]').value,
+        mailfrom: this.querySelector('[name="jform[mailfrom]"]').value,
+        fromname: this.querySelector('[name="jform[fromname]"]').value,
+        mailer: this.querySelector('[name="jform[mailer]"]').value,
+        mailonline: document.getElementById("jform_mailonline1").checked ? 1 : 0,
+      };
+
+      // Remove js messages, if they exist.
+      Joomla.removeMessages();
+
+      Joomla.request({
+        url: this.getAttribute('uri'),
+        method: 'POST',
+        data: JSON.stringify(email_data),
+        perform: true,
+        headers: { 'Content-Type': 'application/json' },
+        onSuccess: (response, xhr) => {
+          response = JSON.parse(response);
+          if (typeof response.messages === 'object' && response.messages !== null) {
+            Joomla.renderMessages(response.messages);
+          }
+        },
+        onError: (xhr) => {
+          Joomla.renderMessages(Joomla.ajaxErrorsMessages(xhr));
+        },
+      });
+    }
+  }
+
+  customElements.define('joomla-field-send-test-mail', JoomlaFieldSendTestMail);
+})(customElements, Joomla);
diff --git a/build/media_source/system/js/fields/joomla-field-simple-color.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-simple-color.w-c.es6.js
new file mode 100644
index 0000000000000..7939c51bac400
--- /dev/null
+++ b/build/media_source/system/js/fields/joomla-field-simple-color.w-c.es6.js
@@ -0,0 +1,424 @@
+/**
+ * Based on:
+ * Very simple jQuery Color Picker
+ * Copyright (C) 2012 Tanguy Krotoff
+ * Licensed under the MIT license
+ *
+ * ADAPTED BY: Dimitris Grammatikogiannis
+ *
+ */
+((customElements) => {
+  const KEYCODE = {
+    TAB: 9,
+    ESC: 27,
+  };
+
+  const colorNames = {
+    aliceblue: '#f0f8ff',
+    antiquewhite: '#faebd7',
+    aqua: '#00ffff',
+    aquamarine: '#7fffd4',
+    azure: '#f0ffff',
+    beige: '#f5f5dc',
+    bisque: '#ffe4c4',
+    black: '#000000',
+    blanchedalmond: '#ffebcd',
+    blue: '#0000ff',
+    blueviolet: '#8a2be2',
+    brown: '#a52a2a',
+    burlywood: '#deb887',
+    cadetblue: '#5f9ea0',
+    chartreuse: '#7fff00',
+    chocolate: '#d2691e',
+    coral: '#ff7f50',
+    cornflowerblue: '#6495ed',
+    cornsilk: '#fff8dc',
+    crimson: '#dc143c',
+    cyan: '#00ffff',
+    darkblue: '#00008b',
+    darkcyan: '#008b8b',
+    darkgoldenrod: '#b8860b',
+    darkgray: '#a9a9a9',
+    darkgreen: '#006400',
+    darkgrey: '#a9a9a9',
+    darkkhaki: '#bdb76b',
+    darkmagenta: '#8b008b',
+    darkolivegreen: '#556b2f',
+    darkorange: '#ff8c00',
+    darkorchid: '#9932cc',
+    darkred: '#8b0000',
+    darksalmon: '#e9967a',
+    darkseagreen: '#8fbc8f',
+    darkslateblue: '#483d8b',
+    darkslategray: '#2f4f4f',
+    darkslategrey: '#2f4f4f',
+    darkturquoise: '#00ced1',
+    darkviolet: '#9400d3',
+    deeppink: '#ff1493',
+    deepskyblue: '#00bfff',
+    dimgray: '#696969',
+    dimgrey: '#696969',
+    dodgerblue: '#1e90ff',
+    firebrick: '#b22222',
+    floralwhite: '#fffaf0',
+    forestgreen: '#228b22',
+    fuchsia: '#ff00ff',
+    gainsboro: '#dcdcdc',
+    ghostwhite: '#f8f8ff',
+    gold: '#ffd700',
+    goldenrod: '#daa520',
+    gray: '#808080',
+    green: '#008000',
+    greenyellow: '#adff2f',
+    grey: '#808080',
+    honeydew: '#f0fff0',
+    hotpink: '#ff69b4',
+    indianred: '#cd5c5c',
+    indigo: '#4b0082',
+    ivory: '#fffff0',
+    khaki: '#f0e68c',
+    lavender: '#e6e6fa',
+    lavenderblush: '#fff0f5',
+    lawngreen: '#7cfc00',
+    lemonchiffon: '#fffacd',
+    lightblue: '#add8e6',
+    lightcoral: '#f08080',
+    lightcyan: '#e0ffff',
+    lightgoldenrodyellow: '#fafad2',
+    lightgray: '#d3d3d3',
+    lightgreen: '#90ee90',
+    lightgrey: '#d3d3d3',
+    lightpink: '#ffb6c1',
+    lightsalmon: '#ffa07a',
+    lightseagreen: '#20b2aa',
+    lightskyblue: '#87cefa',
+    lightslategray: '#778899',
+    lightslategrey: '#778899',
+    lightsteelblue: '#b0c4de',
+    lightyellow: '#ffffe0',
+    lime: '#00ff00',
+    limegreen: '#32cd32',
+    linen: '#faf0e6',
+    magenta: '#ff00ff',
+    maroon: '#800000',
+    mediumaquamarine: '#66cdaa',
+    mediumblue: '#0000cd',
+    mediumorchid: '#ba55d3',
+    mediumpurple: '#9370db',
+    mediumseagreen: '#3cb371',
+    mediumslateblue: '#7b68ee',
+    mediumspringgreen: '#00fa9a',
+    mediumturquoise: '#48d1cc',
+    mediumvioletred: '#c71585',
+    midnightblue: '#191970',
+    mintcream: '#f5fffa',
+    mistyrose: '#ffe4e1',
+    moccasin: '#ffe4b5',
+    navajowhite: '#ffdead',
+    navy: '#000080',
+    oldlace: '#fdf5e6',
+    olive: '#808000',
+    olivedrab: '#6b8e23',
+    orange: '#ffa500',
+    orangered: '#ff4500',
+    orchid: '#da70d6',
+    palegoldenrod: '#eee8aa',
+    palegreen: '#98fb98',
+    paleturquoise: '#afeeee',
+    palevioletred: '#db7093',
+    papayawhip: '#ffefd5',
+    peachpuff: '#ffdab9',
+    peru: '#cd853f',
+    pink: '#ffc0cb',
+    plum: '#dda0dd',
+    powderblue: '#b0e0e6',
+    purple: '#800080',
+    red: '#ff0000',
+    rosybrown: '#bc8f8f',
+    royalblue: '#4169e1',
+    saddlebrown: '#8b4513',
+    salmon: '#fa8072',
+    sandybrown: '#f4a460',
+    seagreen: '#2e8b57',
+    seashell: '#fff5ee',
+    sienna: '#a0522d',
+    silver: '#c0c0c0',
+    skyblue: '#87ceeb',
+    slateblue: '#6a5acd',
+    slategray: '#708090',
+    slategrey: '#708090',
+    snow: '#fffafa',
+    springgreen: '#00ff7f',
+    steelblue: '#4682b4',
+    tan: '#d2b48c',
+    teal: '#008080',
+    thistle: '#d8bfd8',
+    tomato: '#ff6347',
+    turquoise: '#40e0d0',
+    violet: '#ee82ee',
+    wheat: '#f5deb3',
+    white: '#ffffff',
+    whitesmoke: '#f5f5f5',
+    yellow: '#ffff00',
+    yellowgreen: '#9acd32',
+  };
+
+  class JoomlaFieldSimpleColor extends HTMLElement {
+    constructor() {
+      super();
+
+      // Define some variables
+      this.select = '';
+      this.options = [];
+      this.icon = '';
+      this.panel = '';
+      this.buttons = [];
+      this.focusableElements = null;
+      this.focusableSelectors = [
+        'a[href]',
+        'area[href]',
+        'input:not([disabled])',
+        'select:not([disabled])',
+        'textarea:not([disabled])',
+        'button:not([disabled])',
+        'iframe',
+        'object',
+        'embed',
+        '[contenteditable]',
+        '[tabindex]:not([tabindex^="-"])'];
+    }
+
+    connectedCallback() {
+      this.select = this.querySelector('select');
+
+      if (!this.select) {
+        throw new Error('Simple color field requires a select element');
+      }
+
+      this.options = [].slice.call(this.select.querySelectorAll('option'));
+
+      this.select.classList.add('hidden');
+
+      // Build the pop up
+      this.options.forEach((option) => {
+        let color = option.value;
+        let clss = 'swatch';
+
+        if (color === 'none') {
+          clss += ' nocolor';
+          color = 'transparent';
+        }
+        if (option.selected) {
+          clss += ' active';
+        }
+
+        const el = document.createElement('button');
+        el.setAttribute('class', clss);
+        el.style.backgroundColor = color;
+        el.setAttribute('type', 'button');
+        const a11yColor = color === 'transparent' ? this.textTransp : this.getColorName(color);
+        el.innerHTML = `<span class="sr-only">${a11yColor}</span>`;
+
+        this.buttons.push(el);
+      });
+
+      // Add a close button
+      const close = document.createElement('button');
+      close.setAttribute('class', 'btn-close');
+      close.setAttribute('type', 'button');
+      close.innerHTML = this.textClose;
+
+      this.buttons.push(close);
+
+      let color = this.select.value;
+      let clss = '';
+
+      if (color === 'none') {
+        clss += ' nocolor';
+        color = 'transparent';
+      }
+
+      this.icon = document.createElement('button');
+
+      if (clss) {
+        this.icon.setAttribute('class', clss);
+      }
+
+      const uniqueId = `simple-color-${Math.random().toString(36).substr(2, 10)}`;
+      this.icon.setAttribute('type', 'button');
+      this.icon.setAttribute('tabindex', '0');
+      this.icon.style.backgroundColor = color;
+      this.icon.innerHTML = `<span class="sr-only">${this.textSelect}</span>`;
+      this.icon.id = uniqueId;
+      this.select.insertAdjacentElement('beforebegin', this.icon);
+      this.icon.addEventListener('click', this.show.bind(this));
+
+      this.panel = document.createElement('div');
+      this.panel.classList.add('simplecolors-panel');
+      this.panel.setAttribute('aria-labelledby', uniqueId);
+      this.hide = this.hide.bind(this);
+      this.colorSelect = this.colorSelect.bind(this);
+
+      this.buttons.forEach((el) => {
+        if (el.classList.contains('btn-close')) {
+          el.addEventListener('click', this.hide);
+        } else {
+          el.addEventListener('click', this.colorSelect);
+        }
+
+        this.panel.insertAdjacentElement('beforeend', el);
+      });
+
+      this.appendChild(this.panel);
+
+      this.focusableElements = [].slice.call(this.panel.querySelectorAll(this.focusableSelectors.join()));
+
+      this.keys = this.keys.bind(this);
+      this.hide = this.hide.bind(this);
+      this.mousedown = this.mousedown.bind(this);
+    }
+
+    disconnectedCallback() {
+
+    }
+
+    static get observedAttributes() {
+      return ['text-select', 'text-color', 'text-close', 'text-transparent'];
+    }
+
+    get textSelect() { return this.getAttribute('text-select'); }
+
+    get textColor() { return this.getAttribute('text-color'); }
+
+    get textClose() { return this.getAttribute('text-close'); }
+
+    get textTransp() { return this.getAttribute('text-transparent'); }
+
+    // Show the panel
+    show() {
+      document.addEventListener('mousedown', this.hide);
+      this.addEventListener('keydown', this.keys);
+      this.panel.addEventListener('mousedown', this.mousedown);
+      this.panel.setAttribute('data-open', '');
+
+      const focused = this.panel.querySelector('button');
+
+      if (focused) {
+        focused.focus();
+      }
+    }
+
+    // Hide panel
+    hide() {
+      document.removeEventListener('mousedown', this.hide, false);
+      this.removeEventListener('keydown', this.keys);
+
+      if (this.panel.hasAttribute('data-open')) {
+        this.panel.removeAttribute('data-open');
+      }
+
+      this.icon.focus();
+    }
+
+    colorSelect(e) {
+      let color = '';
+      let bgcolor = '';
+      let clss = '';
+
+      if (e.target.classList.contains('nocolor')) {
+        color = 'none';
+        bgcolor = 'transparent';
+        clss = 'nocolor';
+      } else {
+        color = this.rgb2hex(e.target.style.backgroundColor);
+        bgcolor = color;
+      }
+
+      // Reset the active class
+      this.buttons.forEach((el) => {
+        if (el.classList.contains('active')) {
+          el.classList.remove('active');
+        }
+      });
+
+      // Add the active class to the selected button
+      e.target.classList.add('active');
+
+      this.icon.classList.remove('nocolor');
+      this.icon.setAttribute('class', clss);
+      this.icon.style.backgroundColor = bgcolor;
+
+      // Hide the panel
+      this.hide();
+
+      // Change select value
+      this.options.forEach((el) => {
+        if (el.selected) {
+          el.removeAttribute('selected');
+        }
+
+        if (el.value === bgcolor) {
+          el.setAttribute('selected', '');
+        }
+      });
+    }
+
+    keys(e) {
+      if (e.keyCode === KEYCODE.ESC) {
+        this.hide();
+      }
+
+      if (e.keyCode === KEYCODE.TAB) {
+        // Get the index of the current active element
+        const focusedIndex = this.focusableElements.indexOf(document.activeElement);
+
+        // If first element is focused and shiftkey is in use, focus last item within modal
+        if (e.shiftKey && (focusedIndex === 0 || focusedIndex === -1)) {
+          this.focusableElements[this.focusableElements.length - 1].focus();
+          e.preventDefault();
+        }
+        // If last element is focused and shiftkey is not in use, focus first item within modal
+        if (!e.shiftKey && focusedIndex === this.focusableElements.length - 1) {
+          this.focusableElements[0].focus();
+          e.preventDefault();
+        }
+      }
+    }
+
+    // Prevents the mousedown event from "eating" the click event.
+    mousedown(e) {
+      e.stopPropagation();
+      e.preventDefault();
+    }
+
+    getColorName(value) {
+      // Expand any short code
+      let newValue = value;
+      if (value.length === 4) {
+        const tmpValue = value.split('');
+        newValue = tmpValue[0] + tmpValue[1] + tmpValue[1] + tmpValue[2] + tmpValue[2] + tmpValue[3] + tmpValue[3];
+      }
+
+      for (const color in colorNames) {
+        if (colorNames.hasOwnProperty(color) && newValue.toLowerCase() === colorNames[color]) {
+          return color;
+        }
+      }
+
+      return `${this.textColor} ${value.replace('#', '').split('').join(', ')}`;
+    }
+
+    /**
+		 * Converts a RGB color to its hexadecimal value.
+		 * See http://stackoverflow.com/questions/1740700/get-hex-value-rather-than-rgb-value-using-$
+		 */
+    rgb2hex(rgb) {
+      const hex = x => (`0${parseInt(x, 10).toString(16)}`).slice(-2);
+      const matches = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
+
+      return `#${hex(matches[1])}${hex(matches[2])}${hex(matches[3])}`;
+    }
+  }
+
+  customElements.define('joomla-field-simple-color', JoomlaFieldSimpleColor);
+})(customElements);
diff --git a/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
new file mode 100644
index 0000000000000..5f514d2b0536b
--- /dev/null
+++ b/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
@@ -0,0 +1,626 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+(function (customElements) {
+  'use strict';
+
+  const KEYCODE = {
+    SPACE: 32,
+    ESC: 27,
+    ENTER: 13,
+  };
+
+  // Find matchesFn with vendor prefix
+  let matchesFn = 'matches';
+  ['matches', 'msMatchesSelector'].some((fn) => {
+    if (typeof document.body[fn] === 'function') {
+      matchesFn = fn;
+      return true;
+    }
+    return false;
+  });
+
+  class JoomlaFieldSubform extends HTMLElement {
+    // Attribute getters
+    get buttonAdd() { return this.getAttribute('button-add'); }
+
+    get buttonRemove() { return this.getAttribute('button-remove'); }
+
+    get buttonMove() { return this.getAttribute('button-move'); }
+
+    get rowsContainer() { return this.getAttribute('rows-container'); }
+
+    get repeatableElement() { return this.getAttribute('repeatable-element'); }
+
+    get minimum() { return this.getAttribute('minimum'); }
+
+    get maximum() { return this.getAttribute('maximum'); }
+
+    get name() { return this.getAttribute('name'); }
+
+    set name(value) {
+      // Update the template
+      this.template = this.template.replace(new RegExp(` name="${this.name.replace(/[\[\]]/g, '\\$&')}`, 'g'), ` name="${value}`);
+
+      return this.setAttribute('name', value);
+    }
+
+    constructor() {
+      super();
+
+      const that = this;
+
+      // Get the rows container
+      this.containerWithRows = this;
+
+      if (this.rowsContainer) {
+        const allContainers = this.querySelectorAll(this.rowsContainer);
+
+        // Find closest, and exclude nested
+        for (let i = 0, l = allContainers.length; i < l; i++) {
+          if (closest(allContainers[i], 'joomla-field-subform') === this) {
+            this.containerWithRows = allContainers[i];
+            break;
+          }
+        }
+      }
+
+      // Last row number, help to avoid the name duplications
+      this.lastRowNum = this.getRows().length;
+
+      // Template for the repeating group
+      this.template = '';
+
+      // Prepare a row template, and find available field names
+      this.prepareTemplate();
+
+      // Bind buttons
+      if (this.buttonAdd || this.buttonRemove) {
+        this.addEventListener('click', (event) => {
+          let btnAdd = null; let
+            btnRem = null;
+
+          if (that.buttonAdd) {
+            btnAdd = event.target[matchesFn](that.buttonAdd) ? event.target : closest(event.target, that.buttonAdd);
+          }
+
+          if (that.buttonRemove) {
+            btnRem = event.target[matchesFn](that.buttonRemove) ? event.target : closest(event.target, that.buttonRemove);
+          }
+
+          // Check actine, with extra check for nested joomla-field-subform
+          if (btnAdd && closest(btnAdd, 'joomla-field-subform') === that) {
+            let row = closest(btnAdd, that.repeatableElement);
+            row = closest(row, 'joomla-field-subform') === that ? row : null;
+            that.addRow(row);
+            event.preventDefault();
+          } else if (btnRem && closest(btnRem, 'joomla-field-subform') === that) {
+            const row = closest(btnRem, that.repeatableElement);
+            that.removeRow(row);
+            event.preventDefault();
+          }
+        });
+
+        this.addEventListener('keydown', (event) => {
+          if (event.keyCode !== KEYCODE.SPACE) return;
+          const isAdd = that.buttonAdd && event.target[matchesFn](that.buttonAdd);
+          const isRem = that.buttonRemove && event.target[matchesFn](that.buttonRemove);
+
+          if ((isAdd || isRem) && closest(event.target, 'joomla-field-subform') === that) {
+            let row = closest(event.target, that.repeatableElement);
+            row = closest(row, 'joomla-field-subform') === that ? row : null;
+            if (isRem && row) {
+              that.removeRow(row);
+            } else if (isAdd) {
+              that.addRow(row);
+            }
+            event.preventDefault();
+          }
+        });
+      }
+
+      // Sorting
+      if (this.buttonMove) {
+        this.setUpDragSort();
+      }
+    }
+
+    /**
+         * Search for existing rows
+         * @returns {HTMLElement[]}
+         */
+    getRows() {
+      const rows = this.containerWithRows.children;
+
+
+      const matchesFn = document.body.msMatchesSelector ? 'msMatchesSelector' : 'matches';
+
+
+      const result = [];
+
+      // Filter out the rows
+      for (let i = 0, l = rows.length; i < l; i++) {
+        if (rows[i][matchesFn](this.repeatableElement)) {
+          result.push(rows[i]);
+        }
+      }
+
+      return result;
+    }
+
+    /**
+         * Prepare a row template
+         */
+    prepareTemplate() {
+      const tmplElement = [].slice.call(this.children).filter(el => el.classList.contains('subform-repeatable-template-section'));
+
+      if (tmplElement[0]) {
+        this.template = tmplElement[0].innerHTML;
+      }
+
+      if (!this.template) {
+        throw new Error('The row template are required to subform element to work');
+      }
+    }
+
+    /**
+         * Add new row
+         * @param {HTMLElement} after
+         * @returns {HTMLElement}
+         */
+    addRow(after) {
+      // Count how much we already have
+      const count = this.getRows().length;
+      if (count >= this.maximum) {
+        return null;
+      }
+
+      // Make a new row from the template
+      let tmpEl;
+      if (this.containerWithRows.nodeName === 'TBODY' || this.containerWithRows.nodeName === 'TABLE') {
+        tmpEl = document.createElement('tbody');
+      } else {
+        tmpEl = document.createElement('div');
+      }
+      tmpEl.innerHTML = this.template;
+      const row = tmpEl.children[0];
+
+      // Add to container
+      if (after) {
+        after.parentNode.insertBefore(row, after.nextSibling);
+      } else {
+        this.containerWithRows.append(row);
+      }
+
+      // Add dragable attributes
+      if (this.buttonMove) {
+        row.setAttribute('draggable', 'false');
+        row.setAttribute('aria-grabbed', 'false');
+        row.setAttribute('tabindex', '0');
+      }
+
+      // Marker that it is new
+      row.setAttribute('data-new', '1');
+      // Fix names and ids, and reset values
+      this.fixUniqueAttributes(row, count);
+
+      // Tell about the new row
+      this.dispatchEvent(new CustomEvent('subform-row-add', {
+        detail: { row },
+        bubbles: true,
+      }));
+
+      if (window.Joomla) {
+        Joomla.Event.dispatch(row, 'joomla:updated');
+      }
+
+      return row;
+    }
+
+    /**
+         * Remove the row
+         * @param {HTMLElement} row
+         */
+    removeRow(row) {
+      // Count how much we have
+      const count = this.getRows().length;
+      if (count <= this.minimum) {
+        return;
+      }
+
+      // Tell about the row will be removed
+      this.dispatchEvent(new CustomEvent('subform-row-remove', {
+        detail: { row },
+        bubbles: true,
+      }));
+
+      if (window.Joomla) {
+        Joomla.Event.dispatch(row, 'joomla:removed');
+      }
+
+      row.parentNode.removeChild(row);
+    }
+
+    /**
+         * Fix names ind id`s for field that in the row
+         * @param {HTMLElement} row
+         * @param {Number} count
+         */
+    fixUniqueAttributes(row, count) {
+      this.lastRowNum++;
+      count = count || 0;
+
+      const group = row.getAttribute('data-group');
+      // current group name
+
+      const basename = row.getAttribute('data-base-name');
+      // group base name, without count
+
+      const countnew = Math.max(this.lastRowNum, count);
+
+
+      const groupnew = basename + countnew; // new group name
+
+      this.lastRowNum = countnew + 1;
+      row.setAttribute('data-group', groupnew);
+
+      // Fix inputs that have a "name" attribute
+      let haveName = row.querySelectorAll('[name]');
+
+
+      const ids = {}; // Collect id for fix checkboxes and radio
+
+      // Filter out nested
+      haveName = [].slice.call(haveName).filter(el => closest(el, 'joomla-field-subform') === this);
+
+      for (let i = 0, l = haveName.length; i < l; i++) {
+        const $el = haveName[i];
+
+
+        const name = $el.getAttribute('name');
+
+
+        const id = name.replace(/(\[\]$)/g, '').replace(/(\]\[)/g, '__').replace(/\[/g, '_').replace(/\]/g, '');
+        // id from name
+
+        const nameNew = name.replace(`[${group}][`, `[${groupnew}][`);
+        // New name
+
+        let idNew = id.replace(group, groupnew);
+        // Count new id
+
+        let countMulti = 0;
+        // count for multiple radio/checkboxes
+
+        let forOldAttr = id; // Fix "for" in the labels
+
+        if ($el.type === 'checkbox' && name.match(/\[\]$/)) { // <input type="checkbox" name="name[]"> fix
+          // Recount id
+          countMulti = ids[id] ? ids[id].length : 0;
+          if (!countMulti) {
+            // Set the id for fieldset and group label
+            const fieldset = closest($el, 'fieldset.checkboxes');
+
+
+            const elLbl = row.querySelector(`label[for="${id}"]`);
+
+            if (fieldset) {
+              fieldset.setAttribute('id', idNew);
+            }
+
+            if (elLbl) {
+              elLbl.setAttribute('for', idNew);
+              elLbl.setAttribute('id', `${idNew}-lbl`);
+            }
+          }
+          forOldAttr += countMulti;
+          idNew += countMulti;
+        } else if ($el.type === 'radio') { // <input type="radio"> fix
+          // Recount id
+          countMulti = ids[id] ? ids[id].length : 0;
+          if (!countMulti) {
+            // Set the id for fieldset and group label
+            const fieldset = closest($el, 'fieldset.radio');
+
+
+            const elLbl = row.querySelector(`label[for="${id}"]`);
+
+            if (fieldset) {
+              fieldset.setAttribute('id', idNew);
+            }
+
+            if (elLbl) {
+              elLbl.setAttribute('for', idNew);
+              elLbl.setAttribute('id', `${idNew}-lbl`);
+            }
+          }
+          forOldAttr += countMulti;
+          idNew += countMulti;
+        }
+
+        // Cache already used id
+        if (ids[id]) {
+          ids[id].push(true);
+        } else {
+          ids[id] = [true];
+        }
+
+        // Replace the name to new one
+        $el.name = nameNew;
+        if ($el.id) {
+          $el.id = idNew;
+        }
+
+        // Guess there a label for this input
+        const lbl = row.querySelector(`label[for="${forOldAttr}"]`);
+        if (lbl) {
+          lbl.setAttribute('for', idNew);
+          lbl.setAttribute('id', `${idNew}-lbl`);
+        }
+      }
+    }
+
+    /**
+         * Use of HTML Drag and Drop API
+         * https://developer.mozilla.org/en-US/docs/Web/API/HTML_Drag_and_Drop_API
+         * https://www.sitepoint.com/accessible-drag-drop/
+         */
+    setUpDragSort() {
+      const that = this; // Self reference
+      let item = null; // Storing the selected item
+      let touched = false; // We have a touch events
+
+      // Find all existing rows and add dragable attributes
+      const rows = this.getRows();
+      for (let ir = 0, lr = rows.length; ir < lr; ir++) {
+        const childRow = rows[ir];
+
+        childRow.setAttribute('draggable', 'false');
+        childRow.setAttribute('aria-grabbed', 'false');
+        childRow.setAttribute('tabindex', '0');
+      }
+
+      // Helper method to test whether Handler was clicked
+      function getMoveHandler(element) {
+        return !element.form // This need to test whether the element is :input
+                && element[matchesFn](that.buttonMove) ? element : closest(element, that.buttonMove);
+      }
+
+      // Helper method to mover row to selected position
+      function switchRowPositions(src, dest) {
+        let isRowBefore = false;
+        if (src.parentNode === dest.parentNode) {
+          for (let cur = src; cur; cur = cur.previousSibling) {
+            if (cur === dest) {
+              isRowBefore = true;
+              break;
+            }
+          }
+        }
+
+        if (isRowBefore) {
+          dest.parentNode.insertBefore(src, dest);
+        } else {
+          dest.parentNode.insertBefore(src, dest.nextSibling);
+        }
+      }
+
+      // Touch interaction:
+      // - a touch of "move button" mark a row dragable / "selected", or deselect previous selected
+      // - a touch of "move button" in the destination row will move a selected row to a new position
+      this.addEventListener('touchstart', (event) => {
+        touched = true;
+
+        // Check for .move button
+        const handler = getMoveHandler(event.target);
+
+
+        const row = handler ? closest(handler, that.repeatableElement) : null;
+
+        if (!row || closest(row, 'joomla-field-subform') !== that) {
+          return;
+        }
+
+        // First selection
+        if (!item) {
+          row.setAttribute('draggable', 'true');
+          row.setAttribute('aria-grabbed', 'true');
+          item = row;
+        }
+        // Second selection
+        else {
+          // Move to selected position
+          if (row !== item) {
+            switchRowPositions(item, row);
+          }
+
+          item.setAttribute('draggable', 'false');
+          item.setAttribute('aria-grabbed', 'false');
+          item = null;
+        }
+
+        event.preventDefault();
+      });
+
+      // Mouse interaction
+      // - mouse down, enable "draggable" and allow to drag the row,
+      // - mouse up, disable "draggable"
+      this.addEventListener('mousedown', (event) => {
+        if (touched) return;
+
+        // Check for .move button
+        const handler = getMoveHandler(event.target);
+
+
+        const row = handler ? closest(handler, that.repeatableElement) : null;
+
+        if (!row || closest(row, 'joomla-field-subform') !== that) {
+          return;
+        }
+
+        row.setAttribute('draggable', 'true');
+        row.setAttribute('aria-grabbed', 'true');
+        item = row;
+      });
+
+      this.addEventListener('mouseup', (event) => {
+        if (item && !touched) {
+          item.setAttribute('draggable', 'false');
+          item.setAttribute('aria-grabbed', 'false');
+          item = null;
+        }
+      });
+
+      // Keyboard interaction
+      // - "tab" to navigate to needed row,
+      // - modifier (ctr,alt,shift) + "space" select the row,
+      // - "tab" to select destination,
+      // - "enter" to place selected row in to destination
+      // - "esc" to cancel selection
+      this.addEventListener('keydown', (event) => {
+        if ((event.keyCode !== KEYCODE.ESC && event.keyCode !== KEYCODE.SPACE && event.keyCode !== KEYCODE.ENTER)
+                    || event.target.form || !event.target[matchesFn](that.repeatableElement)) {
+          return;
+        }
+
+        const row = event.target;
+
+        // Make sure we handle correct children
+        if (!row || closest(row, 'joomla-field-subform') !== that) {
+          return;
+        }
+
+        // Space is the selection or unselection keystroke
+        if (event.keyCode === KEYCODE.SPACE && hasModifier(event)) {
+          // Unselect previously selected
+          if (row.getAttribute('aria-grabbed') === 'true') {
+            row.setAttribute('draggable', 'false');
+            row.setAttribute('aria-grabbed', 'false');
+            item = null;
+          }
+          // Select new
+          else {
+            // If there was previously selected
+            if (item) {
+              item.setAttribute('draggable', 'false');
+              item.setAttribute('aria-grabbed', 'false');
+              item = null;
+            }
+
+            // Mark new selection
+            row.setAttribute('draggable', 'true');
+            row.setAttribute('aria-grabbed', 'true');
+            item = row;
+          }
+
+          // Prevent default to suppress any native actions
+          event.preventDefault();
+        }
+
+
+        // Escape is the abort keystroke (for any target element)
+        if (event.keyCode === KEYCODE.ESC && item) {
+          item.setAttribute('draggable', 'false');
+          item.setAttribute('aria-grabbed', 'false');
+          item = null;
+        }
+
+        // Enter, to place selected item in selected position
+        if (event.keyCode === KEYCODE.ENTER && item) {
+          item.setAttribute('draggable', 'false');
+          item.setAttribute('aria-grabbed', 'false');
+
+          // Do nothing here
+          if (row === item) {
+            item = null;
+            return;
+          }
+
+          // Move the item to selected position
+          switchRowPositions(item, row);
+
+          event.preventDefault();
+          item = null;
+        }
+      });
+
+      // dragstart event to initiate mouse dragging
+      this.addEventListener('dragstart', (event) => {
+        if (item) {
+          // We going to move the row
+          event.dataTransfer.effectAllowed = 'move';
+
+          // This need to work in Firefox and IE10+
+          event.dataTransfer.setData('text', '');
+        }
+      });
+
+      this.addEventListener('dragover', (event) => {
+        if (item) {
+          event.preventDefault();
+        }
+      });
+
+      // Handle drag action, move element to hovered position
+      this.addEventListener('dragenter', (event) => {
+        // Make sure the target in the correct container
+        if (!item || that.rowsContainer && closest(event.target, that.rowsContainer) !== that.containerWithRows) {
+          return;
+        }
+
+        // Find a hovered row, and replace it
+        const row = event.target[matchesFn](that.repeatableElement) ? event.target : closest(event.target, that.repeatableElement);
+        if (!row) return;
+
+        switchRowPositions(item, row);
+      });
+
+      // dragend event to clean-up after drop or abort
+      // which fires whether or not the drop target was valid
+      this.addEventListener('dragend', () => {
+        if (item) {
+          item.setAttribute('draggable', 'false');
+          item.setAttribute('aria-grabbed', 'false');
+          item = null;
+        }
+      });
+    }
+  }
+
+  customElements.define('joomla-field-subform', JoomlaFieldSubform);
+
+  /**
+     * Helper to find a closest parent element
+     *
+     * @param {HTMLElement} element
+     * @param {String}      selector
+     *
+     * @returns {HTMLElement|null}
+     */
+  function closest(element, selector) {
+    let parent;
+
+    // Traverse parents
+    while (element) {
+      parent = element.parentElement;
+      if (parent && parent[matchesFn](selector)) {
+        return parent;
+      }
+      element = parent;
+    }
+
+    return null;
+  }
+
+  /**
+     * Helper for testing whether a selection modifier is pressed
+     * @param {Event} event
+     *
+     * @returns {boolean|*}
+     */
+  function hasModifier(event) {
+    return (event.ctrlKey || event.metaKey || event.shiftKey);
+  }
+}(customElements));
diff --git a/build/media/webcomponents/js/field-switcher/field-switcher.js b/build/media_source/system/js/fields/joomla-field-switcher.w-c.es6.js
similarity index 98%
rename from build/media/webcomponents/js/field-switcher/field-switcher.js
rename to build/media_source/system/js/fields/joomla-field-switcher.w-c.es6.js
index cda87582e096c..cc2a876d49afa 100644
--- a/build/media/webcomponents/js/field-switcher/field-switcher.js
+++ b/build/media_source/system/js/fields/joomla-field-switcher.w-c.es6.js
@@ -1,4 +1,4 @@
-;((customElements) => {
+((customElements) => {
   // Keycodes
   const KEYCODE = {
     ENTER: 13,
@@ -10,8 +10,11 @@
     static get observedAttributes() { return ['type', 'off-text', 'on-text']; }
 
     get type() { return this.getAttribute('type'); }
+
     set type(value) { return this.setAttribute('type', value); }
+
     get offText() { return this.getAttribute('off-text') || 'Off'; }
+
     get onText() { return this.getAttribute('on-text') || 'On'; }
 
     // attributeChangedCallback(attr, oldValue, newValue) {}
@@ -69,7 +72,7 @@
         this.spans[1].classList.add('active');
 
         // Aria-label ONLY in the container span!
-        this.inputsContainer.setAttribute('aria-labeledby', `${this.id}-lbl`); //this.spans[1].innerHTML);
+        this.inputsContainer.setAttribute('aria-labelledby', `${this.id}-lbl`); // this.spans[1].innerHTML);
       } else {
         this.spans[0].classList.add('active');
 
diff --git a/build/media/webcomponents/js/field-user/field-user.js b/build/media_source/system/js/fields/joomla-field-user.w-c.es6.js
similarity index 70%
rename from build/media/webcomponents/js/field-user/field-user.js
rename to build/media_source/system/js/fields/joomla-field-user.w-c.es6.js
index 3910e2d37bf3c..5b3be56a32641 100644
--- a/build/media/webcomponents/js/field-user/field-user.js
+++ b/build/media_source/system/js/fields/joomla-field-user.w-c.es6.js
@@ -1,22 +1,44 @@
-((customElements) => {
+(() => {
   class JoomlaFieldUser extends HTMLElement {
+    constructor() {
+      super();
+
+      this.onUserSelect = '';
+      this.onchangeStr = '';
+      this.buttonClick = this.buttonClick.bind(this);
+      this.iframeLoad = this.iframeLoad.bind(this);
+    }
+
     static get observedAttributes() {
       return ['url', 'modal-class', 'modal-width', 'modal-height', 'input', 'input-name', 'button-select'];
     }
 
     get url() { return this.getAttribute('url'); }
+
     set url(value) { this.setAttribute('url', value); }
+
     get modalClass() { return this.getAttribute('modal'); }
+
     set modalClass(value) { this.setAttribute('modal', value); }
+
     get modalWidth() { return this.getAttribute('modal-width'); }
+
     set modalWidth(value) { this.setAttribute('modal-width', value); }
+
     get modalHeight() { return this.getAttribute('modal-height'); }
+
     set modalHeight(value) { this.setAttribute('modal-height', value); }
+
     get inputId() { return this.getAttribute('input'); }
+
     set inputId(value) { this.setAttribute('input', value); }
+
     get inputNameClass() { return this.getAttribute('input-name'); }
+
     set inputNameClass(value) { this.setAttribute('input-name', value); }
+
     get buttonSelectClass() { return this.getAttribute('button-select'); }
+
     set buttonSelectClass(value) { this.setAttribute('button-select', value); }
 
     connectedCallback() {
@@ -35,26 +57,44 @@
         this.modal.addEventListener('hide', this.removeIframe.bind(this));
 
         // Check for onchange callback,
-        const onchangeStr = this.input.getAttribute('data-onchange');
-        let onUserSelect;
-        if (onchangeStr) {
+        this.onchangeStr = this.input.getAttribute('data-onchange');
+        if (this.onchangeStr) {
           /* eslint-disable */
-          onUserSelect = new Function(onchangeStr);
-          this.input.addEventListener('change', onUserSelect.bind(this.input));
+          this.onUserSelect = new Function(this.onchangeStr);
+          this.input.addEventListener('change', this.onUserSelect);
           /* eslint-enable */
         }
       }
     }
 
     disconnectedCallback() {
-      this.buttonSelect.removeEventListener('click', this);
+      if (this.onchangeStr && this.input) {
+        this.input.removeEventListener('change', this.onUserSelect);
+      }
+
+      if (this.buttonSelect) {
+        this.buttonSelect.removeEventListener('click', this);
+      }
+
       this.modal.removeEventListener('hide', this);
     }
 
+    buttonClick(event) {
+      this.setValue(event.target.getAttribute('data-user-value'), event.target.getAttribute('data-user-name'));
+      this.modalClose();
+    }
+
+    iframeLoad() {
+      const iframeDoc = this.iframeEl.contentWindow.document;
+      const buttons = [].slice.call(iframeDoc.querySelectorAll('.button-select'));
+
+      buttons.forEach((button) => {
+        button.addEventListener('click', this.buttonClick);
+      });
+    }
+
     // Opens the modal
     modalOpen() {
-      const self = this;
-
       // Reconstruct the iframe
       this.removeIframe();
       const iframe = document.createElement('iframe');
@@ -67,20 +107,10 @@
 
       this.modal.open();
 
-      const iframeEl = this.modalBody.querySelector('iframe');
+      this.iframeEl = this.modalBody.querySelector('iframe');
 
       // handle the selection on the iframe
-      iframeEl.addEventListener('load', () => {
-        const iframeDoc = iframeEl.contentWindow.document;
-        const buttons = [].slice.call(iframeDoc.querySelectorAll('.button-select'));
-
-        buttons.forEach((button) => {
-          button.addEventListener('click', (event) => {
-            self.setValue(event.target.getAttribute('data-user-value'), event.target.getAttribute('data-user-name'));
-            self.modalClose();
-          });
-        });
-      });
+      this.iframeEl.addEventListener('load', this.iframeLoad);
     }
 
     // Closes the modal
@@ -102,4 +132,4 @@
   }
 
   customElements.define('joomla-field-user', JoomlaFieldUser);
-})(customElements);
+})();
diff --git a/build/media/system/js/fields/modal-fields.js b/build/media_source/system/js/fields/modal-fields.es5.js
similarity index 93%
rename from build/media/system/js/fields/modal-fields.js
rename to build/media_source/system/js/fields/modal-fields.es5.js
index 19884e8b0d4ad..b89581750fa31 100644
--- a/build/media/system/js/fields/modal-fields.js
+++ b/build/media_source/system/js/fields/modal-fields.es5.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -40,19 +40,23 @@
 
 			if (document.getElementById(fieldPrefix + '_select'))
 			{
-				document.getElementById(fieldPrefix + '_select').classList.add('sr-only');
+				document.getElementById(fieldPrefix + '_select').classList.add('hidden');
 			}
 			if (document.getElementById(fieldPrefix + '_new'))
 			{
-				document.getElementById(fieldPrefix + '_new').classList.add('sr-only');
+				document.getElementById(fieldPrefix + '_new').classList.add('hidden');
 			}
 			if (document.getElementById(fieldPrefix + '_edit'))
 			{
-				document.getElementById(fieldPrefix + '_edit').classList.remove('sr-only');
+				document.getElementById(fieldPrefix + '_edit').classList.remove('hidden');
 			}
 			if (document.getElementById(fieldPrefix + '_clear'))
 			{
-				document.getElementById(fieldPrefix + '_clear').classList.remove('sr-only');
+				document.getElementById(fieldPrefix + '_clear').classList.remove('hidden');
+			}
+			if (document.getElementById(fieldPrefix + '_propagate'))
+			{
+				jQuery('#' + fieldPrefix + '_propagate').removeClass('hidden');
 			}
 		}
 		else
@@ -62,19 +66,23 @@
 
 			if (document.getElementById(fieldPrefix + '_select'))
 			{
-				document.getElementById(fieldPrefix + '_select').classList.remove('sr-only');
+				document.getElementById(fieldPrefix + '_select').classList.remove('hidden');
 			}
 			if (document.getElementById(fieldPrefix + '_new'))
 			{
-				document.getElementById(fieldPrefix + '_new').classList.remove('sr-only');
+				document.getElementById(fieldPrefix + '_new').classList.remove('hidden');
 			}
 			if (document.getElementById(fieldPrefix + '_edit'))
 			{
-				document.getElementById(fieldPrefix + '_edit').classList.add('sr-only');
+				document.getElementById(fieldPrefix + '_edit').classList.add('hidden');
 			}
 			if (document.getElementById(fieldPrefix + '_clear'))
 			{
-				document.getElementById(fieldPrefix + '_clear').classList.add('sr-only');
+				document.getElementById(fieldPrefix + '_clear').classList.add('hidden');
+			}
+			if (document.getElementById(fieldPrefix + '_propagate'))
+			{
+				jQuery('#' + fieldPrefix + '_propagate').addClass('hidden');
 			}
 		}
 
@@ -190,4 +198,4 @@
 		return false;
 	};
 
-}());
+}());
\ No newline at end of file
diff --git a/build/media/system/js/fields/passwordstrength.js b/build/media_source/system/js/fields/passwordstrength.es5.js
similarity index 98%
rename from build/media/system/js/fields/passwordstrength.js
rename to build/media_source/system/js/fields/passwordstrength.es5.js
index 4c81cb557473d..bf41dc0b6cbbc 100644
--- a/build/media/system/js/fields/passwordstrength.js
+++ b/build/media_source/system/js/fields/passwordstrength.es5.js
@@ -57,7 +57,7 @@ PasswordStrength = (function() {
 })();
 
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 document.addEventListener('DOMContentLoaded', function(){
diff --git a/build/media_src/system/js/fields/passwordview.es6.js b/build/media_source/system/js/fields/passwordview.es6.js
similarity index 95%
rename from build/media_src/system/js/fields/passwordview.es6.js
rename to build/media_source/system/js/fields/passwordview.es6.js
index a37bee6bf8771..873b41b263483 100644
--- a/build/media_src/system/js/fields/passwordview.es6.js
+++ b/build/media_source/system/js/fields/passwordview.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((document) => {
diff --git a/build/media_src/system/js/fields/select-colour.es6.js b/build/media_source/system/js/fields/select-colour.es6.js
similarity index 95%
rename from build/media_src/system/js/fields/select-colour.es6.js
rename to build/media_source/system/js/fields/select-colour.es6.js
index 7061e26c0fe6d..15bd96d980b05 100644
--- a/build/media_src/system/js/fields/select-colour.es6.js
+++ b/build/media_source/system/js/fields/select-colour.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 (() => {
diff --git a/build/media/system/js/fields/tag.js b/build/media_source/system/js/fields/tag.es5.js
similarity index 97%
rename from build/media/system/js/fields/tag.js
rename to build/media_source/system/js/fields/tag.es5.js
index 13321234b0001..41c1798a76a33 100644
--- a/build/media/system/js/fields/tag.js
+++ b/build/media_source/system/js/fields/tag.es5.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/system/js/fields/validate.es6.js b/build/media_source/system/js/fields/validate.es6.js
similarity index 99%
rename from build/media_src/system/js/fields/validate.es6.js
rename to build/media_source/system/js/fields/validate.es6.js
index df558e22d07c4..cf98f86e0d8bd 100644
--- a/build/media_src/system/js/fields/validate.es6.js
+++ b/build/media_source/system/js/fields/validate.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 ((document) => {
diff --git a/build/media_source/system/js/joomla-hidden-mail.w-c.es6.js b/build/media_source/system/js/joomla-hidden-mail.w-c.es6.js
new file mode 100644
index 0000000000000..fb316d0ce4cce
--- /dev/null
+++ b/build/media_source/system/js/joomla-hidden-mail.w-c.es6.js
@@ -0,0 +1,66 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+window.customElements.define('joomla-hidden-mail', class extends HTMLElement {
+  constructor() {
+    super();
+
+    this.newElement = '';
+    this.base = '';
+  }
+
+  /**
+   * Lifecycle
+   */
+  disconnectedCallback() {
+    this.innerHTML = '';
+  }
+
+  /**
+   * Lifecycle
+   */
+  connectedCallback() {
+    this.base = `${this.getAttribute('base')}/`;
+
+    if (this.getAttribute('is-link') === '1') {
+      this.newElement = document.createElement('a');
+      this.newElement.setAttribute('href', `mailto:${this.constructor.b64DecodeUnicode(this.getAttribute('first'))}@${this.constructor.b64DecodeUnicode(this.getAttribute('last'))}`);
+
+      // Get all of the original element attributes, and pass them to the link
+      [].slice.call(this.attributes).forEach((attribute, index) => {
+        const { nodeName } = this.attributes.item(index);
+
+        if (nodeName) {
+          // We do care for some attributes
+          if (['is-link', 'is-email', 'first', 'last', 'text'].indexOf(nodeName) === -1) {
+            const { nodeValue } = this.attributes.item(index);
+
+            this.newElement.setAttribute(nodeName, nodeValue);
+          }
+        }
+      });
+    } else {
+      this.newElement = document.createElement('span');
+    }
+
+    if (this.getAttribute('text')) {
+      let innerStr = this.constructor.b64DecodeUnicode(this.getAttribute('text'));
+
+      innerStr = innerStr.replace('src="images/', `src="${this.base}images/`).replace('src="media/', `src="${this.base}media/`);
+      this.newElement.innerHTML = innerStr;
+    } else {
+      this.newElement.innerText = `${window.atob(this.getAttribute('first'))}@${window.atob(this.getAttribute('last'))}`;
+    }
+
+    // Remove the noscript message
+    this.innerText = '';
+
+    // Display the new element
+    this.appendChild(this.newElement);
+  }
+
+  static b64DecodeUnicode(str) {
+    return decodeURIComponent(Array.prototype.map.call(atob(str), c => `%${(`00${c.charCodeAt(0).toString(16)}`).slice(-2)}`).join(''));
+  }
+});
diff --git a/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js b/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js
new file mode 100755
index 0000000000000..046913a9c7217
--- /dev/null
+++ b/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js
@@ -0,0 +1,121 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+window.customElements.define('joomla-toolbar-button', class extends HTMLElement {
+  // Attribute getters
+  get task() { return this.getAttribute('task'); }
+
+  get listSelection() { return this.hasAttribute('list-selection'); }
+
+  get form() { return this.getAttribute('form'); }
+
+  get formValidation() { return this.hasAttribute('form-validation'); }
+
+  get confirmMessage() { return this.getAttribute('confirm-message'); }
+
+  /**
+   * Lifecycle
+   */
+  constructor() {
+    super();
+
+    if (!Joomla) {
+      throw new Error('Joomla API is not properly initiated');
+    }
+
+    this.onChange = this.onChange.bind(this);
+
+    this.addEventListener('click', event => this.executeTask(event));
+  }
+
+  /**
+   * Lifecycle
+   */
+  connectedCallback() {
+    // We need a button to support button behavior,
+    // because we cannot currently extend HTMLButtonElement
+    this.buttonElement = this.querySelector('button, a');
+
+    // Check whether we have a form
+    const formSelector = this.form || 'adminForm';
+    this.formElement = document.getElementById(formSelector);
+
+    this.disabled = false;
+    // If list selection is required, set button to disabled by default
+    if (this.listSelection) {
+      this.setDisabled(true);
+    }
+
+    if (this.listSelection) {
+      if (!this.formElement) {
+        throw new Error(`The form "${formSelector}" is required to perform the task, but the form was not found on the page.`);
+      }
+
+      // Watch on list selection
+      this.formElement.boxchecked.addEventListener('change', this.onChange);
+    }
+  }
+
+  /**
+   * Lifecycle
+   */
+  disconnectedCallback() {
+    if (this.formElement.boxchecked) {
+      this.formElement.boxchecked.removeEventListener('change', this.onChange);
+    }
+
+    this.removeEventListener('click');
+  }
+
+  onChange(event) {
+    // Check whether we have selected something
+    this.setDisabled(event.target.value < 1);
+  }
+
+  setDisabled(disabled) {
+    // Make sure we have a boolean value
+    this.disabled = !!disabled;
+
+    // Switch attribute for current element
+    if (this.disabled) {
+      this.setAttribute('disabled', true);
+    } else {
+      this.removeAttribute('disabled');
+    }
+
+    // Switch attribute for native element
+    // An anchor does not support "disabled" attribute, so use class
+    if (this.buttonElement) {
+      if (this.disabled) {
+        if (this.buttonElement.nodeName === 'BUTTON') {
+          this.buttonElement.setAttribute('disabled', true);
+        } else {
+          this.buttonElement.classList.add('disabled');
+        }
+      } else if (this.buttonElement.nodeName === 'BUTTON') {
+        this.buttonElement.removeAttribute('disabled');
+      } else {
+        this.buttonElement.classList.remove('disabled');
+      }
+    }
+  }
+
+  executeTask() {
+    if (this.disabled) {
+      return false;
+    }
+
+    // eslint-disable-next-line no-restricted-globals
+    if (this.confirmMessage && !confirm(this.confirmMessage)) {
+      return false;
+    }
+
+    if (this.task) {
+      Joomla.submitbutton(this.task, this.form, this.formValidation);
+    }
+
+    return true;
+  }
+});
diff --git a/build/media_src/system/js/keepalive.es6.js b/build/media_source/system/js/keepalive.es6.js
similarity index 95%
rename from build/media_src/system/js/keepalive.es6.js
rename to build/media_source/system/js/keepalive.es6.js
index 661e593d84870..dade7deddb549 100644
--- a/build/media_src/system/js/keepalive.es6.js
+++ b/build/media_source/system/js/keepalive.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/system/js/multiselect.es6.js b/build/media_source/system/js/multiselect.es6.js
similarity index 98%
rename from build/media_src/system/js/multiselect.es6.js
rename to build/media_source/system/js/multiselect.es6.js
index aa2b2b05a9d43..a33d06c134ead 100644
--- a/build/media_src/system/js/multiselect.es6.js
+++ b/build/media_source/system/js/multiselect.es6.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/build/media_src/system/js/searchtools.es6.js b/build/media_source/system/js/searchtools.es6.js
similarity index 99%
rename from build/media_src/system/js/searchtools.es6.js
rename to build/media_source/system/js/searchtools.es6.js
index 72595f57cf1ca..8c6bdc8dc42bf 100644
--- a/build/media_src/system/js/searchtools.es6.js
+++ b/build/media_source/system/js/searchtools.es6.js
@@ -518,7 +518,7 @@ Joomla = window.Joomla || {};
 
     if (sort && sort.hasAttribute('data-sort')) {
       const ariasort = sort.getAttribute('data-sort');
-      sort.parentNode.setAttribute('aria-sorted', ariasort);
+      sort.parentNode.setAttribute('aria-sort', ariasort);
     }
 
     // Cleanup
diff --git a/build/media_src/system/js/showon.es6.js b/build/media_source/system/js/showon.es6.js
similarity index 92%
rename from build/media_src/system/js/showon.es6.js
rename to build/media_source/system/js/showon.es6.js
index 4c44d7f38226d..449cf32c8023b 100644
--- a/build/media_src/system/js/showon.es6.js
+++ b/build/media_source/system/js/showon.es6.js
@@ -1,22 +1,7 @@
 /**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
-
-// @todo remove this totally irrelevant piece of code from this file
-// Only define the Joomla namespace if not defined.
-Joomla = window.Joomla || {};
-
-/**
- * Sets the HTML of the container-collapse element
- */
-Joomla.setcollapse = (url, name, height) => {
-  if (!document.getElementById(`collapse-${name}`)) {
-    document.getElementById('container-collapse').innerHTML = `<div class="collapse fade" id="collapse-${name}"><iframe class="iframe" src="${url}" height="${height}" width="100%"></iframe></div>`;
-  }
-};
-// end of @todo
-
 ((document) => {
   'use strict';
 
@@ -202,7 +187,12 @@ Joomla.setcollapse = (url, name, height) => {
         });
 
         // If conditions are satisfied show the target field(s), else hide
-        field.style.display = (showfield) ? 'block' : 'none';
+        if (field.tagName !== 'option') {
+          field.style.display = (showfield) ? 'block' : 'none';
+        } else {
+          // TODO: If chosen or choices.js is active we should update them
+          field.disabled = !showfield;
+        }
       });
     }
   }
diff --git a/build/media/system/scss/_icomoon.scss b/build/media_source/system/scss/_icomoon.scss
similarity index 100%
rename from build/media/system/scss/_icomoon.scss
rename to build/media_source/system/scss/_icomoon.scss
diff --git a/build/media/system/scss/_jalert.scss b/build/media_source/system/scss/_jalert.scss
similarity index 100%
rename from build/media/system/scss/_jalert.scss
rename to build/media_source/system/scss/_jalert.scss
diff --git a/build/media/system/scss/_jquery-minicolors.scss b/build/media_source/system/scss/_jquery-minicolors.scss
similarity index 100%
rename from build/media/system/scss/_jquery-minicolors.scss
rename to build/media_source/system/scss/_jquery-minicolors.scss
diff --git a/build/media_source/system/scss/fields/joomla-field-media.scss b/build/media_source/system/scss/fields/joomla-field-media.scss
new file mode 100644
index 0000000000000..147460dc73f85
--- /dev/null
+++ b/build/media_source/system/scss/fields/joomla-field-media.scss
@@ -0,0 +1,33 @@
+joomla-field-media .field-media-preview {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  max-width: 356px;
+  height: 180px;
+  padding: 10px;
+  overflow: hidden;
+  background-color: #f2f2f2;
+  border: 1px solid rgba(0, 0, 0, .15);
+  border-width: 1px 1px 0;
+  border-radius: .25rem .25rem 0 0;
+}
+
+joomla-field-media .field-media-preview-icon {
+  width: 7rem;
+  height: 7rem;
+  background-size: 7rem;
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3E%3Cpath fill='rgba(0,0,0,.25)' d='M464 64H48C21.49 64 0 85.49 0 112v288c0 26.51 21.49 48 48 48h416c26.51 0 48-21.49 48-48V112c0-26.51-21.49-48-48-48zm-6 336H54a6 6 0 0 1-6-6V118a6 6 0 0 1 6-6h404a6 6 0 0 1 6 6v276a6 6 0 0 1-6 6zM128 152c-22.091 0-40 17.909-40 40s17.909 40 40 40 40-17.909 40-40-17.909-40-40-40zM96 352h320v-80l-87.515-87.515c-4.686-4.686-12.284-4.686-16.971 0L192 304l-39.515-39.515c-4.686-4.686-12.284-4.686-16.971 0L96 304v48z'/%3E%3C/svg%3E");
+}
+
+joomla-field-media .field-media-input {
+  border-top-left-radius: 0;
+}
+
+joomla-field-media .button-clear {
+  border-top-right-radius: 0;
+}
+
+joomla-field-media img {
+  max-width: 100%;
+  max-height: 100%;
+}
diff --git a/build/media_source/system/scss/fields/joomla-field-permissions.scss b/build/media_source/system/scss/fields/joomla-field-permissions.scss
new file mode 100644
index 0000000000000..f1f4444b30819
--- /dev/null
+++ b/build/media_source/system/scss/fields/joomla-field-permissions.scss
@@ -0,0 +1,32 @@
+joomla-field-permissions .joomla-icon::after {
+    display: inline-block;
+    content: "";
+    width: 1rem;
+    height: 1rem;
+    line-height: 1.5;
+}
+
+joomla-field-permissions .joomla-icon.joomla-field-permissions__allowed::after {
+	background: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='utf-8'%3F%3E%3Csvg viewBox='0 0 1792 1792' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='%23111' d='M1671 566q0 40-28 68l-724 724-136 136q-28 28-68 28t-68-28l-136-136-362-362q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 295 656-657q28-28 68-28t68 28l136 136q28 28 28 68z'/%3E%3C/svg%3E") no-repeat;
+}
+
+joomla-field-permissions .joomla-icon.joomla-field-permissions__denied::after {
+	background: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='utf-8'%3F%3E%3Csvg viewBox='0 0 1792 1792' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='%23111' d='M1490 1322q0 40-28 68l-136 136q-28 28-68 28t-68-28l-294-294-294 294q-28 28-68 28t-68-28l-136-136q-28-28-28-68t28-68l294-294-294-294q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 294 294-294q28-28 68-28t68 28l136 136q28 28 28 68t-28 68l-294 294 294 294q28 28 28 68z'/%3E%3C/svg%3E") no-repeat;
+}
+
+joomla-field-permissions .joomla-icon.joomla-field-permissions__spinner {
+	animation: spin 2s infinite linear;
+}
+
+joomla-field-permissions .joomla-icon.joomla-field-permissions__spinner::after {
+	background: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='utf-8'%3F%3E%3Csvg viewBox='0 0 1792 1792' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='%23111' d='M526 1394q0 53-37.5 90.5t-90.5 37.5q-52 0-90-38t-38-90q0-53 37.5-90.5t90.5-37.5 90.5 37.5 37.5 90.5zm498 206q0 53-37.5 90.5t-90.5 37.5-90.5-37.5-37.5-90.5 37.5-90.5 90.5-37.5 90.5 37.5 37.5 90.5zm-704-704q0 53-37.5 90.5t-90.5 37.5-90.5-37.5-37.5-90.5 37.5-90.5 90.5-37.5 90.5 37.5 37.5 90.5zm1202 498q0 52-38 90t-90 38q-53 0-90.5-37.5t-37.5-90.5 37.5-90.5 90.5-37.5 90.5 37.5 37.5 90.5zm-964-996q0 66-47 113t-113 47-113-47-47-113 47-113 113-47 113 47 47 113zm1170 498q0 53-37.5 90.5t-90.5 37.5-90.5-37.5-37.5-90.5 37.5-90.5 90.5-37.5 90.5 37.5 37.5 90.5zm-640-704q0 80-56 136t-136 56-136-56-56-136 56-136 136-56 136 56 56 136zm530 206q0 93-66 158.5t-158 65.5q-93 0-158.5-65.5t-65.5-158.5q0-92 65.5-158t158.5-66q92 0 158 66t66 158z'/%3E%3C/svg%3E") no-repeat;
+}
+
+@keyframes spin {
+	0% {
+		transform: rotate(0deg);
+	}
+	100% {
+		transform: rotate(359deg);
+	}
+}
diff --git a/build/media/webcomponents/scss/field-simple-color/field-simple-color.scss b/build/media_source/system/scss/fields/joomla-field-simple-color.scss
similarity index 100%
rename from build/media/webcomponents/scss/field-simple-color/field-simple-color.scss
rename to build/media_source/system/scss/fields/joomla-field-simple-color.scss
diff --git a/build/media/webcomponents/scss/field-switcher/field-switcher.scss b/build/media_source/system/scss/fields/joomla-field-switcher.scss
similarity index 99%
rename from build/media/webcomponents/scss/field-switcher/field-switcher.scss
rename to build/media_source/system/scss/fields/joomla-field-switcher.scss
index c35a9591b8d91..593915096a8f0 100644
--- a/build/media/webcomponents/scss/field-switcher/field-switcher.scss
+++ b/build/media_source/system/scss/fields/joomla-field-switcher.scss
@@ -130,7 +130,7 @@ joomla-field-switcher {
     span {
       position: absolute;
       top: 0;
-      color: $gray-600;
+      color: var(--dark);
       visibility: hidden;
       opacity: 0;
       transition: all .2s ease-in-out;
diff --git a/build/media_source/system/scss/joomla-toolbar-button.scss b/build/media_source/system/scss/joomla-toolbar-button.scss
new file mode 100644
index 0000000000000..7017556144625
--- /dev/null
+++ b/build/media_source/system/scss/joomla-toolbar-button.scss
@@ -0,0 +1,4 @@
+joomla-toolbar-button .dropdown-item:focus,
+joomla-toolbar-button .dropdown-item:hover {
+	color: #fff;
+}
diff --git a/build/media/vendor/jquery-ui/js/jquery.ui.core.js b/build/media_source/vendor/jquery-ui/js/jquery.ui.core.es5.js
similarity index 100%
rename from build/media/vendor/jquery-ui/js/jquery.ui.core.js
rename to build/media_source/vendor/jquery-ui/js/jquery.ui.core.es5.js
diff --git a/build/media/vendor/jquery-ui/js/jquery.ui.sortable.js b/build/media_source/vendor/jquery-ui/js/jquery.ui.sortable.es5.js
similarity index 100%
rename from build/media/vendor/jquery-ui/js/jquery.ui.sortable.js
rename to build/media_source/vendor/jquery-ui/js/jquery.ui.sortable.es5.js
diff --git a/build/media/vendor/tinymce/langs/af.js b/build/media_source/vendor/tinymce/langs/af.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/af.js
rename to build/media_source/vendor/tinymce/langs/af.es5.js
diff --git a/build/media/vendor/tinymce/langs/ar.js b/build/media_source/vendor/tinymce/langs/ar.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/ar.js
rename to build/media_source/vendor/tinymce/langs/ar.es5.js
diff --git a/build/media/vendor/tinymce/langs/be.js b/build/media_source/vendor/tinymce/langs/be.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/be.js
rename to build/media_source/vendor/tinymce/langs/be.es5.js
diff --git a/build/media/vendor/tinymce/langs/bg.js b/build/media_source/vendor/tinymce/langs/bg.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/bg.js
rename to build/media_source/vendor/tinymce/langs/bg.es5.js
diff --git a/build/media/vendor/tinymce/langs/bs.js b/build/media_source/vendor/tinymce/langs/bs.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/bs.js
rename to build/media_source/vendor/tinymce/langs/bs.es5.js
diff --git a/build/media/vendor/tinymce/langs/ca.js b/build/media_source/vendor/tinymce/langs/ca.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/ca.js
rename to build/media_source/vendor/tinymce/langs/ca.es5.js
diff --git a/build/media/vendor/tinymce/langs/cs.js b/build/media_source/vendor/tinymce/langs/cs.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/cs.js
rename to build/media_source/vendor/tinymce/langs/cs.es5.js
diff --git a/build/media/vendor/tinymce/langs/cy.js b/build/media_source/vendor/tinymce/langs/cy.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/cy.js
rename to build/media_source/vendor/tinymce/langs/cy.es5.js
diff --git a/build/media/vendor/tinymce/langs/da.js b/build/media_source/vendor/tinymce/langs/da.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/da.js
rename to build/media_source/vendor/tinymce/langs/da.es5.js
diff --git a/build/media/vendor/tinymce/langs/de.js b/build/media_source/vendor/tinymce/langs/de.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/de.js
rename to build/media_source/vendor/tinymce/langs/de.es5.js
diff --git a/build/media/vendor/tinymce/langs/el.js b/build/media_source/vendor/tinymce/langs/el.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/el.js
rename to build/media_source/vendor/tinymce/langs/el.es5.js
diff --git a/build/media/vendor/tinymce/langs/es.js b/build/media_source/vendor/tinymce/langs/es.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/es.js
rename to build/media_source/vendor/tinymce/langs/es.es5.js
diff --git a/build/media/vendor/tinymce/langs/et.js b/build/media_source/vendor/tinymce/langs/et.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/et.js
rename to build/media_source/vendor/tinymce/langs/et.es5.js
diff --git a/build/media/vendor/tinymce/langs/eu.js b/build/media_source/vendor/tinymce/langs/eu.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/eu.js
rename to build/media_source/vendor/tinymce/langs/eu.es5.js
diff --git a/build/media/vendor/tinymce/langs/fa.js b/build/media_source/vendor/tinymce/langs/fa.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/fa.js
rename to build/media_source/vendor/tinymce/langs/fa.es5.js
diff --git a/build/media/vendor/tinymce/langs/fi.js b/build/media_source/vendor/tinymce/langs/fi.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/fi.js
rename to build/media_source/vendor/tinymce/langs/fi.es5.js
diff --git a/build/media/vendor/tinymce/langs/fo.js b/build/media_source/vendor/tinymce/langs/fo.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/fo.js
rename to build/media_source/vendor/tinymce/langs/fo.es5.js
diff --git a/build/media/vendor/tinymce/langs/fr.js b/build/media_source/vendor/tinymce/langs/fr.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/fr.js
rename to build/media_source/vendor/tinymce/langs/fr.es5.js
diff --git a/build/media/vendor/tinymce/langs/ga.js b/build/media_source/vendor/tinymce/langs/ga.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/ga.js
rename to build/media_source/vendor/tinymce/langs/ga.es5.js
diff --git a/build/media/vendor/tinymce/langs/gl.js b/build/media_source/vendor/tinymce/langs/gl.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/gl.js
rename to build/media_source/vendor/tinymce/langs/gl.es5.js
diff --git a/build/media/vendor/tinymce/langs/he.js b/build/media_source/vendor/tinymce/langs/he.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/he.js
rename to build/media_source/vendor/tinymce/langs/he.es5.js
diff --git a/build/media/vendor/tinymce/langs/hr.js b/build/media_source/vendor/tinymce/langs/hr.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/hr.js
rename to build/media_source/vendor/tinymce/langs/hr.es5.js
diff --git a/build/media/vendor/tinymce/langs/hu.js b/build/media_source/vendor/tinymce/langs/hu.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/hu.js
rename to build/media_source/vendor/tinymce/langs/hu.es5.js
diff --git a/build/media/vendor/tinymce/langs/id.js b/build/media_source/vendor/tinymce/langs/id.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/id.js
rename to build/media_source/vendor/tinymce/langs/id.es5.js
diff --git a/build/media/vendor/tinymce/langs/it.js b/build/media_source/vendor/tinymce/langs/it.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/it.js
rename to build/media_source/vendor/tinymce/langs/it.es5.js
diff --git a/build/media/vendor/tinymce/langs/ja.js b/build/media_source/vendor/tinymce/langs/ja.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/ja.js
rename to build/media_source/vendor/tinymce/langs/ja.es5.js
diff --git a/build/media/vendor/tinymce/langs/ka.js b/build/media_source/vendor/tinymce/langs/ka.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/ka.js
rename to build/media_source/vendor/tinymce/langs/ka.es5.js
diff --git a/build/media/vendor/tinymce/langs/km.js b/build/media_source/vendor/tinymce/langs/km.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/km.js
rename to build/media_source/vendor/tinymce/langs/km.es5.js
diff --git a/build/media/vendor/tinymce/langs/ko.js b/build/media_source/vendor/tinymce/langs/ko.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/ko.js
rename to build/media_source/vendor/tinymce/langs/ko.es5.js
diff --git a/build/media/vendor/tinymce/langs/lb.js b/build/media_source/vendor/tinymce/langs/lb.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/lb.js
rename to build/media_source/vendor/tinymce/langs/lb.es5.js
diff --git a/build/media/vendor/tinymce/langs/lt.js b/build/media_source/vendor/tinymce/langs/lt.es5.js
similarity index 77%
rename from build/media/vendor/tinymce/langs/lt.js
rename to build/media_source/vendor/tinymce/langs/lt.es5.js
index 594284be785ae..f13e305fcf464 100644
--- a/build/media/vendor/tinymce/langs/lt.js
+++ b/build/media_source/vendor/tinymce/langs/lt.es5.js
@@ -1,179 +1,230 @@
 tinymce.addI18n('lt',{
+"Redo": "Gr\u0105\u017einti",
+"Undo": "Atstatyti",
 "Cut": "I\u0161kirpti",
-"Header 2": "Antra\u0161t\u0117 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Nar\u0161ykl\u0117s nustatymai neleid\u017eia redaktoriui tiesiogiai pasiekti laikinosios atminties. Pra\u0161ome naudoti klaviat\u016bros klavi\u0161us Ctrl+X\/C\/V.",
-"Div": "Div",
+"Copy": "Kopijuoti",
 "Paste": "\u012ed\u0117ti",
-"Close": "U\u017edaryti",
-"Font Family": "\u0160riftas",
-"Pre": "Pre",
-"Align right": "Lygiuoti de\u0161in\u0117je",
+"Select all": "Pa\u017eym\u0117ti visk\u0105",
 "New document": "Naujas dokumentas",
-"Blockquote": "Citata",
+"Ok": "Gerai",
+"Cancel": "Atsisakyti",
+"Visual aids": "Vaizdin\u0117s priemon\u0117s",
+"Bold": "Pary\u0161kintas",
+"Italic": "Kursyvinis",
+"Underline": "Pabrauktas",
+"Strikethrough": "Perbrauktas",
+"Superscript": "Vir\u0161utinis indeksas",
+"Subscript": "Apatinis indeksas",
+"Clear formatting": "Naikinti formatavim\u0105",
+"Align left": "Lygiuoti kair\u0117je",
+"Align center": "Centruoti",
+"Align right": "Lygiuoti de\u0161in\u0117je",
+"Justify": "I\u0161d\u0117styti per vis\u0105 plot\u012f",
+"Bullet list": "\u017denklinimo s\u0105ra\u0161as",
 "Numbered list": "Skaitmeninis s\u0105ra\u0161as",
+"Decrease indent": "Ma\u017einti \u012ftrauk\u0105",
 "Increase indent": "Didinti \u012ftrauk\u0105",
+"Close": "U\u017edaryti",
 "Formats": "Formatai",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Nar\u0161ykl\u0117s nustatymai neleid\u017eia redaktoriui tiesiogiai pasiekti laikinosios atminties. Pra\u0161ome naudoti klaviat\u016bros klavi\u0161us Ctrl+X\/C\/V.",
 "Headers": "Antra\u0161t\u0117s",
-"Select all": "Pa\u017eym\u0117ti visk\u0105",
-"Header 3": "Antra\u0161t\u0117 3",
-"Blocks": "Blokai",
-"Undo": "Atstatyti",
-"Strikethrough": "Perbrauktas",
-"Bullet list": "\u017denklinimo s\u0105ra\u0161as",
 "Header 1": "Antra\u0161t\u0117 1",
-"Superscript": "Vir\u0161utinis indeksas",
-"Clear formatting": "Naikinti formatavim\u0105",
-"Font Sizes": "\u0160rifto dyd\u017eiai",
-"Subscript": "Apatinis indeksas",
+"Header 2": "Antra\u0161t\u0117 2",
+"Header 3": "Antra\u0161t\u0117 3",
+"Header 4": "Antra\u0161t\u0117 4",
+"Header 5": "Antra\u0161t\u0117 5",
 "Header 6": "Antra\u0161t\u0117 6",
-"Redo": "Gr\u0105\u017einti",
-"Paragraph": "Paragrafas",
-"Ok": "Gerai",
-"Bold": "Pary\u0161kintas",
+"Headings": "Antra\u0161t\u0117s",
+"Heading 1": "Antra\u0161t\u0117 1",
+"Heading 2": "Antra\u0161t\u0117 2",
+"Heading 3": "Antra\u0161t\u0117 3",
+"Heading 4": "Antra\u0161t\u0117 4",
+"Heading 5": "Antra\u0161t\u0117 5",
+"Heading 6": "Antra\u0161t\u0117 6",
+"Div": "Div",
+"Pre": "Pre",
 "Code": "Kodas",
-"Italic": "Kursyvinis",
-"Align center": "Centruoti",
-"Header 5": "Antra\u0161t\u0117 5",
-"Decrease indent": "Ma\u017einti \u012ftrauk\u0105",
-"Header 4": "Antra\u0161t\u0117 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Dabar \u012fterpiama paprastojo teksto re\u017eimu. Kol \u0161i parinktis \u012fjungta, turinys bus \u012fterptas kaip paprastas tekstas.",
-"Underline": "Pabrauktas",
-"Cancel": "Atsisakyti",
-"Justify": "I\u0161d\u0117styti per vis\u0105 plot\u012f",
+"Paragraph": "Paragrafas",
+"Blockquote": "Citata",
 "Inline": "Inline",
-"Copy": "Kopijuoti",
-"Align left": "Lygiuoti kair\u0117je",
-"Visual aids": "Vaizdin\u0117s priemon\u0117s",
-"Lower Greek": "Ma\u017eosios graik\u0173",
-"Square": "Kvadratas",
+"Blocks": "Blokai",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Dabar \u012fterpiama paprastojo teksto re\u017eimu. Kol \u0161i parinktis \u012fjungta, turinys bus \u012fterptas kaip paprastas tekstas.",
+"Font Family": "\u0160riftas",
+"Font Sizes": "\u0160rifto dyd\u017eiai",
 "Default": "Pagrindinis",
-"Lower Alpha": "Ma\u017eosios raid\u0117s",
 "Circle": "Apskritimas",
 "Disc": "Diskas",
+"Square": "Kvadratas",
+"Lower Alpha": "Ma\u017eosios raid\u0117s",
+"Lower Greek": "Ma\u017eosios graik\u0173",
+"Lower Roman": "Ma\u017eosios rom\u0117n\u0173",
 "Upper Alpha": "Did\u017eiosios raid\u0117s",
 "Upper Roman": "Did\u017eiosios rom\u0117n\u0173",
-"Lower Roman": "Ma\u017eosios rom\u0117n\u0173",
-"Name": "Pavadinimas",
 "Anchor": "\u017dym\u0117",
+"Name": "Pavadinimas",
+"Id": "ID",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID turi prasid\u0117ti raide, po kurios gali b\u016bti raid\u0117s, skai\u010diai, br\u016bk\u0161niai, ta\u0161kai, kabliata\u0161kiai ar apatiniai pabraukimai.",
 "You have unsaved changes are you sure you want to navigate away?": "Turite nei\u0161saugot\u0173 pakeitim\u0173! Ar tikrai norite i\u0161eiti?",
 "Restore last draft": "Atstatyti paskutin\u012f projekt\u0105",
 "Special character": "Specialus simbolis",
 "Source code": "Pirminis \u0161altinis",
-"Right to left": "I\u0161 de\u0161in\u0117s \u012f kair\u0119",
+"Insert\/Edit code sample": "Prid\u0117ti \/ keisti kodo pavyzd\u012f",
+"Language": "Kalba",
+"Color": "Spalva",
+"R": "R",
+"G": "G",
+"B": "B",
 "Left to right": "I\u0161 kair\u0117s \u012f de\u0161in\u0119",
+"Right to left": "I\u0161 de\u0161in\u0117s \u012f kair\u0119",
 "Emoticons": "Jaustukai",
-"Robots": "Robotai",
 "Document properties": "Dokumento savyb\u0117s",
 "Title": "Pavadinimas",
 "Keywords": "\u017dymos",
-"Encoding": "Kodavimas",
 "Description": "Apra\u0161as",
+"Robots": "Robotai",
 "Author": "Autorius",
+"Encoding": "Kodavimas",
 "Fullscreen": "Visas ekranas",
 "Horizontal line": "Horizontali linija",
-"Horizontal space": "Horizontalus tarpas",
 "Insert\/edit image": "\u012eterpti|Tvarkyti paveiksl\u0117l\u012f",
-"General": "Bendra",
-"Advanced": "I\u0161pl\u0117stas",
+"Image description": "Paveiksl\u0117lio apra\u0161as",
 "Source": "Pirmin\u0117 nuoroda",
-"Border": "R\u0117melis",
+"Dimensions": "Matmenys",
 "Constrain proportions": "Laikytis proporcij\u0173",
-"Vertical space": "Vertikalus tarpas",
-"Image description": "Paveiksl\u0117lio apra\u0161as",
+"General": "Bendra",
+"Advanced": "I\u0161pl\u0117stas",
 "Style": "Stilius",
-"Dimensions": "Matmenys",
+"Vertical space": "Vertikalus tarpas",
+"Horizontal space": "Horizontalus tarpas",
+"Border": "R\u0117melis",
 "Insert image": "\u012eterpti paveiksl\u0117l\u012f",
+"Image": "Paveiksl\u0117lis",
+"Rotate counterclockwise": "Pasukti prie\u0161 laikrod\u017eio rodykl\u0119",
+"Rotate clockwise": "Pasukti pagal laikrod\u017eio rodykl\u0119",
+"Flip vertically": "Apversti vertikaliai",
+"Flip horizontally": "Apversti horizontaliai",
+"Edit image": "Redaguoti paveiksl\u0117l\u012f",
+"Image options": "Paveiksl\u0117lio nustatymai",
+"Zoom in": "Priartinti",
+"Zoom out": "Atitolinti",
+"Crop": "Atkarpyti",
+"Resize": "Keisti dyd\u012f",
+"Orientation": "Pasukimas",
+"Brightness": "\u0160viesumas",
+"Sharpen": "Ry\u0161kumas",
+"Contrast": "Kontrastas",
+"Color levels": "Spalv\u0173 lygiai",
+"Gamma": "Gama",
+"Invert": "Prie\u0161ingos spalvos",
+"Apply": "Taikyti",
+"Back": "Atgal",
 "Insert date\/time": "\u012eterpti dat\u0105\/laik\u0105",
-"Remove link": "\u0160alinti nuorod\u0105",
-"Url": "Nuoroda",
-"Text to display": "Rodomas tekstas",
-"Anchors": "\u017dym\u0117",
+"Date\/time": "Data \/ laikas",
 "Insert link": "\u012eterpti nuorod\u0105",
-"New window": "Naujas langas",
+"Insert\/edit link": "\u012eterpti\/taisyti nuorod\u0105",
+"Text to display": "Rodomas tekstas",
+"Url": "Nuoroda",
+"Target": "Tikslin\u0117 nuoroda",
 "None": "Nieko",
+"New window": "Naujas langas",
+"Remove link": "\u0160alinti nuorod\u0105",
+"Anchors": "\u017dym\u0117",
+"Link": "Nuoroda",
+"Paste or type a link": "\u012eklijuokite arba \u012fra\u0161ykite nuorod\u0105",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Atrodo, kad \u012fvesta nuoroda yra elektroninio pa\u0161to adresas. Ar norite prie\u0161 j\u012f \u012fvesti reikalaujam\u0105 \u201emailto:\u201c?",
 "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Atrodo, kad \u012fved\u0117te nuotolin\u0119 nuorod\u0105. Ar norite prie\u0161 j\u0105 \u012fvesti reikalaujam\u0105 \u201ehttp:\/\/\u201c?",
-"Target": "Tikslin\u0117 nuoroda",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Atrodo, kad \u012fvesta nuoroda yra elektroninio pa\u0161to adresas. Ar prad\u017eioje norite \u012fvesti reikalaujam\u0105 \u201emailto:\u201c?",
-"Insert\/edit link": "\u012eterpti\/taisyti nuorod\u0105",
+"Insert video": "\u012eterpti video",
 "Insert\/edit video": "\u012eterpti\/tvarkyti video",
-"Poster": "Plakatas",
+"Insert\/edit media": "Prid\u0117ti \/ keisti medij\u0105",
 "Alternative source": "Alternatyvus \u0161altinis",
+"Poster": "Plakatas",
 "Paste your embed code below:": "\u012eterpkite kod\u0105 \u017eemiau:",
-"Insert video": "\u012eterpti video",
 "Embed": "\u012eterpti",
+"Media": "Medija",
 "Nonbreaking space": "Nepertraukiamos vietos",
 "Page break": "Puslapio skirtukas",
 "Paste as text": "\u012eklijuoti kaip tekst\u0105",
 "Preview": "Per\u017ei\u016bra",
 "Print": "Spausdinti",
 "Save": "I\u0161saugoti",
-"Could not find the specified string.": "Nepavyko rasti nurodytos eilut\u0117s.",
+"Find": "Ie\u0161koti",
+"Replace with": "Kuo pakeisti",
 "Replace": "Pakeisti",
+"Replace all": "Pakeisti visk\u0105",
+"Prev": "Ankstesnis",
 "Next": "Sekantis",
-"Whole words": "Visus \u017eod\u017eius",
 "Find and replace": "Surasti ir pakeisti",
-"Replace with": "Kuo pakeisti",
-"Find": "Ie\u0161koti",
-"Replace all": "Pakeisti visk\u0105",
+"Could not find the specified string.": "Nepavyko rasti nurodytos eilut\u0117s.",
 "Match case": "Atitinkamus",
-"Prev": "Ankstesnis",
+"Whole words": "Visus \u017eod\u017eius",
 "Spellcheck": "Ra\u0161ybos tikrinimas",
-"Finish": "Baigti",
-"Ignore all": "Ignoruoti visk\u0105",
 "Ignore": "Ignoruoti",
-"Insert row before": "\u012eterpti eilut\u0119 prie\u0161",
-"Rows": "Eilut\u0117s",
-"Height": "Auk\u0161tis",
-"Paste row after": "\u012ed\u0117ti eilut\u0119 po",
-"Alignment": "Lygiavimas",
-"Column group": "Stulpeli\u0173 grup\u0117",
-"Row": "Eilut\u0117s",
-"Insert column before": "\u012eterpti stulpel\u012f prie\u0161",
-"Split cell": "Skaidyti langelius",
-"Cell padding": "Tarpas nuo langelio iki teksto",
-"Cell spacing": "Tarpas tarp langeli\u0173",
-"Row type": "Eilu\u010di\u0173 tipas",
+"Ignore all": "Ignoruoti visk\u0105",
+"Finish": "Baigti",
+"Add to Dictionary": "Prid\u0117ti \u012f \u017dodyn\u0105",
 "Insert table": "\u012eterpti lentel\u0119",
-"Body": "Turinys",
-"Caption": "Antra\u0161t\u0117",
-"Footer": "Apa\u010dia",
-"Delete row": "Naikinti eilut\u0119",
-"Paste row before": "\u012ed\u0117ti eilut\u0119 prie\u0161",
-"Scope": "Strukt\u016bra",
+"Table properties": "Lentel\u0117s savyb\u0117s",
 "Delete table": "\u0160alinti lentel\u0119",
-"Header cell": "Antra\u0161t\u0117s langelis",
-"Column": "Stulpelis",
 "Cell": "Langeliai",
-"Header": "Antra\u0161t\u0117",
-"Cell type": "Langelio tipas",
-"Copy row": "Kopijuoti eilut\u0119",
+"Row": "Eilut\u0117s",
+"Column": "Stulpelis",
+"Cell properties": "Langelio savyb\u0117s",
+"Merge cells": "Sujungti langelius",
+"Split cell": "Skaidyti langelius",
+"Insert row before": "\u012eterpti eilut\u0119 prie\u0161",
+"Insert row after": "\u012eterpti eilut\u0119 po",
+"Delete row": "Naikinti eilut\u0119",
 "Row properties": "Eilut\u0117s savyb\u0117s",
-"Table properties": "Lentel\u0117s savyb\u0117s",
-"Row group": "Eilu\u010di\u0173 grup\u0117",
-"Right": "De\u0161in\u0117",
+"Cut row": "I\u0161kirpti eilut\u0119",
+"Copy row": "Kopijuoti eilut\u0119",
+"Paste row before": "\u012ed\u0117ti eilut\u0119 prie\u0161",
+"Paste row after": "\u012ed\u0117ti eilut\u0119 po",
+"Insert column before": "\u012eterpti stulpel\u012f prie\u0161",
 "Insert column after": "\u012eterpti stulpel\u012f po",
+"Delete column": "Naikinti stulpel\u012f",
 "Cols": "Stulpeliai",
-"Insert row after": "\u012eterpti eilut\u0119 po",
+"Rows": "Eilut\u0117s",
 "Width": "Plotis",
-"Cell properties": "Langelio savyb\u0117s",
+"Height": "Auk\u0161tis",
+"Cell spacing": "Tarpas tarp langeli\u0173",
+"Cell padding": "Tarpas nuo langelio iki teksto",
+"Caption": "Antra\u0161t\u0117",
 "Left": "Kair\u0117",
-"Cut row": "I\u0161kirpti eilut\u0119",
-"Delete column": "Naikinti stulpel\u012f",
 "Center": "Centras",
-"Merge cells": "Sujungti langelius",
+"Right": "De\u0161in\u0117",
+"Cell type": "Langelio tipas",
+"Scope": "Strukt\u016bra",
+"Alignment": "Lygiavimas",
+"H Align": "H Lygiavimas",
+"V Align": "V Lygiavimas",
+"Top": "Vir\u0161uje",
+"Middle": "Viduryje",
+"Bottom": "Apa\u010dioje",
+"Header cell": "Antra\u0161t\u0117s langelis",
+"Row group": "Eilu\u010di\u0173 grup\u0117",
+"Column group": "Stulpeli\u0173 grup\u0117",
+"Row type": "Eilu\u010di\u0173 tipas",
+"Header": "Antra\u0161t\u0117",
+"Body": "Turinys",
+"Footer": "Apa\u010dia",
+"Border color": "R\u0117melio spalva",
 "Insert template": "\u012eterpti \u0161ablon\u0105",
 "Templates": "\u0160ablonai",
-"Background color": "Fono spalva",
 "Text color": "Teksto spalva",
+"Background color": "Fono spalva",
+"Custom...": "Pasirinktinas...",
+"Custom color": "Pasirinktina spalva",
+"No color": "Jokios spalvos",
+"Table of Contents": "Turinys",
 "Show blocks": "Rodyti blokus",
 "Show invisible characters": "Rodyti nematomus simbolius",
 "Words: {0}": "\u017dod\u017eiai: {0}",
-"Insert": "\u012eterpti",
 "File": "Failas",
 "Edit": "Redaguoti",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Suformatuoto teksto laukas. D\u0117l meniu spauskite ALT-F9. U\u017eduo\u010di\u0173 juostos \u012fjungimui spauskite ALT-F10. Pagalbai - spauskite ALT-0.",
-"Tools": "\u012erankiai",
+"Insert": "\u012eterpti",
 "View": "Per\u017ei\u016bra",
+"Format": "Formatas",
 "Table": "Lentel\u0117",
-"Format": "Formatas"
+"Tools": "\u012erankiai",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Suformatuoto teksto laukas. D\u0117l meniu spauskite ALT-F9. U\u017eduo\u010di\u0173 juostos \u012fjungimui spauskite ALT-F10. Pagalbai - spauskite ALT-0."
 });
\ No newline at end of file
diff --git a/build/media/vendor/tinymce/langs/lv.js b/build/media_source/vendor/tinymce/langs/lv.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/lv.js
rename to build/media_source/vendor/tinymce/langs/lv.es5.js
diff --git a/build/media/vendor/tinymce/langs/mk.js b/build/media_source/vendor/tinymce/langs/mk.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/mk.js
rename to build/media_source/vendor/tinymce/langs/mk.es5.js
diff --git a/build/media/vendor/tinymce/langs/ms.js b/build/media_source/vendor/tinymce/langs/ms.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/ms.js
rename to build/media_source/vendor/tinymce/langs/ms.es5.js
diff --git a/build/media/vendor/tinymce/langs/nb.js b/build/media_source/vendor/tinymce/langs/nb.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/nb.js
rename to build/media_source/vendor/tinymce/langs/nb.es5.js
diff --git a/build/media/vendor/tinymce/langs/nl.js b/build/media_source/vendor/tinymce/langs/nl.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/nl.js
rename to build/media_source/vendor/tinymce/langs/nl.es5.js
diff --git a/build/media/vendor/tinymce/langs/pl.js b/build/media_source/vendor/tinymce/langs/pl.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/pl.js
rename to build/media_source/vendor/tinymce/langs/pl.es5.js
diff --git a/build/media/vendor/tinymce/langs/pt-BR.js b/build/media_source/vendor/tinymce/langs/pt-BR.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/pt-BR.js
rename to build/media_source/vendor/tinymce/langs/pt-BR.es5.js
diff --git a/build/media/vendor/tinymce/langs/pt-PT.js b/build/media_source/vendor/tinymce/langs/pt-PT.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/pt-PT.js
rename to build/media_source/vendor/tinymce/langs/pt-PT.es5.js
diff --git a/build/media/vendor/tinymce/langs/readme.md b/build/media_source/vendor/tinymce/langs/readme.md
similarity index 100%
rename from build/media/vendor/tinymce/langs/readme.md
rename to build/media_source/vendor/tinymce/langs/readme.md
diff --git a/build/media/vendor/tinymce/langs/ro.js b/build/media_source/vendor/tinymce/langs/ro.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/ro.js
rename to build/media_source/vendor/tinymce/langs/ro.es5.js
diff --git a/build/media/vendor/tinymce/langs/ru.js b/build/media_source/vendor/tinymce/langs/ru.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/ru.js
rename to build/media_source/vendor/tinymce/langs/ru.es5.js
diff --git a/build/media/vendor/tinymce/langs/si-LK.js b/build/media_source/vendor/tinymce/langs/si-LK.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/si-LK.js
rename to build/media_source/vendor/tinymce/langs/si-LK.es5.js
diff --git a/build/media/vendor/tinymce/langs/sk.js b/build/media_source/vendor/tinymce/langs/sk.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/sk.js
rename to build/media_source/vendor/tinymce/langs/sk.es5.js
diff --git a/build/media/vendor/tinymce/langs/sl.js b/build/media_source/vendor/tinymce/langs/sl.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/sl.js
rename to build/media_source/vendor/tinymce/langs/sl.es5.js
diff --git a/build/media/vendor/tinymce/langs/sr.js b/build/media_source/vendor/tinymce/langs/sr.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/sr.js
rename to build/media_source/vendor/tinymce/langs/sr.es5.js
diff --git a/build/media/vendor/tinymce/langs/sv.js b/build/media_source/vendor/tinymce/langs/sv.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/sv.js
rename to build/media_source/vendor/tinymce/langs/sv.es5.js
diff --git a/build/media/vendor/tinymce/langs/sw.js b/build/media_source/vendor/tinymce/langs/sw.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/sw.js
rename to build/media_source/vendor/tinymce/langs/sw.es5.js
diff --git a/build/media/vendor/tinymce/langs/sy.js b/build/media_source/vendor/tinymce/langs/sy.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/sy.js
rename to build/media_source/vendor/tinymce/langs/sy.es5.js
diff --git a/build/media/vendor/tinymce/langs/ta.js b/build/media_source/vendor/tinymce/langs/ta.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/ta.js
rename to build/media_source/vendor/tinymce/langs/ta.es5.js
diff --git a/build/media/vendor/tinymce/langs/th.js b/build/media_source/vendor/tinymce/langs/th.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/th.js
rename to build/media_source/vendor/tinymce/langs/th.es5.js
diff --git a/build/media/vendor/tinymce/langs/tr.js b/build/media_source/vendor/tinymce/langs/tr.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/tr.js
rename to build/media_source/vendor/tinymce/langs/tr.es5.js
diff --git a/build/media/vendor/tinymce/langs/ug.js b/build/media_source/vendor/tinymce/langs/ug.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/ug.js
rename to build/media_source/vendor/tinymce/langs/ug.es5.js
diff --git a/build/media/vendor/tinymce/langs/uk.js b/build/media_source/vendor/tinymce/langs/uk.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/uk.js
rename to build/media_source/vendor/tinymce/langs/uk.es5.js
diff --git a/build/media/vendor/tinymce/langs/vi.js b/build/media_source/vendor/tinymce/langs/vi.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/vi.js
rename to build/media_source/vendor/tinymce/langs/vi.es5.js
diff --git a/build/media/vendor/tinymce/langs/zh-CN.js b/build/media_source/vendor/tinymce/langs/zh-CN.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/zh-CN.js
rename to build/media_source/vendor/tinymce/langs/zh-CN.es5.js
diff --git a/build/media/vendor/tinymce/langs/zh-TW.js b/build/media_source/vendor/tinymce/langs/zh-TW.es5.js
similarity index 100%
rename from build/media/vendor/tinymce/langs/zh-TW.js
rename to build/media_source/vendor/tinymce/langs/zh-TW.es5.js
diff --git a/build/media/vendor/tinymce/templates/layout1.html b/build/media_source/vendor/tinymce/templates/layout1.html
similarity index 100%
rename from build/media/vendor/tinymce/templates/layout1.html
rename to build/media_source/vendor/tinymce/templates/layout1.html
diff --git a/build/media/vendor/tinymce/templates/snippet1.html b/build/media_source/vendor/tinymce/templates/snippet1.html
similarity index 100%
rename from build/media/vendor/tinymce/templates/snippet1.html
rename to build/media_source/vendor/tinymce/templates/snippet1.html
diff --git a/build/media_src/com_associations/js/associations-edit.es6.js b/build/media_src/com_associations/js/associations-edit.es6.js
deleted file mode 100644
index 7b0cab5df7b8a..0000000000000
--- a/build/media_src/com_associations/js/associations-edit.es6.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-Joomla = window.Joomla || {};
-
-((Joomla, document) => {
-  'use strict';
-
-  Joomla.hideAssociation = (formControl, languageCode) => {
-    const controlGroup = [].slice.call(document.querySelectorAll('#associations .control-group'));
-
-    controlGroup.forEach((element) => {
-      // Current selected language. Hide it
-      const el = element.querySelector('.control-label label');
-
-      if (el) {
-        const attribute = el.getAttribute('for');
-
-        if (attribute.replace('_id', '') === `${formControl}_associations_${languageCode.replace('-', '_')}`) {
-          element.style.display = 'none';
-        }
-      }
-    });
-  };
-
-  Joomla.showAssociationMessage = () => {
-    const controlGroup = [].slice.call(document.querySelectorAll('#associations .control-group'));
-    const associations = document.getElementById('associations');
-
-    if (associations) {
-      const html = document.createElement('joomla-alert');
-      html.innerHTML = Joomla.JText._('JGLOBAL_ASSOC_NOT_POSSIBLE');
-
-      associations.insertAdjacentElement('afterbegin', html);
-    }
-
-    controlGroup.forEach((element) => {
-      element.style.display = 'none';
-    });
-  };
-
-  document.addEventListener('DOMContentLoaded', () => {
-    const associationsEditOptions = Joomla.getOptions('system.associations.edit');
-    const formControl = associationsEditOptions.formControl || 'jform';
-    const formControlLanguage = document.getElementById(`${formControl}_language`);
-
-    // Hide the associations tab if needed
-    if (parseInt(associationsEditOptions.hidden, 10) === 1) {
-      Joomla.showAssociationMessage();
-    } else if (formControlLanguage) {
-      // Hide only the associations for the current language
-      Joomla.hideAssociation(formControl, formControlLanguage.value);
-    }
-
-    // When changing the language
-    if (formControlLanguage) {
-      formControlLanguage.addEventListener('change', (event) => {
-        // Remove message if any
-        Joomla.removeMessages();
-
-        let existsAssociations = false;
-
-        /** For each language, remove the associations, ie,
-         *  empty the associations fields and reset the buttons to Select/Create
-         */
-        const controlGroup = [].slice.call(document.querySelectorAll('#associations .control-group'));
-
-        controlGroup.forEach((element) => {
-          const attribute = element.querySelector('.control-label label').getAttribute('for');
-          const languageCode = attribute.replace('_id', '').replace('jform_associations_', '');
-
-          // Show the association fields
-          element.style.display = 'block';
-
-          // Check if there was an association selected for this language
-          if (!existsAssociations && document.getElementById(`${formControl}_associations_${languageCode}_id`).value !== '') {
-            existsAssociations = true;
-          }
-
-          // Call the modal clear button
-          const clear = document.getElementById(`${formControl}_associations_${languageCode}_clear`);
-
-          if (clear.onclick) {
-            clear.onclick();
-          } else if (clear.click) {
-            clear.click();
-          }
-        });
-
-        // If associations existed, send a warning to the user
-        if (existsAssociations) {
-          Joomla.renderMessages({ warning: [Joomla.JText._('JGLOBAL_ASSOCIATIONS_RESET_WARNING')] });
-        }
-
-        // If the selected language is All hide the fields and add a message
-        const selectedLanguage = event.target.value;
-
-        if (selectedLanguage === '*') {
-          Joomla.showAssociationMessage();
-        } else {
-          // Else show the associations fields/buttons and hide the current selected language
-          Joomla.hideAssociation(formControl, selectedLanguage);
-        }
-      });
-    }
-  });
-})(Joomla, document);
diff --git a/build/media_src/plg_captcha_recaptcha/js/recaptcha.es6.js b/build/media_src/plg_captcha_recaptcha/js/recaptcha.es6.js
deleted file mode 100644
index 50e4e51e8b409..0000000000000
--- a/build/media_src/plg_captcha_recaptcha/js/recaptcha.es6.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @package     Joomla.JavaScript
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-window.JoomlaInitReCaptcha2 = () => {
-  'use strict';
-
-  const itemNodes = document.getElementsByClassName('g-recaptcha');
-  const items = [].slice.call(itemNodes);
-  items.forEach((item) => {
-    const options = item.dataset ? item.dataset : {
-      sitekey: item.getAttribute('data-sitekey'),
-      theme: item.getAttribute('data-theme'),
-      size: item.getAttribute('data-size'),
-    };
-
-    /* global grecaptcha */
-    grecaptcha.render(item, options);
-  });
-};
diff --git a/build/stubGenerator.php b/build/stubGenerator.php
index cbb52f4588b48..42a84d86654be 100644
--- a/build/stubGenerator.php
+++ b/build/stubGenerator.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Build
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,6 +11,7 @@
 
 // Import namespaced classes
 use Joomla\CMS\Application\CliApplication;
+use Joomla\CMS\Factory;
 
 // Load system defines
 if (file_exists(dirname(__DIR__) . '/defines.php'))
@@ -98,7 +99,7 @@ public function doExecute()
 	}
 }
 
-JFactory::getContainer()->share(
+Factory::getContainer()->share(
 	'StubGenerator',
 	function (\Joomla\DI\Container $container)
 	{
@@ -114,6 +115,6 @@ function (\Joomla\DI\Container $container)
 	true
 );
 
-$app = JFactory::getContainer()->get('StubGenerator');
-JFactory::$application = $app;
+$app = Factory::getContainer()->get('StubGenerator');
+Factory::$application = $app;
 $app->execute();
diff --git a/build/travis/phpenv/apcu-7.3.ini b/build/travis/phpenv/apcu-7.3.ini
new file mode 100644
index 0000000000000..019901d1ba62c
--- /dev/null
+++ b/build/travis/phpenv/apcu-7.3.ini
@@ -0,0 +1,2 @@
+apc.enabled=true
+apc.enable_cli=true
diff --git a/cli/finder_indexer.php b/cli/finder_indexer.php
index 511c5ca444a85..4170efcd7ab10 100644
--- a/cli/finder_indexer.php
+++ b/cli/finder_indexer.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Cli
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -21,6 +21,8 @@
 // We are a valid entry point.
 const _JEXEC = 1;
 
+use Joomla\CMS\Factory;
+
 // Load system defines
 if (file_exists(dirname(__DIR__) . '/defines.php'))
 {
@@ -39,7 +41,7 @@
 require_once JPATH_BASE . '/includes/framework.php';
 
 // Load Library language
-$lang = JFactory::getLanguage();
+$lang = Factory::getLanguage();
 
 // Try the finder_cli file in the current language (without allowing the loading of the file in the default language)
 $lang->load('finder_cli', JPATH_SITE, null, false, false)
@@ -59,7 +61,7 @@ class FinderCli extends \Joomla\CMS\Application\CliApplication
 	 * @var    string
 	 * @since  2.5
 	 */
-	private $time = null;
+	private $time;
 
 	/**
 	 * Start time for each batch
@@ -67,7 +69,7 @@ class FinderCli extends \Joomla\CMS\Application\CliApplication
 	 * @var    string
 	 * @since  2.5
 	 */
-	private $qtime = null;
+	private $qtime;
 
 	/**
 	 * Static filters information.
@@ -140,7 +142,7 @@ private function index()
 		JLoader::register('FinderIndexer', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/indexer.php');
 
 		// Disable caching.
-		$config = JFactory::getConfig();
+		$config = Factory::getConfig();
 		$config->set('caching', 0);
 		$config->set('cache_handler', 'file');
 
@@ -155,7 +157,7 @@ private function index()
 		$this->out(JText::_('FINDER_CLI_STARTING_INDEXER'), true);
 
 		// Trigger the onStartIndex event.
-		JFactory::getApplication()->triggerEvent('onStartIndex');
+		Factory::getApplication()->triggerEvent('onStartIndex');
 
 		// Remove the script time limit.
 		@set_time_limit(0);
@@ -167,7 +169,7 @@ private function index()
 		$this->out(JText::_('FINDER_CLI_SETTING_UP_PLUGINS'), true);
 
 		// Trigger the onBeforeIndex event.
-		JFactory::getApplication()->triggerEvent('onBeforeIndex');
+		Factory::getApplication()->triggerEvent('onBeforeIndex');
 
 		// Startup reporting.
 		$this->out(JText::sprintf('FINDER_CLI_SETUP_ITEMS', $state->totalItems, round(microtime(true) - $this->time, 3)), true);
@@ -189,10 +191,10 @@ private function index()
 				$state->batchOffset = 0;
 
 				// Trigger the onBuildIndex event.
-				JFactory::getApplication()->triggerEvent('onBuildIndex');
+				Factory::getApplication()->triggerEvent('onBuildIndex');
 
 				// Batch reporting.
-				$this->out(JText::sprintf('FINDER_CLI_BATCH_COMPLETE', ($i + 1), round(microtime(true) - $this->qtime, 3)), true);
+				$this->out(JText::sprintf('FINDER_CLI_BATCH_COMPLETE', $i + 1, round(microtime(true) - $this->qtime, 3)), true);
 			}
 		}
 		catch (Exception $e)
@@ -254,7 +256,7 @@ private function putFilters()
 	{
 		$this->out(JText::_('FINDER_CLI_RESTORE_FILTERS'));
 
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 
 		// Use the temporary filter information to update the filter taxonomy ids.
 		foreach ($this->filters as $filter_id => $filter)
@@ -316,7 +318,7 @@ private function getFilters()
 		$this->out(JText::_('FINDER_CLI_SAVE_FILTERS'));
 
 		// Get the taxonomy ids used by the filters.
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query
 			->select('filter_id, title, data')
@@ -327,7 +329,7 @@ private function getFilters()
 		foreach ($filters as $filter)
 		{
 			// Skip empty filters.
-			if ($filter->data == '')
+			if ($filter->data === '')
 			{
 				continue;
 			}
@@ -357,7 +359,7 @@ private function getFilters()
 }
 
 // Set up the container
-JFactory::getContainer()->share(
+Factory::getContainer()->share(
 	'FinderCli',
 	function (\Joomla\DI\Container $container)
 	{
@@ -372,6 +374,6 @@ function (\Joomla\DI\Container $container)
 	},
 	true
 );
-$app = JFactory::getContainer()->get('FinderCli');
-JFactory::$application = $app;
+$app = Factory::getContainer()->get('FinderCli');
+Factory::$application = $app;
 $app->execute();
diff --git a/cli/joomla.php b/cli/joomla.php
index ba78110255838..becb723f05234 100644
--- a/cli/joomla.php
+++ b/cli/joomla.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Cli
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_ajax/ajax.php b/components/com_ajax/ajax.php
index ee431ce25c0d1..3560a6674399b 100644
--- a/components/com_ajax/ajax.php
+++ b/components/com_ajax/ajax.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_ajax
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_banners/Controller/DisplayController.php b/components/com_banners/Controller/DisplayController.php
index 15753e08c177f..ad06815eefd55 100644
--- a/components/com_banners/Controller/DisplayController.php
+++ b/components/com_banners/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_banners/Helper/BannerHelper.php b/components/com_banners/Helper/BannerHelper.php
index 85c9a8fc55624..0a971f16b1be7 100644
--- a/components/com_banners/Helper/BannerHelper.php
+++ b/components/com_banners/Helper/BannerHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_banners/Model/BannerModel.php b/components/com_banners/Model/BannerModel.php
index c101b253c90f3..1fcebe4fcba9d 100644
--- a/components/com_banners/Model/BannerModel.php
+++ b/components/com_banners/Model/BannerModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_banners/Model/BannersModel.php b/components/com_banners/Model/BannersModel.php
index 162b22457c0c2..d531ef2c67aac 100644
--- a/components/com_banners/Model/BannersModel.php
+++ b/components/com_banners/Model/BannersModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_banners/Service/Category.php b/components/com_banners/Service/Category.php
index c580eef59c8cb..68cecb13da3b2 100644
--- a/components/com_banners/Service/Category.php
+++ b/components/com_banners/Service/Category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_banners/router.php b/components/com_banners/router.php
index d3f5f24faf250..090ca3688182a 100644
--- a/components/com_banners/router.php
+++ b/components/com_banners/router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/Controller/ConfigController.php b/components/com_config/Controller/ConfigController.php
index 9d0a44240c0e1..cba476798a36d 100644
--- a/components/com_config/Controller/ConfigController.php
+++ b/components/com_config/Controller/ConfigController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -18,7 +18,6 @@
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 
 /**
@@ -70,11 +69,7 @@ public function cancel()
 	public function save()
 	{
 		// Check for request forgeries.
-		if (!Session::checkToken())
-		{
-			$this->app->enqueueMessage(Text::_('JINVALID_TOKEN'));
-			$this->app->redirect('index.php');
-		}
+		$this->checkToken();
 
 		// Check if the user is authorized to do this.
 		if (!Factory::getUser()->authorise('core.admin'))
diff --git a/components/com_config/Controller/DisplayController.php b/components/com_config/Controller/DisplayController.php
index 2e4b2e65c7d9c..b2641925ca2ce 100644
--- a/components/com_config/Controller/DisplayController.php
+++ b/components/com_config/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/Controller/ModulesController.php b/components/com_config/Controller/ModulesController.php
index e1af3b8cc9506..24db53510872d 100644
--- a/components/com_config/Controller/ModulesController.php
+++ b/components/com_config/Controller/ModulesController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -20,7 +20,6 @@
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Modules\Administrator\Controller\ModuleController;
 
@@ -73,11 +72,7 @@ public function cancel()
 	public function save()
 	{
 		// Check for request forgeries.
-		if (!Session::checkToken())
-		{
-			$this->app->enqueueMessage(Text::_('JINVALID_TOKEN'));
-			$this->app->redirect('index.php');
-		}
+		$this->checkToken();
 
 		// Check if the user is authorized to do this.
 		$user = Factory::getUser();
diff --git a/components/com_config/Controller/TemplatesController.php b/components/com_config/Controller/TemplatesController.php
index b94d37e94180a..779c096270c85 100644
--- a/components/com_config/Controller/TemplatesController.php
+++ b/components/com_config/Controller/TemplatesController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -18,9 +18,7 @@
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
-use Joomla\Component\Templates\Administrator\Controller\Style;
 
 /**
  * Component Controller
@@ -71,12 +69,7 @@ public function cancel()
 	public function save()
 	{
 		// Check for request forgeries.
-		if (!Session::checkToken())
-		{
-			$this->setRedirect('index.php', Text::_('JINVALID_TOKEN'));
-
-			return false;
-		}
+		$this->checkToken();
 
 		// Check if the user is authorized to do this.
 		if (!Factory::getUser()->authorise('core.admin'))
diff --git a/components/com_config/Dispatcher/Dispatcher.php b/components/com_config/Dispatcher/Dispatcher.php
index 0b5404c217bec..fb7b5df51acec 100644
--- a/components/com_config/Dispatcher/Dispatcher.php
+++ b/components/com_config/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/Model/CmsModel.php b/components/com_config/Model/CmsModel.php
index 5aa84fc55e864..9d7ef80ad1d38 100644
--- a/components/com_config/Model/CmsModel.php
+++ b/components/com_config/Model/CmsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/Model/ConfigModel.php b/components/com_config/Model/ConfigModel.php
index b5451f15d437a..afbdec8392def 100644
--- a/components/com_config/Model/ConfigModel.php
+++ b/components/com_config/Model/ConfigModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/Model/FormModel.php b/components/com_config/Model/FormModel.php
index aaa99265a33d0..2b3eacc70b7c7 100644
--- a/components/com_config/Model/FormModel.php
+++ b/components/com_config/Model/FormModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/Model/ModulesModel.php b/components/com_config/Model/ModulesModel.php
index c28544ec15516..e3ecd93ec9d8d 100644
--- a/components/com_config/Model/ModulesModel.php
+++ b/components/com_config/Model/ModulesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/Model/TemplatesModel.php b/components/com_config/Model/TemplatesModel.php
index 8794430830fb3..9886fa0dfaecf 100644
--- a/components/com_config/Model/TemplatesModel.php
+++ b/components/com_config/Model/TemplatesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/View/Config/HtmlView.php b/components/com_config/View/Config/HtmlView.php
index 8ba4c9b6b3647..883edce16db8e 100644
--- a/components/com_config/View/Config/HtmlView.php
+++ b/components/com_config/View/Config/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/View/Modules/HtmlView.php b/components/com_config/View/Modules/HtmlView.php
index ce8a54ebbc055..c2e1ffe83e002 100644
--- a/components/com_config/View/Modules/HtmlView.php
+++ b/components/com_config/View/Modules/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/View/Templates/HtmlView.php b/components/com_config/View/Templates/HtmlView.php
index df960386a5e72..43cad8edbf754 100644
--- a/components/com_config/View/Templates/HtmlView.php
+++ b/components/com_config/View/Templates/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/tmpl/config/default.php b/components/com_config/tmpl/config/default.php
index 0c7ebd8d2e6d3..8bcb9e372d2dd 100644
--- a/components/com_config/tmpl/config/default.php
+++ b/components/com_config/tmpl/config/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/tmpl/config/default_metadata.php b/components/com_config/tmpl/config/default_metadata.php
index b9fd0ba6b5836..52aed26ecbff7 100644
--- a/components/com_config/tmpl/config/default_metadata.php
+++ b/components/com_config/tmpl/config/default_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/tmpl/config/default_seo.php b/components/com_config/tmpl/config/default_seo.php
index ca222e8227b9a..598badbc2182f 100644
--- a/components/com_config/tmpl/config/default_seo.php
+++ b/components/com_config/tmpl/config/default_seo.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/tmpl/config/default_site.php b/components/com_config/tmpl/config/default_site.php
index a2d2110577419..d6be11614a462 100644
--- a/components/com_config/tmpl/config/default_site.php
+++ b/components/com_config/tmpl/config/default_site.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/tmpl/modules/default.php b/components/com_config/tmpl/modules/default.php
index c2e1489236ff4..165046da5933b 100644
--- a/components/com_config/tmpl/modules/default.php
+++ b/components/com_config/tmpl/modules/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/tmpl/modules/default_options.php b/components/com_config/tmpl/modules/default_options.php
index 71fd2b262d78d..4e14cf32f7d46 100644
--- a/components/com_config/tmpl/modules/default_options.php
+++ b/components/com_config/tmpl/modules/default_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/tmpl/templates/default.php b/components/com_config/tmpl/templates/default.php
index 608cf51dc1327..ab2744d718228 100644
--- a/components/com_config/tmpl/templates/default.php
+++ b/components/com_config/tmpl/templates/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/tmpl/templates/default_options.php b/components/com_config/tmpl/templates/default_options.php
index 1e8b920a3ad80..d7505f47365a4 100644
--- a/components/com_config/tmpl/templates/default_options.php
+++ b/components/com_config/tmpl/templates/default_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/Controller/ContactController.php b/components/com_contact/Controller/ContactController.php
index 41f2717d2baed..14bbd6601ec25 100644
--- a/components/com_contact/Controller/ContactController.php
+++ b/components/com_contact/Controller/ContactController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -65,10 +65,37 @@ public function submit()
 		$id     = (int) $stub;
 
 		// Get the data from POST
-		$data    = $this->input->post->get('jform', array(), 'array');
+		$data = $this->input->post->get('jform', array(), 'array');
+
+		// Get item
+		$model->setState('filter.published', 1);
 		$contact = $model->getItem($id);
 
-		$params->merge($contact->params);
+		// Get item params, take menu parameters into account if necessary
+		$active = $app->getMenu()->getActive();
+		$stateParams = clone $model->getState()->get('params');
+
+		// If the current view is the active item and a contact view for this contact, then the menu item params take priority
+		if ($active && strpos($active->link, 'view=contact') && strpos($active->link, '&id=' . (int) $contact->id))
+		{
+			// $item->params are the contact params, $temp are the menu item params
+			// Merge so that the menu item params take priority
+			$contact->params->merge($stateParams);
+		}
+		else
+		{
+			// Current view is not a single contact, so the contact params take priority here
+			$stateParams->merge($contact->params);
+			$contact->params = $stateParams;
+		}
+
+		// Check if the contact form is enabled
+		if (!$contact->params->get('show_email_form'))
+		{
+			$this->setRedirect(JRoute::_('index.php?option=com_contact&view=contact&id=' . $stub, false));
+
+			return false;
+		}
 
 		// Check for a valid session cookie
 		if ($params->get('validate_session', 0))
diff --git a/components/com_contact/Controller/DisplayController.php b/components/com_contact/Controller/DisplayController.php
index ced4ef6a333a1..f5b961995d918 100644
--- a/components/com_contact/Controller/DisplayController.php
+++ b/components/com_contact/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/Dispatcher/Dispatcher.php b/components/com_contact/Dispatcher/Dispatcher.php
index 5f450f3b4adcc..1dbbfd6172fb2 100644
--- a/components/com_contact/Dispatcher/Dispatcher.php
+++ b/components/com_contact/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/Helper/AssociationHelper.php b/components/com_contact/Helper/AssociationHelper.php
index 6d1cc32899ff9..673f96f17194b 100644
--- a/components/com_contact/Helper/AssociationHelper.php
+++ b/components/com_contact/Helper/AssociationHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/Helper/Route.php b/components/com_contact/Helper/Route.php
index 7b98adf3fb00c..a57515d24400d 100644
--- a/components/com_contact/Helper/Route.php
+++ b/components/com_contact/Helper/Route.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/Model/CategoriesModel.php b/components/com_contact/Model/CategoriesModel.php
index ce0c5e1a98ace..4ec45d2e0cd44 100644
--- a/components/com_contact/Model/CategoriesModel.php
+++ b/components/com_contact/Model/CategoriesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/Model/CategoryModel.php b/components/com_contact/Model/CategoryModel.php
index eee7ee5b76bae..bbfb193c941bd 100644
--- a/components/com_contact/Model/CategoryModel.php
+++ b/components/com_contact/Model/CategoryModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -82,7 +82,8 @@ public function __construct($config = array())
 				'sortname',
 				'sortname1', 'a.sortname1',
 				'sortname2', 'a.sortname2',
-				'sortname3', 'a.sortname3'
+				'sortname3', 'a.sortname3',
+				'featuredordering', 'a.featured'
 			);
 		}
 
@@ -205,6 +206,11 @@ protected function getListQuery()
 				->order($db->escape('a.sortname2') . ' ' . $db->escape($this->getState('list.direction', 'ASC')))
 				->order($db->escape('a.sortname3') . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
 		}
+		elseif ($this->getState('list.ordering') === 'featuredordering')
+		{
+			$query->order($db->escape('a.featured') . ' DESC')
+			->order($db->escape('a.ordering') . ' ASC');
+		}
 		else
 		{
 			$query->order($db->escape($this->getState('list.ordering', 'a.ordering')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
@@ -230,13 +236,30 @@ protected function populateState($ordering = null, $direction = null)
 		$app = Factory::getApplication();
 		$params = ComponentHelper::getParams('com_contact');
 
+		// Get list ordering default from the parameters
+		$menuParams = new Registry;
+
+		if ($menu = $app->getMenu()->getActive())
+		{
+			$menuParams->loadString($menu->params);
+		}
+
+		$mergedParams = clone $params;
+		$mergedParams->merge($menuParams);
+
 		// List state information
 		$format = $app->input->getWord('format');
 
+		$numberOfContactsToDisplay = $mergedParams->get('contacts_display_num');
+
 		if ($format === 'feed')
 		{
 			$limit = $app->get('feed_limit');
 		}
+		elseif (isset($numberOfContactsToDisplay))
+		{
+			$limit = $numberOfContactsToDisplay;
+		}
 		else
 		{
 			$limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $app->get('list_limit'), 'uint');
@@ -252,17 +275,6 @@ protected function populateState($ordering = null, $direction = null)
 		$search = $app->getUserStateFromRequest('com_contact.category.list.' . $itemid . '.filter-search', 'filter-search', '', 'string');
 		$this->setState('list.filter', $search);
 
-		// Get list ordering default from the parameters
-		$menuParams = new Registry;
-
-		if ($menu = $app->getMenu()->getActive())
-		{
-			$menuParams->loadString($menu->params);
-		}
-
-		$mergedParams = clone $params;
-		$mergedParams->merge($menuParams);
-
 		$orderCol = $app->input->get('filter_order', $mergedParams->get('initial_sort', 'ordering'));
 
 		if (!in_array($orderCol, $this->filter_fields))
diff --git a/components/com_contact/Model/ContactModel.php b/components/com_contact/Model/ContactModel.php
index a14e8c828e03f..01b459ead0a3b 100644
--- a/components/com_contact/Model/ContactModel.php
+++ b/components/com_contact/Model/ContactModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -423,6 +423,7 @@ private function getSlugColumn($query, $id, $alias)
 	 * @return  mixed    The contact object on success, false on failure
 	 *
 	 * @throws  \Exception  On database failure
+	 * @deprecated  4.0    Use ContactModelContact::getItem() instead
 	 */
 	protected function getContactQuery($pk = null)
 	{
diff --git a/components/com_contact/Model/FeaturedModel.php b/components/com_contact/Model/FeaturedModel.php
index faa7b6224a4d7..1a2148f228edb 100644
--- a/components/com_contact/Model/FeaturedModel.php
+++ b/components/com_contact/Model/FeaturedModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/Rule/ContactEmailMessageRule.php b/components/com_contact/Rule/ContactEmailMessageRule.php
index b207d312f1f7e..d3d298d5ca717 100644
--- a/components/com_contact/Rule/ContactEmailMessageRule.php
+++ b/components/com_contact/Rule/ContactEmailMessageRule.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/Rule/ContactEmailRule.php b/components/com_contact/Rule/ContactEmailRule.php
index 52f6d9a0732a5..58b41468e0d8c 100644
--- a/components/com_contact/Rule/ContactEmailRule.php
+++ b/components/com_contact/Rule/ContactEmailRule.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/Rule/ContactEmailSubjectRule.php b/components/com_contact/Rule/ContactEmailSubjectRule.php
index a93ddfa38c84f..5f600c43e5259 100644
--- a/components/com_contact/Rule/ContactEmailSubjectRule.php
+++ b/components/com_contact/Rule/ContactEmailSubjectRule.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/Service/Category.php b/components/com_contact/Service/Category.php
index ad954b8c3308c..c8068ac53fdf7 100644
--- a/components/com_contact/Service/Category.php
+++ b/components/com_contact/Service/Category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/Service/Router.php b/components/com_contact/Service/Router.php
index 39357f2bb2085..45d149bcc28a5 100644
--- a/components/com_contact/Service/Router.php
+++ b/components/com_contact/Service/Router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/View/Categories/HtmlView.php b/components/com_contact/View/Categories/HtmlView.php
index ce69328de32b3..94d65b364f71e 100644
--- a/components/com_contact/View/Categories/HtmlView.php
+++ b/components/com_contact/View/Categories/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/View/Category/FeedView.php b/components/com_contact/View/Category/FeedView.php
index f7bbd2c838e20..87d717047ff6f 100644
--- a/components/com_contact/View/Category/FeedView.php
+++ b/components/com_contact/View/Category/FeedView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/View/Category/HtmlView.php b/components/com_contact/View/Category/HtmlView.php
index ee9ca3f4d7762..56c22204b8602 100644
--- a/components/com_contact/View/Category/HtmlView.php
+++ b/components/com_contact/View/Category/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -60,6 +60,9 @@ public function display($tpl = null)
 	{
 		parent::commonCategoryDisplay();
 
+		// Flag indicates to not add limitstart=0 to URL
+		$this->pagination->hideEmptyLimitstart = true;
+
 		// Prepare the data.
 		// Compute the contact slug.
 		foreach ($this->items as $item)
diff --git a/components/com_contact/View/Contact/HtmlView.php b/components/com_contact/View/Contact/HtmlView.php
index 40475b0716ade..b4f1ad6977fde 100644
--- a/components/com_contact/View/Contact/HtmlView.php
+++ b/components/com_contact/View/Contact/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/View/Contact/VcfView.php b/components/com_contact/View/Contact/VcfView.php
index ff5dcc4c546e5..e8d360972b5f7 100644
--- a/components/com_contact/View/Contact/VcfView.php
+++ b/components/com_contact/View/Contact/VcfView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/View/Featured/HtmlView.php b/components/com_contact/View/Featured/HtmlView.php
index 812a540b328a9..69cfc7fb4ba0c 100644
--- a/components/com_contact/View/Featured/HtmlView.php
+++ b/components/com_contact/View/Featured/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -86,6 +86,9 @@ public function display($tpl = null)
 		$parent     = $this->get('Parent');
 		$pagination = $this->get('Pagination');
 
+		// Flag indicates to not add limitstart=0 to URL
+		$pagination->hideEmptyLimitstart = true;
+
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
diff --git a/components/com_contact/helpers/route.php b/components/com_contact/helpers/route.php
index 970aa285790ef..96ce914b8b19e 100644
--- a/components/com_contact/helpers/route.php
+++ b/components/com_contact/helpers/route.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/layouts/field/render.php b/components/com_contact/layouts/field/render.php
index 70c7a8018c376..cc0cbb05196f0 100644
--- a/components/com_contact/layouts/field/render.php
+++ b/components/com_contact/layouts/field/render.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -20,6 +20,7 @@
 $value     = $field->value;
 $class     = $field->params->get('render_class');
 $showLabel = $field->params->get('showlabel');
+$labelClass = $field->params->get('label_render_class');
 
 if ($field->context == 'com_contact.mail')
 {
@@ -38,7 +39,7 @@
 ?>
 <dt class="contact-field-entry <?php echo $class; ?>">
 	<?php if ($showLabel == 1) : ?>
-		<span class="field-label"><?php echo htmlentities($label, ENT_QUOTES | ENT_IGNORE, 'UTF-8'); ?>: </span>
+		<span class="field-label <?php echo $labelClass; ?>"><?php echo htmlentities($label, ENT_QUOTES | ENT_IGNORE, 'UTF-8'); ?>: </span>
 	<?php endif; ?>
 </dt>
 <dd class="contact-field-entry <?php echo $class; ?>">
diff --git a/components/com_contact/layouts/fields/render.php b/components/com_contact/layouts/fields/render.php
index 8428e05989f2b..71bcdff52b028 100644
--- a/components/com_contact/layouts/fields/render.php
+++ b/components/com_contact/layouts/fields/render.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -67,7 +67,8 @@
 		continue;
 	}
 
-	echo FieldsHelper::render($context, 'field.render', array('field' => $field));
+	$layout = $field->params->get('layout', 'render');
+	echo FieldsHelper::render($context, 'field.' . $layout, array('field' => $field));
 }
 
 if (!$isMail)
diff --git a/components/com_contact/layouts/joomla/form/renderfield.php b/components/com_contact/layouts/joomla/form/renderfield.php
index 6bf7140ff8a82..290b2c0cb934b 100644
--- a/components/com_contact/layouts/joomla/form/renderfield.php
+++ b/components/com_contact/layouts/joomla/form/renderfield.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/tmpl/categories/default.php b/components/com_contact/tmpl/categories/default.php
index 96d3a44ee27ea..cec26bc3388aa 100644
--- a/components/com_contact/tmpl/categories/default.php
+++ b/components/com_contact/tmpl/categories/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/tmpl/categories/default_items.php b/components/com_contact/tmpl/categories/default_items.php
index fc99e7181344b..9218a9fbd2208 100644
--- a/components/com_contact/tmpl/categories/default_items.php
+++ b/components/com_contact/tmpl/categories/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -23,7 +23,7 @@
 					<a href="<?php echo Route::_(ContactHelperRoute::getCategoryRoute($item->id, $item->language)); ?>">
 					<?php echo $this->escape($item->title); ?></a>
 					<?php if ($this->params->get('show_cat_items_cat') == 1) :?>
-						<span class="badge badge-info tip hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'COM_CONTACT_NUM_ITEMS'); ?>">
+						<span class="badge badge-info">
 							<?php echo Text::_('COM_CONTACT_NUM_ITEMS'); ?>&nbsp;
 							<?php echo $item->numitems; ?>
 						</span>
diff --git a/components/com_contact/tmpl/category/default.php b/components/com_contact/tmpl/category/default.php
index ddb8e3bb6178e..3d553d7a2175f 100644
--- a/components/com_contact/tmpl/category/default.php
+++ b/components/com_contact/tmpl/category/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/tmpl/category/default.xml b/components/com_contact/tmpl/category/default.xml
index d54f6fc8fb98a..6299547aa5406 100644
--- a/components/com_contact/tmpl/category/default.xml
+++ b/components/com_contact/tmpl/category/default.xml
@@ -35,15 +35,15 @@
 	<fields name="params">
 		<fieldset name="basic" label="JGLOBAL_CATEGORY_OPTIONS">
 
-			<field 
-				name="spacer1" 
-				type="spacer" 
+			<field
+				name="spacer1"
+				type="spacer"
 				label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
 				class="text"
 			/>
 
-			<field 
-				name="show_category_title" 
+			<field
+				name="show_category_title"
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_TITLE"
 				useglobal="true"
@@ -53,8 +53,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_description" 
+			<field
+				name="show_description"
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 				useglobal="true"
@@ -64,8 +64,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_description_image" 
+			<field
+				name="show_description_image"
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
 				useglobal="true"
@@ -75,8 +75,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="maxLevel" 
+			<field
+				name="maxLevel"
 				type="list"
 				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
 				useglobal="true"
@@ -90,8 +90,8 @@
 				<option value="5">J5</option>
 			</field>
 
-			<field 
-				name="show_empty_categories" 
+			<field
+				name="show_empty_categories"
 				type="list"
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
@@ -102,8 +102,8 @@
 			</field>
 
 
-			<field 
-				name="show_subcat_desc" 
+			<field
+				name="show_subcat_desc"
 				type="list"
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
@@ -113,8 +113,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_cat_items" 
+			<field
+				name="show_cat_items"
 				type="list"
 				label="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_LABEL"
 				useglobal="true"
@@ -127,9 +127,9 @@
 
 		<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
 
-			<field 
-				name="spacer2" 
-				type="spacer" 
+			<field
+				name="spacer2"
+				type="spacer"
 				label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
 				class="text"
 			/>
@@ -146,8 +146,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_pagination_limit" 
+			<field
+				name="show_pagination_limit"
 				type="list"
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
@@ -157,8 +157,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_headings" 
+			<field
+				name="show_headings"
 				type="list"
 				label="JGLOBAL_SHOW_HEADINGS_LABEL"
 				useglobal="true"
@@ -168,10 +168,10 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_image_heading" 
+			<field
+				name="show_image_heading"
 				type="list"
-				label="COM_CONTACT_FIELD_CONFIG_SHOW_IMAGE_LABEL" 
+				label="COM_CONTACT_FIELD_CONFIG_SHOW_IMAGE_LABEL"
 				useglobal="true"
 				class="chzn-color"
 				>
@@ -179,8 +179,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_position_headings" 
+			<field
+				name="show_position_headings"
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_POSITION_LABEL"
 				useglobal="true"
@@ -190,8 +190,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_email_headings" 
+			<field
+				name="show_email_headings"
 				type="list"
 				label="JGLOBAL_EMAIL"
 				useglobal="true"
@@ -201,7 +201,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_telephone_headings"
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_PHONE_LABEL"
@@ -212,7 +212,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_mobile_headings"
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL"
@@ -223,7 +223,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_fax_headings"
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_FAX_LABEL"
@@ -234,8 +234,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_suburb_headings" 
+			<field
+				name="show_suburb_headings"
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_SUBURB_LABEL"
 				useglobal="true"
@@ -245,7 +245,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_state_headings"
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_STATE_LABEL"
@@ -256,7 +256,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_country_headings"
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL"
@@ -267,8 +267,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_pagination" 
+			<field
+				name="show_pagination"
 				type="list"
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
@@ -290,8 +290,25 @@
 
 			</field>
 
-			<field 
-				name="initial_sort" 
+			<field
+ 				name="contacts_display_num"
+ 				type="list"
+ 				label="COM_CONTACT_NUMBER_CONTACTS_LIST_LABEL"
+ 				useglobal="true"
+ 				>
+ 				<option value="5">J5</option>
+ 				<option value="10">J10</option>
+ 				<option value="15">J15</option>
+ 				<option value="20">J20</option>
+ 				<option value="25">J25</option>
+ 				<option value="30">J30</option>
+ 				<option value="50">J50</option>
+ 				<option value="100">J100</option>
+ 				<option value="0">JALL</option>
+ 			</field>
+
+			<field
+				name="initial_sort"
 				type="list"
 				label="COM_CONTACT_FIELD_INITIAL_SORT_LABEL"
 				useglobal="true"
@@ -299,12 +316,13 @@
 				<option value="name">COM_CONTACT_FIELD_VALUE_NAME</option>
 				<option value="sortname">COM_CONTACT_FIELD_VALUE_SORT_NAME</option>
 				<option value="ordering">COM_CONTACT_FIELD_VALUE_ORDERING</option>
+				<option value="featuredordering">COM_CONTACT_FIELD_VALUE_ORDERING_FEATURED</option>
 			</field>
 		</fieldset>
 
 		<fieldset name="contact" label="COM_CONTACT_BASIC_OPTIONS_FIELDSET_LABEL"
 			addfieldprefix="Joomla\Component\Fields\Administrator\Field">
-			<field 
+			<field
 				name="presentation_style"
 				type="list"
 				label="COM_CONTACT_FIELD_PRESENTATION_LABEL"
@@ -315,7 +333,7 @@
 				<option value="plain">COM_CONTACT_FIELD_VALUE_PLAIN</option>
 			</field>
 
-			<field 
+			<field
 				name="show_contact_category"
 				type="list"
 				label="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_LABEL"
@@ -327,7 +345,7 @@
 				<option value="show_with_link">COM_CONTACT_FIELD_VALUE_WITH_LINK</option>
 			</field>
 
-			<field 
+			<field
 				name="show_contact_list"
 				type="list"
 				label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
@@ -360,7 +378,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_name"
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
@@ -372,7 +390,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_position"
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_LABEL"
@@ -385,7 +403,7 @@
 
 			</field>
 
-			<field 
+			<field
 				name="show_email"
 				type="list"
 				label="JGLOBAL_EMAIL"
@@ -397,7 +415,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_street_address"
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_LABEL"
@@ -409,7 +427,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_suburb"
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL"
@@ -421,7 +439,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_state"
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_LABEL"
@@ -433,7 +451,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_postcode"
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_LABEL"
@@ -445,7 +463,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_country"
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_COUNTRY_LABEL"
@@ -457,7 +475,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_telephone"
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL"
@@ -469,7 +487,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_mobile"
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL"
@@ -481,7 +499,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_fax"
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_FAX_LABEL"
@@ -493,7 +511,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_webpage"
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL"
@@ -505,7 +523,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_image"
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL"
@@ -517,7 +535,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="allow_vcard"
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
@@ -539,7 +557,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_articles"
 				type="list"
 				label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
@@ -550,9 +568,9 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="articles_display_num" 
-				type="list" 
+			<field
+				name="articles_display_num"
+				type="list"
 				label="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_LABEL"
 				default=""
 				useglobal="true"
@@ -574,7 +592,7 @@
 				<option value="0">JALL</option>
 			</field>
 
-			<field 
+			<field
 				name="show_links"
 				type="list"
 				label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
@@ -584,7 +602,7 @@
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 			</field>
-			
+
 			<field
 				name="show_user_custom_fields"
 				type="fieldgroups"
@@ -595,7 +613,7 @@
 				<option value="-1">JALL</option>
 			</field>
 
-			<field 
+			<field
 				name="linka_name"
 				type="text"
 				label="COM_CONTACT_FIELD_LINKA_NAME_LABEL"
@@ -603,7 +621,7 @@
 				useglobal="true"
 			/>
 
-			<field 
+			<field
 				name="linkb_name"
 				type="text"
 				label="COM_CONTACT_FIELD_LINKB_NAME_LABEL"
@@ -611,7 +629,7 @@
 				useglobal="true"
 			/>
 
-			<field 
+			<field
 				name="linkc_name"
 				type="text"
 				label="COM_CONTACT_FIELD_LINKC_NAME_LABEL"
@@ -619,7 +637,7 @@
 				useglobal="true"
 			/>
 
-			<field 
+			<field
 				name="linkd_name"
 				type="text"
 				label="COM_CONTACT_FIELD_LINKD_NAME_LABEL"
@@ -627,7 +645,7 @@
 				useglobal="true"
 			/>
 
-			<field 
+			<field
 				name="linke_name"
 				type="text"
 				label="COM_CONTACT_FIELD_LINKE_NAME_LABEL"
@@ -638,8 +656,8 @@
 		<!-- Form options. -->
 		<fieldset name="Contact_Form" label="COM_CONTACT_MAIL_FIELDSET_LABEL">
 
-			<field 
-				name="show_email_form" 
+			<field
+				name="show_email_form"
 				type="list"
 				label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
 				useglobal="true"
@@ -649,8 +667,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_email_copy" 
+			<field
+				name="show_email_copy"
 				type="list"
 				label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
 				useglobal="true"
@@ -660,8 +678,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="banned_email" 
+			<field
+				name="banned_email"
 				type="textarea"
 				label="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_LABEL"
 				description="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_DESC"
@@ -669,8 +687,8 @@
 				rows="3"
 			/>
 
-			<field 
-				name="banned_subject" 
+			<field
+				name="banned_subject"
 				type="textarea"
 				label="COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_LABEL"
 				description="COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_DESC"
@@ -678,8 +696,8 @@
 				rows="3"
 			/>
 
-			<field 
-				name="banned_text" 
+			<field
+				name="banned_text"
 				type="textarea"
 				label="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_LABEL"
 				description="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_DESC"
@@ -687,8 +705,8 @@
 				rows="3"
 			/>
 
-			<field 
-				name="validate_session" 
+			<field
+				name="validate_session"
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
 				useglobal="true"
@@ -698,8 +716,8 @@
 				<option value="1">JYES</option>
 			</field>
 
-			<field 
-				name="custom_reply" 
+			<field
+				name="custom_reply"
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
 				useglobal="true"
@@ -709,8 +727,8 @@
 				<option value="1">JYES</option>
 			</field>
 
-			<field 
-				name="redirect" 
+			<field
+				name="redirect"
 				type="text"
 				label="COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL"
 				size="30"
@@ -720,8 +738,8 @@
 
 		<fieldset name="integration">
 
-			<field 
-				name="show_feed_link" 
+			<field
+				name="show_feed_link"
 				type="list"
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
diff --git a/components/com_contact/tmpl/category/default_children.php b/components/com_contact/tmpl/category/default_children.php
index 0498a3f54f40b..5d05bba8037ac 100644
--- a/components/com_contact/tmpl/category/default_children.php
+++ b/components/com_contact/tmpl/category/default_children.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/tmpl/category/default_items.php b/components/com_contact/tmpl/category/default_items.php
index f77d4e4d970cc..6a73341126705 100644
--- a/components/com_contact/tmpl/category/default_items.php
+++ b/components/com_contact/tmpl/category/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/tmpl/contact/default.php b/components/com_contact/tmpl/contact/default.php
index 4a9a02b0401f3..4455058d96edd 100644
--- a/components/com_contact/tmpl/contact/default.php
+++ b/components/com_contact/tmpl/contact/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/tmpl/contact/default.xml b/components/com_contact/tmpl/contact/default.xml
index aa2e071eca582..ac004da96f72e 100644
--- a/components/com_contact/tmpl/contact/default.xml
+++ b/components/com_contact/tmpl/contact/default.xml
@@ -315,6 +315,18 @@
 				<option value="0">JALL</option>
 			</field>
 
+			<field 
+				name="show_profile" 
+				type="list"
+				label="COM_CONTACT_FIELD_PROFILE_SHOW_LABEL"
+				description="COM_CONTACT_FIELD_PROFILE_SHOW_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
 			<field
 				name="show_user_custom_fields"
 				type="fieldgroups"
diff --git a/components/com_contact/tmpl/contact/default_address.php b/components/com_contact/tmpl/contact/default_address.php
index 7b20c4febc95d..c367653a009e5 100644
--- a/components/com_contact/tmpl/contact/default_address.php
+++ b/components/com_contact/tmpl/contact/default_address.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/tmpl/contact/default_articles.php b/components/com_contact/tmpl/contact/default_articles.php
index baf9991cc1dd8..51c5e186a406c 100644
--- a/components/com_contact/tmpl/contact/default_articles.php
+++ b/components/com_contact/tmpl/contact/default_articles.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/tmpl/contact/default_form.php b/components/com_contact/tmpl/contact/default_form.php
index 5951e706b95a1..a7adc698a17ba 100644
--- a/components/com_contact/tmpl/contact/default_form.php
+++ b/components/com_contact/tmpl/contact/default_form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/tmpl/contact/default_links.php b/components/com_contact/tmpl/contact/default_links.php
index bf4ed2a2b4f41..48893e0402ce3 100644
--- a/components/com_contact/tmpl/contact/default_links.php
+++ b/components/com_contact/tmpl/contact/default_links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/tmpl/contact/default_profile.php b/components/com_contact/tmpl/contact/default_profile.php
index 1e8275e668f06..46c14b021475a 100644
--- a/components/com_contact/tmpl/contact/default_profile.php
+++ b/components/com_contact/tmpl/contact/default_profile.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/tmpl/contact/default_user_custom_fields.php b/components/com_contact/tmpl/contact/default_user_custom_fields.php
index ad62b481a8c53..8b512f71bf6c5 100644
--- a/components/com_contact/tmpl/contact/default_user_custom_fields.php
+++ b/components/com_contact/tmpl/contact/default_user_custom_fields.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/tmpl/featured/default.php b/components/com_contact/tmpl/featured/default.php
index 98e68dee52e59..b0123cad78b29 100644
--- a/components/com_contact/tmpl/featured/default.php
+++ b/components/com_contact/tmpl/featured/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/tmpl/featured/default_items.php b/components/com_contact/tmpl/featured/default_items.php
index 5079203ec2e43..b2f9e24520458 100644
--- a/components/com_contact/tmpl/featured/default_items.php
+++ b/components/com_contact/tmpl/featured/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/Controller/ArticleController.php b/components/com_content/Controller/ArticleController.php
index 70d44ed49362e..1620ed0f55af1 100644
--- a/components/com_content/Controller/ArticleController.php
+++ b/components/com_content/Controller/ArticleController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/Controller/DisplayController.php b/components/com_content/Controller/DisplayController.php
index f966a0aa165ca..9d7ed3590d417 100644
--- a/components/com_content/Controller/DisplayController.php
+++ b/components/com_content/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -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;
@@ -116,7 +117,10 @@ public function display($cachable = false, $urlparams = false)
 			// Get/Create the model
 			if ($model = $this->getModel($vName))
 			{
-				$model->hit();
+				if (ComponentHelper::getParams('com_content')->get('record_hits', 1) == 1)
+				{
+					$model->hit();
+				}
 			}
 		}
 
diff --git a/components/com_content/Dispatcher/Dispatcher.php b/components/com_content/Dispatcher/Dispatcher.php
index 14a3649f21d3d..903c49a4408e9 100644
--- a/components/com_content/Dispatcher/Dispatcher.php
+++ b/components/com_content/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/Helper/AssociationHelper.php b/components/com_content/Helper/AssociationHelper.php
index 122b3c3bbf360..0ad92ce962847 100644
--- a/components/com_content/Helper/AssociationHelper.php
+++ b/components/com_content/Helper/AssociationHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/Helper/QueryHelper.php b/components/com_content/Helper/QueryHelper.php
index d885213560ae7..212cec2efd673 100644
--- a/components/com_content/Helper/QueryHelper.php
+++ b/components/com_content/Helper/QueryHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -231,95 +231,4 @@ public static function buildVotingQuery($params = null)
 
 		return array('select' => $select, 'join' => $join);
 	}
-
-	/**
-	 * Method to order the intro articles array for ordering
-	 * down the columns instead of across.
-	 * The layout always lays the introtext articles out across columns.
-	 * Array is reordered so that, when articles are displayed in index order
-	 * across columns in the layout, the result is that the
-	 * desired article ordering is achieved down the columns.
-	 *
-	 * @param   array    &$articles   Array of intro text articles
-	 * @param   integer  $numColumns  Number of columns in the layout
-	 *
-	 * @return  array  Reordered array to achieve desired ordering down columns
-	 *
-	 * @since   1.6
-	 */
-	public static function orderDownColumns(&$articles, $numColumns = 1)
-	{
-		$count = count($articles);
-
-		// Just return the same array if there is nothing to change
-		if ($numColumns == 1 || !is_array($articles) || $count <= $numColumns)
-		{
-			$return = $articles;
-		}
-		// We need to re-order the intro articles array
-		else
-		{
-			// We need to preserve the original array keys
-			$keys = array_keys($articles);
-
-			$maxRows = ceil($count / $numColumns);
-			$numCells = $maxRows * $numColumns;
-			$numEmpty = $numCells - $count;
-			$index = array();
-
-			// Calculate number of empty cells in the array
-
-			// Fill in all cells of the array
-			// Put -1 in empty cells so we can skip later
-			for ($row = 1, $i = 1; $row <= $maxRows; $row++)
-			{
-				for ($col = 1; $col <= $numColumns; $col++)
-				{
-					if ($numEmpty > ($numCells - $i))
-					{
-						// Put -1 in empty cells
-						$index[$row][$col] = -1;
-					}
-					else
-					{
-						// Put in zero as placeholder
-						$index[$row][$col] = 0;
-					}
-
-					$i++;
-				}
-			}
-
-			// Layout the articles in column order, skipping empty cells
-			$i = 0;
-
-			for ($col = 1; ($col <= $numColumns) && ($i < $count); $col++)
-			{
-				for ($row = 1; ($row <= $maxRows) && ($i < $count); $row++)
-				{
-					if ($index[$row][$col] != - 1)
-					{
-						$index[$row][$col] = $keys[$i];
-						$i++;
-					}
-				}
-			}
-
-			// Now read the $index back row by row to get articles in right row/col
-			// so that they will actually be ordered down the columns (when read by row in the layout)
-			$return = array();
-			$i = 0;
-
-			for ($row = 1; ($row <= $maxRows) && ($i < $count); $row++)
-			{
-				for ($col = 1; ($col <= $numColumns) && ($i < $count); $col++)
-				{
-					$return[$keys[$i]] = $articles[$index[$row][$col]];
-					$i++;
-				}
-			}
-		}
-
-		return $return;
-	}
 }
diff --git a/components/com_content/Model/ArchiveModel.php b/components/com_content/Model/ArchiveModel.php
index 38b5c047a9eff..318a8fe8f4042 100644
--- a/components/com_content/Model/ArchiveModel.php
+++ b/components/com_content/Model/ArchiveModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/Model/ArticleModel.php b/components/com_content/Model/ArticleModel.php
index 0a95f558d1211..59fdc7bdc8bf0 100644
--- a/components/com_content/Model/ArticleModel.php
+++ b/components/com_content/Model/ArticleModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -18,6 +18,7 @@
 use Joomla\CMS\Table\Table;
 use Joomla\Component\Content\Administrator\Extension\ContentComponent;
 use Joomla\Registry\Registry;
+use Joomla\Utilities\IpHelper;
 
 /**
  * Content Component Article Model
@@ -57,10 +58,12 @@ protected function populateState()
 		$params = $app->getParams();
 		$this->setState('params', $params);
 
-		// TODO: Tune these values based on other permissions.
 		$user = Factory::getUser();
 
-		if ((!$user->authorise('core.edit.state', 'com_content')) && (!$user->authorise('core.edit', 'com_content')))
+		// If $pk is set then authorise on complete asset, else on component only
+		$asset = empty($pk) ? 'com_content' : 'com_content.article.' . $pk;
+
+		if ((!$user->authorise('core.edit.state', $asset)) && (!$user->authorise('core.edit', $asset)))
 		{
 			$this->setState('filter.published', ContentComponent::CONDITION_PUBLISHED);
 			$this->setState('filter.archived', ContentComponent::CONDITION_ARCHIVED);
@@ -139,7 +142,7 @@ public function getItem($pk = null)
 				$query->select('ROUND(v.rating_sum / v.rating_count, 0) AS rating, v.rating_count as rating_count')
 					->join('LEFT', '#__content_rating AS v ON a.id = v.content_id');
 
-				if ((!$user->authorise('core.edit.state', 'com_content')) && (!$user->authorise('core.edit', 'com_content')))
+				if ((!$user->authorise('core.edit.state', 'com_content.article.' . $pk)) && (!$user->authorise('core.edit', 'com_content.article.' . $pk)))
 				{
 					// Filter by start and end dates.
 					$nullDate = $db->quote($db->getNullDate());
@@ -284,7 +287,7 @@ public function storeVote($pk = 0, $rate = 0)
 	{
 		if ($rate >= 1 && $rate <= 5 && $pk > 0)
 		{
-			$userIP = $_SERVER['REMOTE_ADDR'];
+			$userIP = IpHelper::getIp();
 
 			// Initialize variables.
 			$db    = $this->getDbo();
diff --git a/components/com_content/Model/ArticlesModel.php b/components/com_content/Model/ArticlesModel.php
index 1c7eb883d0d56..40f5902322fa9 100644
--- a/components/com_content/Model/ArticlesModel.php
+++ b/components/com_content/Model/ArticlesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -491,8 +491,7 @@ function ($data) use ($db)
 			case 'relative':
 				$relativeDate = (int) $this->getState('filter.relative_date', 0);
 				$query->where(
-					$dateField . ' >= DATE_SUB(' . $nowDate . ', INTERVAL ' .
-					$relativeDate . ' DAY)'
+					$dateField . ' >= ' . $query->dateAdd($nowDate, -1 * $relativeDate, 'DAY')
 				);
 				break;
 
@@ -505,9 +504,10 @@ function ($data) use ($db)
 		if (is_object($params) && ($params->get('filter_field') !== 'hide') && ($filter = $this->getState('list.filter')))
 		{
 			// Clean filter variable
-			$filter     = StringHelper::strtolower($filter);
-			$hitsFilter = (int) $filter;
-			$filter     = $db->quote('%' . $db->escape($filter, true) . '%', false);
+			$filter      = StringHelper::strtolower($filter);
+			$monthFilter = $filter;
+			$hitsFilter  = (int) $filter;
+			$filter      = $db->quote('%' . $db->escape($filter, true) . '%', false);
 
 			switch ($params->get('filter_field'))
 			{
@@ -522,6 +522,21 @@ function ($data) use ($db)
 					$query->where('a.hits >= ' . $hitsFilter . ' ');
 					break;
 
+				case 'month':
+					if ($monthFilter != '')
+					{
+						$query->where(
+							$db->quote(date("Y-m-d", strtotime($monthFilter)) . ' 00:00:00') . ' <= CASE WHEN a.publish_up = ' .
+							$db->quote($db->getNullDate()) . ' THEN a.created ELSE a.publish_up END'
+						);
+
+						$query->where(
+							$db->quote(date("Y-m-t", strtotime($monthFilter)) . ' 23:59:59') . ' >= CASE WHEN a.publish_up = ' .
+							$db->quote($db->getNullDate()) . ' THEN a.created ELSE a.publish_up END'
+						);
+					}
+					break;
+
 				case 'title':
 				default:
 					// Default to 'title' if parameter is not valid
@@ -739,4 +754,36 @@ public function getStart()
 	{
 		return $this->getState('list.start');
 	}
+
+	/**
+	 * Count Items by Month
+	 *
+	 * @return  mixed  An array of objects on success, false on failure.
+	 *
+	 * @since   3.9.0
+	 */
+	public function countItemsByMonth()
+	{
+		// Create a new query object.
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		$query
+			->select('DATE(' .
+				$query->concatenate(
+					array(
+						$query->year($query->quoteName('publish_up')),
+						$query->quote('-'),
+						$query->month($query->quoteName('publish_up')),
+						$query->quote('-01')
+					)
+				) . ') as d'
+			)
+			->select('COUNT(*) as c')
+			->from('(' . $this->getListQuery() . ') as b')
+			->group($query->quoteName('d'))
+			->order($query->quoteName('d') . ' desc');
+
+		return $db->setQuery($query)->loadObjectList();
+	}
 }
diff --git a/components/com_content/Model/CategoriesModel.php b/components/com_content/Model/CategoriesModel.php
index 3a8a0abcf8306..126a35f90936b 100644
--- a/components/com_content/Model/CategoriesModel.php
+++ b/components/com_content/Model/CategoriesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/Model/CategoryModel.php b/components/com_content/Model/CategoryModel.php
index eccc866db8c94..41c3ad61e6b40 100644
--- a/components/com_content/Model/CategoryModel.php
+++ b/components/com_content/Model/CategoryModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/Model/FeaturedModel.php b/components/com_content/Model/FeaturedModel.php
index d57e8caa9b434..d7680e0baa71c 100644
--- a/components/com_content/Model/FeaturedModel.php
+++ b/components/com_content/Model/FeaturedModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/Model/FormModel.php b/components/com_content/Model/FormModel.php
index a9c74104e3b99..fb79a201c4bac 100644
--- a/components/com_content/Model/FormModel.php
+++ b/components/com_content/Model/FormModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/Service/Category.php b/components/com_content/Service/Category.php
index 603f56cc81a66..6ada25e8a51c5 100644
--- a/components/com_content/Service/Category.php
+++ b/components/com_content/Service/Category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/Service/Router.php b/components/com_content/Service/Router.php
index 92563fd65f3e5..a09d1c4b300f5 100644
--- a/components/com_content/Service/Router.php
+++ b/components/com_content/Service/Router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/View/Archive/HtmlView.php b/components/com_content/View/Archive/HtmlView.php
index b86638f49b872..2fb43684585f1 100644
--- a/components/com_content/View/Archive/HtmlView.php
+++ b/components/com_content/View/Archive/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -108,6 +108,9 @@ public function display($tpl = null)
 		$items      = $this->get('Items');
 		$pagination = $this->get('Pagination');
 
+		// Flag indicates to not add limitstart=0 to URL
+		$pagination->hideEmptyLimitstart = true;
+
 		// Get the page/component configuration
 		$params = &$state->params;
 
diff --git a/components/com_content/View/Article/HtmlView.php b/components/com_content/View/Article/HtmlView.php
index 96043f115fbc5..b0e223975c867 100644
--- a/components/com_content/View/Article/HtmlView.php
+++ b/components/com_content/View/Article/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/View/Categories/HtmlView.php b/components/com_content/View/Categories/HtmlView.php
index abb5e544b70d2..1f63121b1264d 100644
--- a/components/com_content/View/Categories/HtmlView.php
+++ b/components/com_content/View/Categories/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/View/Category/FeedView.php b/components/com_content/View/Category/FeedView.php
index 25cf9f7f4a3ee..3023c141a88c2 100644
--- a/components/com_content/View/Category/FeedView.php
+++ b/components/com_content/View/Category/FeedView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/View/Category/HtmlView.php b/components/com_content/View/Category/HtmlView.php
index c74b32e6bbf23..01b0324eb33ad 100644
--- a/components/com_content/View/Category/HtmlView.php
+++ b/components/com_content/View/Category/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\CategoryView;
 use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\Component\Content\Site\Helper\QueryHelper;
 use Joomla\Registry\Registry;
 
 /**
@@ -32,7 +31,7 @@ class HtmlView extends CategoryView
 	protected $lead_items = array();
 
 	/**
-	 * @var    array  Array of intro (multicolumn display) items for blog display
+	 * @var    array  Array of intro items for blog display
 	 * @since  3.2
 	 */
 	protected $intro_items = array();
@@ -43,12 +42,6 @@ class HtmlView extends CategoryView
 	 */
 	protected $link_items = array();
 
-	/**
-	 * @var    integer  Number of columns in a multi column display
-	 * @since  3.2
-	 */
-	protected $columns = 1;
-
 	/**
 	 * @var    string  The name of the extension for the category
 	 * @since  3.2
@@ -78,6 +71,9 @@ public function display($tpl = null)
 	{
 		parent::commonCategoryDisplay();
 
+		// Flag indicates to not add limitstart=0 to URL
+		$this->pagination->hideEmptyLimitstart = true;
+
 		// Prepare the data
 		// Get the metrics for the structural page layout.
 		$params     = $this->params;
@@ -124,27 +120,6 @@ public function display($tpl = null)
 			$item->event->afterDisplayContent = trim(implode("\n", $results));
 		}
 
-		// Check for layout override only if this is not the active menu item
-		// If it is the active menu item, then the view and category id will match
-		$active  = $app->getMenu()->getActive();
-		$menus   = $app->getMenu();
-		$title   = null;
-
-		if ((!$active) || ((strpos($active->link, 'view=category') === false) || (strpos($active->link, '&id=' . (string) $this->category->id) === false)))
-		{
-			// Get the layout from the merged category params
-			if ($layout = $this->category->params->get('category_layout'))
-			{
-				$this->setLayout($layout);
-			}
-		}
-		// At this point, we are in a menu item, so we don't override the layout
-		elseif (isset($active->query['layout']))
-		{
-			// We need to set the layout from the query in case this is an alternative menu item (with an alternative layout)
-			$this->setLayout($active->query['layout']);
-		}
-
 		// For blog layouts, preprocess the breakdown of leading, intro and linked articles.
 		// This makes it much easier for the designer to just interrogate the arrays.
 		if ($params->get('layout_type') === 'blog' || $this->getLayout() === 'blog')
@@ -170,30 +145,21 @@ public function display($tpl = null)
 					continue;
 				}
 			}
-
-			$this->columns = max(1, $params->def('num_columns', 1));
-
-			$order = $params->def('multi_column_order', 1);
-
-			if ($order == 0 && $this->columns > 1)
-			{
-				// Call order down helper
-				$this->intro_items = QueryHelper::orderDownColumns($this->intro_items, $this->columns);
-			}
 		}
 
 		// Because the application sets a default page title,
 		// we need to get it from the menu item itself
-		$menu = $menus->getActive();
-
-		if ($menu
-			&& $menu->component == 'com_content'
-			&& isset($menu->query['view'], $menu->query['id'])
-			&& $menu->query['view'] == 'category'
-			&& $menu->query['id'] == $this->category->id)
+		$app    = Factory::getApplication();
+		$active = $app->getMenu()->getActive();
+
+		if ($active
+			&& $active->component == 'com_content'
+			&& isset($active->query['view'], $active->query['id'])
+			&& $active->query['view'] == 'category'
+			&& $active->query['id'] == $this->category->id)
 		{
-			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
-			$title = $this->params->get('page_title', $menu->title);
+			$this->params->def('page_heading', $this->params->get('page_title', $active->title));
+			$title = $this->params->get('page_title', $active->title);
 		}
 		else
 		{
diff --git a/components/com_content/View/Featured/FeedView.php b/components/com_content/View/Featured/FeedView.php
index abf08b57d9077..e9a6191b066fa 100644
--- a/components/com_content/View/Featured/FeedView.php
+++ b/components/com_content/View/Featured/FeedView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/View/Featured/HtmlView.php b/components/com_content/View/Featured/HtmlView.php
index 0d025d57556c0..059d62f51f0f2 100644
--- a/components/com_content/View/Featured/HtmlView.php
+++ b/components/com_content/View/Featured/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -16,7 +16,6 @@
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
-use Joomla\Component\Content\Site\Helper\QueryHelper;
 
 /**
  * Frontpage View class
@@ -67,13 +66,6 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected $link_items = array();
 
-	/**
-	 * The number of columns to show introduction articles in.
-	 *
-	 * @var  integer
-	 */
-	protected $columns = 1;
-
 	/**
 	 * An instance of JDatabaseDriver.
 	 *
@@ -120,6 +112,9 @@ public function display($tpl = null)
 		$items      = $this->get('Items');
 		$pagination = $this->get('Pagination');
 
+		// Flag indicates to not add limitstart=0 to URL
+		$pagination->hideEmptyLimitstart = true;
+
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
@@ -192,15 +187,6 @@ public function display($tpl = null)
 			$this->intro_items[$i] = &$items[$i];
 		}
 
-		$this->columns = max(1, $params->def('num_columns', 1));
-		$order = $params->def('multi_column_order', 1);
-
-		if ($order == 0 && $this->columns > 1)
-		{
-			// Call order down helper
-			$this->intro_items = QueryHelper::orderDownColumns($this->intro_items, $this->columns);
-		}
-
 		// The remainder are the links.
 		for ($i = $numLeading + $numIntro; $i < $max; $i++)
 		{
diff --git a/components/com_content/View/Form/HtmlView.php b/components/com_content/View/Form/HtmlView.php
index 19711d16dc3f0..71eab789a96e3 100644
--- a/components/com_content/View/Form/HtmlView.php
+++ b/components/com_content/View/Form/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/forms/article.xml b/components/com_content/forms/article.xml
index 23af7bba2c42f..3f7bc4e305b92 100644
--- a/components/com_content/forms/article.xml
+++ b/components/com_content/forms/article.xml
@@ -60,7 +60,7 @@
 		<field
 			name="transition"
 			type="transition"
-			component="com_content"
+			extension="com_content"
 			addfieldprefix="Joomla\Component\Workflow\Administrator\Field"
 			label="COM_CONTENT_STATE"
 		>
@@ -112,6 +112,16 @@
 			size="20" 
 		/>
 
+		<field
+			name="note"
+			type="text"
+			label="COM_CONTENT_FIELD_NOTE_LABEL"
+			description="COM_CONTENT_FIELD_NOTE_DESC"
+			class="inputbox"
+			size="40"
+			maxlength="255"
+		/>
+
 		<field
 			name="version_note"
 			type="text"
diff --git a/components/com_content/helpers/icon.php b/components/com_content/helpers/icon.php
index 02b1894a05366..20ea8c2ac9582 100644
--- a/components/com_content/helpers/icon.php
+++ b/components/com_content/helpers/icon.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/helpers/route.php b/components/com_content/helpers/route.php
index 7a3afd5832a9e..615642a174ecd 100644
--- a/components/com_content/helpers/route.php
+++ b/components/com_content/helpers/route.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/tmpl/archive/default.php b/components/com_content/tmpl/archive/default.php
index 3dfa88fe68a82..096fae3e8628d 100644
--- a/components/com_content/tmpl/archive/default.php
+++ b/components/com_content/tmpl/archive/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/tmpl/archive/default_items.php b/components/com_content/tmpl/archive/default_items.php
index f364437a02f61..a31d794426a37 100644
--- a/components/com_content/tmpl/archive/default_items.php
+++ b/components/com_content/tmpl/archive/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/tmpl/article/default.php b/components/com_content/tmpl/article/default.php
index 8cc0ae56fb56a..2c4c64f2e15eb 100644
--- a/components/com_content/tmpl/article/default.php
+++ b/components/com_content/tmpl/article/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/tmpl/article/default_links.php b/components/com_content/tmpl/article/default_links.php
index 01c48449f703c..5e18adf405a16 100644
--- a/components/com_content/tmpl/article/default_links.php
+++ b/components/com_content/tmpl/article/default_links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/tmpl/categories/default.php b/components/com_content/tmpl/categories/default.php
index 6d84d82f9a930..d6415c01fd167 100644
--- a/components/com_content/tmpl/categories/default.php
+++ b/components/com_content/tmpl/categories/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/tmpl/categories/default.xml b/components/com_content/tmpl/categories/default.xml
index 67fd788bef057..7ea45a2e67d8c 100644
--- a/components/com_content/tmpl/categories/default.xml
+++ b/components/com_content/tmpl/categories/default.xml
@@ -217,13 +217,6 @@
 				useglobal="true"
 			/>
 
-			<field 
-				name="num_columns" 
-				type="number"
-				label="JGLOBAL_NUM_COLUMNS_LABEL"
-				useglobal="true"
-			/>
-
 			<field 
 				name="num_links" 
 				type="number"
@@ -231,16 +224,6 @@
 				useglobal="true"
 			/>
 
-			<field 
-				name="multi_column_order" 
-				type="list"
-				label="JGLOBAL_MULTI_COLUMN_ORDER_LABEL"
-				useglobal="true"
-				>
-				<option value="0">JGLOBAL_DOWN</option>
-				<option value="1">JGLOBAL_ACROSS</option>
-			</field>
-
 			<field 
 				name="show_subcategory_content" 
 				type="list"
diff --git a/components/com_content/tmpl/categories/default_items.php b/components/com_content/tmpl/categories/default_items.php
index a0f3631cd3796..169ddb8f695d5 100644
--- a/components/com_content/tmpl/categories/default_items.php
+++ b/components/com_content/tmpl/categories/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -26,7 +26,7 @@
 					<a href="<?php echo Route::_(ContentHelperRoute::getCategoryRoute($item->id, $item->language)); ?>">
 					<?php echo $this->escape($item->title); ?></a>
 					<?php if ($this->params->get('show_cat_num_articles_cat') == 1) :?>
-						<span class="badge badge-info tip hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'COM_CONTENT_NUM_ITEMS_TIP'); ?>">
+						<span class="badge badge-info">
 							<?php echo Text::_('COM_CONTENT_NUM_ITEMS'); ?>&nbsp;
 							<?php echo $item->numitems; ?>
 						</span>
diff --git a/components/com_content/tmpl/category/blog.php b/components/com_content/tmpl/category/blog.php
index 47aac871e3585..781fdfb100f24 100644
--- a/components/com_content/tmpl/category/blog.php
+++ b/components/com_content/tmpl/category/blog.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/tmpl/category/blog_children.php b/components/com_content/tmpl/category/blog_children.php
index 2b24654e48579..35eb35fe050dd 100644
--- a/components/com_content/tmpl/category/blog_children.php
+++ b/components/com_content/tmpl/category/blog_children.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -28,7 +28,7 @@
 				<?php if ($lang->isRtl()) : ?>
 				<h3 class="page-header item-title">
 					<?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
-						<span class="badge badge-info tip hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'COM_CONTENT_NUM_ITEMS_TIP'); ?>">
+						<span class="badge badge-info tip hasTooltip">
 							<?php echo $child->getNumItems(true); ?>
 						</span>
 					<?php endif; ?>
@@ -43,7 +43,7 @@
 				<h3 class="page-header item-title"><a href="<?php echo Route::_(ContentHelperRoute::getCategoryRoute($child->id, $child->language)); ?>">
 					<?php echo $this->escape($child->title); ?></a>
 					<?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
-						<span class="badge badge-info tip hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'COM_CONTENT_NUM_ITEMS_TIP'); ?>">
+						<span class="badge badge-info">
 							<?php echo Text::_('COM_CONTENT_NUM_ITEMS'); ?>&nbsp;
 							<?php echo $child->getNumItems(true); ?>
 						</span>
diff --git a/components/com_content/tmpl/category/blog_item.php b/components/com_content/tmpl/category/blog_item.php
index 1e83cc477f9c4..d3a062928df63 100644
--- a/components/com_content/tmpl/category/blog_item.php
+++ b/components/com_content/tmpl/category/blog_item.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -46,9 +46,9 @@
 
 	<?php if ($useDefList && ($info == 0 || $info == 2)) : ?>
 		<?php echo LayoutHelper::render('joomla.content.info_block', array('item' => $this->item, 'params' => $params, 'position' => 'above')); ?>
-		<?php if ($info == 0 && $params->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
-			<?php echo LayoutHelper::render('joomla.content.tags', $this->item->tags->itemTags); ?>
-		<?php endif; ?>
+	<?php endif; ?>
+	<?php if ($info == 0 && $params->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
+		<?php echo LayoutHelper::render('joomla.content.tags', $this->item->tags->itemTags); ?>
 	<?php endif; ?>
 
 	<?php if (!$params->get('show_intro')) : ?>
@@ -61,8 +61,10 @@
 
 	<?php echo $this->item->introtext; ?>
 
-	<?php if ($useDefList && ($info == 1 || $info == 2)) : ?>
-		<?php echo LayoutHelper::render('joomla.content.info_block', array('item' => $this->item, 'params' => $params, 'position' => 'below')); ?>
+	<?php if ($info == 1 || $info == 2) : ?>
+		<?php if ($useDefList) : ?>
+			<?php echo LayoutHelper::render('joomla.content.info_block', array('item' => $this->item, 'params' => $params, 'position' => 'below')); ?>
+		<?php endif; ?>
 		<?php if ($params->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
 			<?php echo LayoutHelper::render('joomla.content.tags', $this->item->tags->itemTags); ?>
 		<?php endif; ?>
diff --git a/components/com_content/tmpl/category/blog_links.php b/components/com_content/tmpl/category/blog_links.php
index 1c0e44a88e935..e0fb72b4bcc50 100644
--- a/components/com_content/tmpl/category/blog_links.php
+++ b/components/com_content/tmpl/category/blog_links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/tmpl/category/default.php b/components/com_content/tmpl/category/default.php
index 3285d947690a8..edb04300ba0f6 100644
--- a/components/com_content/tmpl/category/default.php
+++ b/components/com_content/tmpl/category/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/tmpl/category/default.xml b/components/com_content/tmpl/category/default.xml
index 786fc5b48a67b..ea9a4514c1c43 100644
--- a/components/com_content/tmpl/category/default.xml
+++ b/components/com_content/tmpl/category/default.xml
@@ -178,6 +178,7 @@
 				<option value="author">JAUTHOR</option>
 				<option value="hits">JGLOBAL_HITS</option>
 	 			<option value="tag">JTAG</option>
+	 			<option value="month">JMONTH_PUBLISHED</option>
 			</field>
 
 			<field 
diff --git a/components/com_content/tmpl/category/default_articles.php b/components/com_content/tmpl/category/default_articles.php
index f5812d4006841..155ba60bd52e9 100644
--- a/components/com_content/tmpl/category/default_articles.php
+++ b/components/com_content/tmpl/category/default_articles.php
@@ -3,25 +3,48 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Content\Administrator\Extension\ContentComponent;
 use Joomla\Component\Content\Site\Helper\AssociationHelper;
 
 // Create some shortcuts.
-$params    = &$this->item->params;
-$n         = count($this->items);
-$listOrder = $this->escape($this->state->get('list.ordering'));
-$listDirn  = $this->escape($this->state->get('list.direction'));
+$params     = &$this->item->params;
+$n          = count($this->items);
+$listOrder  = $this->escape($this->state->get('list.ordering'));
+$listDirn   = $this->escape($this->state->get('list.direction'));
+$langFilter = false;
+
+// Tags filtering based on language filter 
+if (($this->params->get('filter_field') === 'tag') && (Multilanguage::isEnabled()))
+{ 
+	$tagfilter = ComponentHelper::getParams('com_tags')->get('tag_list_language_filter');
+
+	switch ($tagfilter)
+	{
+		case 'current_language' :
+			$langFilter = JFactory::getApplication()->getLanguage()->getTag();
+			break;
+
+		case 'all' :
+			$langFilter = false;
+			break;
+
+		default :
+			$langFilter = $tagfilter;
+	}
+}
 
 // Check for at least one editable article
 $isEditable = false;
@@ -46,16 +69,21 @@
 		<legend class="hidden-xs-up"><?php echo JText::_('COM_CONTENT_FORM_FILTER_LEGEND'); ?></legend>
 		<?php if ($this->params->get('filter_field') !== 'hide') : ?>
 			<div class="btn-group">
-				<?php if ($this->params->get('filter_field') !== 'tag') : ?>
+				<?php if ($this->params->get('filter_field') === 'tag') : ?>
+					<select name="filter_tag" id="filter_tag" onchange="document.adminForm.submit();" >
+						<option value=""><?php echo JText::_('JOPTION_SELECT_TAG'); ?></option>
+						<?php echo HTMLHelper::_('select.options', HTMLHelper::_('tag.options', array('filter.published' => array(1), 'filter.language' => $langFilter), true), 'value', 'text', $this->state->get('filter.tag')); ?>
+					</select>
+				<?php elseif ($this->params->get('filter_field') === 'month') : ?>
+					<select name="filter-search" id="filter-search" onchange="document.adminForm.submit();">
+						<option value=""><?php echo JText::_('JOPTION_SELECT_MONTH'); ?></option>
+						<?php echo HtmlHelper::_('select.options', HtmlHelper::_('content.months', $this->state), 'value', 'text', $this->state->get('list.filter')); ?>
+					</select>
+				<?php else : ?>
 					<label class="filter-search-lbl sr-only" for="filter-search">
 						<?php echo JText::_('COM_CONTENT_' . $this->params->get('filter_field') . '_FILTER_LABEL') . '&#160;'; ?>
 					</label>
 					<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_CONTENT_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_CONTENT_' . $this->params->get('filter_field') . '_FILTER_LABEL'); ?>">
-				<?php else : ?>
-					<select name="filter_tag" id="filter_tag" onchange="document.adminForm.submit();" >
-						<option value=""><?php echo JText::_('JOPTION_SELECT_TAG'); ?></option>
-						<?php echo HTMLHelper::_('select.options', HTMLHelper::_('tag.options', true, true), 'value', 'text', $this->state->get('filter.tag')); ?>
-					</select>
 				<?php endif; ?>
 			</div>
 		<?php endif; ?>
diff --git a/components/com_content/tmpl/category/default_children.php b/components/com_content/tmpl/category/default_children.php
index 06ab40eb19a6c..e925cd67cdf28 100644
--- a/components/com_content/tmpl/category/default_children.php
+++ b/components/com_content/tmpl/category/default_children.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -28,7 +28,7 @@
 				<?php if ($lang->isRtl()) : ?>
 				<h3 class="page-header item-title">
 					<?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
-						<span class="badge badge-info tip hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'COM_CONTENT_NUM_ITEMS_TIP'); ?>">
+						<span class="badge badge-info tip hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'COM_CONTENT_NUM_ITEMS'); ?>">
 							<?php echo $child->getNumItems(true); ?>
 						</span>
 					<?php endif; ?>
@@ -43,7 +43,7 @@
 				<h3 class="page-header item-title"><a href="<?php echo Route::_(ContentHelperRoute::getCategoryRoute($child->id, $child->language)); ?>">
 					<?php echo $this->escape($child->title); ?></a>
 					<?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
-						<span class="badge badge-info tip hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'COM_CONTENT_NUM_ITEMS_TIP'); ?>">
+						<span class="badge badge-info tip hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'COM_CONTENT_NUM_ITEMS'); ?>">
 							<?php echo $child->getNumItems(true); ?>
 						</span>
 					<?php endif; ?>
diff --git a/components/com_content/tmpl/featured/default.php b/components/com_content/tmpl/featured/default.php
index 895f48a68dad7..73388d1f8ab32 100644
--- a/components/com_content/tmpl/featured/default.php
+++ b/components/com_content/tmpl/featured/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/tmpl/featured/default_item.php b/components/com_content/tmpl/featured/default_item.php
index 08d5658e6d2c7..3a9a3a12b4c9e 100644
--- a/components/com_content/tmpl/featured/default_item.php
+++ b/components/com_content/tmpl/featured/default_item.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -72,9 +72,9 @@
 
 	<?php if ($useDefList && ($info == 0 || $info == 2)) : ?>
 		<?php echo LayoutHelper::render('joomla.content.info_block', array('item' => $this->item, 'params' => $params, 'position' => 'above')); ?>
-		<?php if ($info == 0 && $params->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
-			<?php echo LayoutHelper::render('joomla.content.tags', $this->item->tags->itemTags); ?>
-		<?php endif; ?>
+	<?php endif; ?>
+	<?php if ($info == 0 && $params->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
+		<?php echo LayoutHelper::render('joomla.content.tags', $this->item->tags->itemTags); ?>
 	<?php endif; ?>
 
 	<?php // Content is generated by content plugin event "onContentBeforeDisplay" ?>
@@ -82,8 +82,10 @@
 
 	<?php echo $this->item->introtext; ?>
 
-	<?php if ($useDefList && ($info == 1 || $info == 2)) : ?>
-		<?php echo LayoutHelper::render('joomla.content.info_block', array('item' => $this->item, 'params' => $params, 'position' => 'below')); ?>
+	<?php if ($info == 1 || $info == 2) : ?>
+		<?php if ($useDefList) : ?>
+			<?php echo LayoutHelper::render('joomla.content.info_block', array('item' => $this->item, 'params' => $params, 'position' => 'below')); ?>
+		<?php endif; ?>
 		<?php if ($params->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
 			<?php echo LayoutHelper::render('joomla.content.tags', $this->item->tags->itemTags); ?>
 		<?php endif; ?>
diff --git a/components/com_content/tmpl/featured/default_links.php b/components/com_content/tmpl/featured/default_links.php
index 5ab292140f113..7915d83508bb9 100644
--- a/components/com_content/tmpl/featured/default_links.php
+++ b/components/com_content/tmpl/featured/default_links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/tmpl/form/edit.php b/components/com_content/tmpl/form/edit.php
index c54e69e1240a7..e5ccbe581833c 100644
--- a/components/com_content/tmpl/form/edit.php
+++ b/components/com_content/tmpl/form/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -101,6 +101,7 @@
 			<?php echo HTMLHelper::_('uitab.addTab', $this->tab_name, 'publishing', Text::_('COM_CONTENT_PUBLISHING')); ?>
 				<?php echo $this->form->renderField('catid'); ?>
 				<?php echo $this->form->renderField('tags'); ?>
+				<?php echo $this->form->renderField('note'); ?>
 				<?php if ($params->get('save_history', 0)) : ?>
 					<?php echo $this->form->renderField('version_note'); ?>
 				<?php endif; ?>
diff --git a/components/com_contenthistory/Controller/DisplayController.php b/components/com_contenthistory/Controller/DisplayController.php
index 7ffddc08abf20..76550ca8b3006 100644
--- a/components/com_contenthistory/Controller/DisplayController.php
+++ b/components/com_contenthistory/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contenthistory/Dispatcher/Dispatcher.php b/components/com_contenthistory/Dispatcher/Dispatcher.php
index 152ba6a4d3218..4615b7c2859b7 100644
--- a/components/com_contenthistory/Dispatcher/Dispatcher.php
+++ b/components/com_contenthistory/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_csp/Controller/ReportController.php b/components/com_csp/Controller/ReportController.php
index c9aa8da717a20..89bfbe9e378f5 100644
--- a/components/com_csp/Controller/ReportController.php
+++ b/components/com_csp/Controller/ReportController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_csp
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_fields/Controller/DisplayController.php b/components/com_fields/Controller/DisplayController.php
index d62cdeba99b3e..3cd8eaddcf574 100644
--- a/components/com_fields/Controller/DisplayController.php
+++ b/components/com_fields/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_fields/Dispatcher/Dispatcher.php b/components/com_fields/Dispatcher/Dispatcher.php
index 99b62f444d13c..e34f027acdf6d 100644
--- a/components/com_fields/Dispatcher/Dispatcher.php
+++ b/components/com_fields/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_fields/layouts/field/render.php b/components/com_fields/layouts/field/render.php
index 8706720520e76..8ba2f89c18ab6 100644
--- a/components/com_fields/layouts/field/render.php
+++ b/components/com_fields/layouts/field/render.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -19,6 +19,7 @@
 $label = Text::_($field->label);
 $value = $field->value;
 $showLabel = $field->params->get('showlabel');
+$labelClass = $field->params->get('label_render_class');
 
 if ($value == '')
 {
@@ -27,6 +28,6 @@
 
 ?>
 <?php if ($showLabel == 1) : ?>
-	<span class="field-label"><?php echo htmlentities($label, ENT_QUOTES | ENT_IGNORE, 'UTF-8'); ?>: </span>
+	<span class="field-label <?php echo $labelClass; ?>"><?php echo htmlentities($label, ENT_QUOTES | ENT_IGNORE, 'UTF-8'); ?>: </span>
 <?php endif; ?>
 <span class="field-value"><?php echo $value; ?></span>
diff --git a/components/com_fields/layouts/fields/render.php b/components/com_fields/layouts/fields/render.php
index a0663b4789a8c..1922f6e34dae3 100644
--- a/components/com_fields/layouts/fields/render.php
+++ b/components/com_fields/layouts/fields/render.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -56,8 +56,9 @@
 			<?php continue; ?>
 		<?php endif; ?>
 		<?php $class = $field->params->get('render_class'); ?>
+		<?php $layout = $field->params->get('layout', 'render'); ?>
 		<dd class="field-entry <?php echo $class; ?>">
-			<?php echo FieldsHelper::render($context, 'field.render', array('field' => $field)); ?>
+			<?php echo FieldsHelper::render($context, 'field.' . $layout, array('field' => $field)); ?>
 		</dd>
 	<?php endforeach; ?>
 </dl>
diff --git a/components/com_finder/Controller/DisplayController.php b/components/com_finder/Controller/DisplayController.php
index e684b19d31acc..c315e667dbe3e 100644
--- a/components/com_finder/Controller/DisplayController.php
+++ b/components/com_finder/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_finder/Controller/SuggestionsController.php b/components/com_finder/Controller/SuggestionsController.php
index 2e51aa2f9089f..af3cce3a88b1b 100644
--- a/components/com_finder/Controller/SuggestionsController.php
+++ b/components/com_finder/Controller/SuggestionsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_finder/Helper/FinderHelper.php b/components/com_finder/Helper/FinderHelper.php
index 69913d0709569..95d058534e080 100644
--- a/components/com_finder/Helper/FinderHelper.php
+++ b/components/com_finder/Helper/FinderHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_finder/Model/SearchModel.php b/components/com_finder/Model/SearchModel.php
index d1d3fcd80846b..70842fb018c49 100644
--- a/components/com_finder/Model/SearchModel.php
+++ b/components/com_finder/Model/SearchModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_finder/Model/SuggestionsModel.php b/components/com_finder/Model/SuggestionsModel.php
index 2bdb122649cd1..9f6ad04e17a6d 100644
--- a/components/com_finder/Model/SuggestionsModel.php
+++ b/components/com_finder/Model/SuggestionsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_finder/Service/Router.php b/components/com_finder/Service/Router.php
index 91e0a0b538820..7dec827787b96 100644
--- a/components/com_finder/Service/Router.php
+++ b/components/com_finder/Service/Router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_finder/View/Search/FeedView.php b/components/com_finder/View/Search/FeedView.php
index 3484eb5097edd..40ea5e106731a 100644
--- a/components/com_finder/View/Search/FeedView.php
+++ b/components/com_finder/View/Search/FeedView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_finder/View/Search/HtmlView.php b/components/com_finder/View/Search/HtmlView.php
index eee22adeeab37..3d84bb0596311 100644
--- a/components/com_finder/View/Search/HtmlView.php
+++ b/components/com_finder/View/Search/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -134,6 +134,9 @@ public function display($tpl = null)
 		$this->pagination = $this->get('Pagination');
 		\JDEBUG ? Profiler::getInstance('Application')->mark('afterFinderPagination') : null;
 
+		// Flag indicates to not add limitstart=0 to URL
+		$pagination->hideEmptyLimitstart = true;
+
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
diff --git a/components/com_finder/View/Search/OpensearchView.php b/components/com_finder/View/Search/OpensearchView.php
index f3c76e6c8c119..b97d17e955e0c 100644
--- a/components/com_finder/View/Search/OpensearchView.php
+++ b/components/com_finder/View/Search/OpensearchView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_finder/helpers/route.php b/components/com_finder/helpers/route.php
index 1493f1cae0986..ab30d004b44ec 100644
--- a/components/com_finder/helpers/route.php
+++ b/components/com_finder/helpers/route.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_finder/tmpl/search/default.php b/components/com_finder/tmpl/search/default.php
index 0d48860319038..4b4c7bb4dc670 100644
--- a/components/com_finder/tmpl/search/default.php
+++ b/components/com_finder/tmpl/search/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_finder/tmpl/search/default_form.php b/components/com_finder/tmpl/search/default_form.php
index 053894d9e18f4..e0d5aee865eea 100644
--- a/components/com_finder/tmpl/search/default_form.php
+++ b/components/com_finder/tmpl/search/default_form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -33,7 +33,7 @@
 				<?php echo JText::_('COM_FINDER_SEARCH_TERMS'); ?>
 			</label>
 			<div class="input-group">
-				<input type="text" name="q" class="js-finder-search-query form-control" value="<?php echo $this->escape($this->query->input); ?>">
+				<input type="text" name="q" id="q" class="js-finder-search-query form-control" value="<?php echo $this->escape($this->query->input); ?>">
 				<span class="input-group-append">
 				<?php if ($this->escape($this->query->input) != '' || $this->params->get('allow_empty_query')) : ?>
 					<button name="Search" type="submit" class="btn btn-primary">
diff --git a/components/com_finder/tmpl/search/default_result.php b/components/com_finder/tmpl/search/default_result.php
index 55e409110d1ff..610caa2fef142 100644
--- a/components/com_finder/tmpl/search/default_result.php
+++ b/components/com_finder/tmpl/search/default_result.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,6 +11,8 @@
 
 use Joomla\String\StringHelper;
 
+$user = JFactory::getUser();
+
 // Get the mime type class.
 $mime = !empty($this->result->mime) ? 'mime-' . $this->result->mime : null;
 
@@ -62,7 +64,21 @@
 <?php if (count($taxonomies) && $this->params->get('show_taxonomy', 1)) : ?>
 	<dd class="result-taxonomy">
 	<?php foreach ($taxonomies as $type => $taxonomy) : ?>
-		<span class="badge badge-secondary"><?php echo $type . ': ' . implode(',', array_column($taxonomy, 'title')); ?></span>
+		<?php $branch = FinderIndexerTaxonomy::getBranch($type); ?>
+		<?php if ($branch->state == 1 && in_array($branch->access, $user->getAuthorisedViewLevels())) : ?>
+			<?php
+			$taxonomy_text = array();
+
+			foreach ($taxonomy as $node) :
+				if ($node->state == 1 && in_array($node->access, $user->getAuthorisedViewLevels())) :
+					$taxonomy_text[] = $node->title;
+				endif;
+			endforeach;
+
+			if (count($taxonomy_text)) : ?>
+				<span class="badge badge-secondary"><?php echo $type . ': ' . implode(',', $taxonomy_text); ?></span>
+			<?php endif; ?>
+		<?php endif; ?>
 	<?php endforeach; ?>
 	</dd>
 <?php endif; ?>
diff --git a/components/com_finder/tmpl/search/default_results.php b/components/com_finder/tmpl/search/default_results.php
index 57dad5b9429d0..d6dc6364370ca 100644
--- a/components/com_finder/tmpl/search/default_results.php
+++ b/components/com_finder/tmpl/search/default_results.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_mailto/Controller/DisplayController.php b/components/com_mailto/Controller/DisplayController.php
index b988e4bdbe8b6..87e973174c491 100644
--- a/components/com_mailto/Controller/DisplayController.php
+++ b/components/com_mailto/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_mailto
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -101,7 +101,7 @@ public function send()
 		{
 			foreach ($headers as $header)
 			{
-				if (strpos($value, $header) !== false)
+				if (is_string($value) && strpos($value, $header) !== false)
 				{
 					throw new \Exception('', 403);
 				}
diff --git a/components/com_mailto/Dispatcher/Dispatcher.php b/components/com_mailto/Dispatcher/Dispatcher.php
index cd39be05f3f2f..06e222c5b331b 100644
--- a/components/com_mailto/Dispatcher/Dispatcher.php
+++ b/components/com_mailto/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_mailto
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_mailto/Helper/MailtoHelper.php b/components/com_mailto/Helper/MailtoHelper.php
index 7ebea48129f54..4d58fc2f96e5a 100644
--- a/components/com_mailto/Helper/MailtoHelper.php
+++ b/components/com_mailto/Helper/MailtoHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_mailto
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_mailto/Model/MailtoModel.php b/components/com_mailto/Model/MailtoModel.php
index 910c72b558f86..a8f78cb644dd4 100644
--- a/components/com_mailto/Model/MailtoModel.php
+++ b/components/com_mailto/Model/MailtoModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -100,10 +100,11 @@ public function getData()
 	{
 		$input = Factory::getApplication()->input;
 
-		$data['emailto']   = $input->get('emailto', '', 'string');
-		$data['sender']    = $input->get('sender', '', 'string');
-		$data['emailfrom'] = $input->get('emailfrom', '', 'string');
-		$data['subject']   = $input->get('subject', '', 'string');
+		$data['emailto']    = $input->get('emailto', '', 'string');
+		$data['sender']     = $input->get('sender', '', 'string');
+		$data['emailfrom']  = $input->get('emailfrom', '', 'string');
+		$data['subject']    = $input->get('subject', '', 'string');
+		$data['consentbox'] = $input->get('consentbox', '', 'string');
 
 		return $data;
 	}
diff --git a/components/com_mailto/View/Mailto/HtmlView.php b/components/com_mailto/View/Mailto/HtmlView.php
index f05561dfd21ab..24d6a457ea94c 100644
--- a/components/com_mailto/View/Mailto/HtmlView.php
+++ b/components/com_mailto/View/Mailto/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_mailto
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_mailto/View/Sent/HtmlView.php b/components/com_mailto/View/Sent/HtmlView.php
index ae8bbd50aa33f..fb944a41ca9e4 100644
--- a/components/com_mailto/View/Sent/HtmlView.php
+++ b/components/com_mailto/View/Sent/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_mailto
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_mailto/helpers/mailto.php b/components/com_mailto/helpers/mailto.php
index d118a30bff912..58771c6aa1ccb 100644
--- a/components/com_mailto/helpers/mailto.php
+++ b/components/com_mailto/helpers/mailto.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_mailto
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_mailto/tmpl/mailto/default.php b/components/com_mailto/tmpl/mailto/default.php
index afe7f9b2b01eb..749d4d5c9f03a 100644
--- a/components/com_mailto/tmpl/mailto/default.php
+++ b/components/com_mailto/tmpl/mailto/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_mailto
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -26,7 +26,7 @@
 		<?php echo Text::_('COM_MAILTO_EMAIL_TO_A_FRIEND'); ?>
 	</h2>
 	<div class="com-mailto__close mailto-close">
-		<a title="<?php echo Text::_('COM_MAILTO_CLOSE_WINDOW'); ?>" href="#" class="close-mailto">
+		<a href="#" class="close-mailto">
 		 <span>
              <?php echo Text::_('COM_MAILTO_CLOSE_WINDOW'); ?>
          </span></a>
diff --git a/components/com_mailto/tmpl/sent/default.php b/components/com_mailto/tmpl/sent/default.php
index 3321a698403dd..70cdc5658ddf0 100644
--- a/components/com_mailto/tmpl/sent/default.php
+++ b/components/com_mailto/tmpl/sent/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_mailto
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_media/src/Dispatcher/Dispatcher.php b/components/com_media/src/Dispatcher/Dispatcher.php
index 0d04cbd858278..9cd083b75bb76 100644
--- a/components/com_media/src/Dispatcher/Dispatcher.php
+++ b/components/com_media/src/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_menus/Controller/DisplayController.php b/components/com_menus/Controller/DisplayController.php
index 7e61174d38184..3c35d554d2249 100644
--- a/components/com_menus/Controller/DisplayController.php
+++ b/components/com_menus/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_menus/Dispatcher/Dispatcher.php b/components/com_menus/Dispatcher/Dispatcher.php
index e2ff7e80700df..a0f7c5faa5433 100644
--- a/components/com_menus/Dispatcher/Dispatcher.php
+++ b/components/com_menus/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_modules/Controller/DisplayController.php b/components/com_modules/Controller/DisplayController.php
index affe331fbcaaf..d2e0d89489b84 100644
--- a/components/com_modules/Controller/DisplayController.php
+++ b/components/com_modules/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_modules/Dispatcher/Dispatcher.php b/components/com_modules/Dispatcher/Dispatcher.php
index 35944481adc9c..95de39486a2f3 100644
--- a/components/com_modules/Dispatcher/Dispatcher.php
+++ b/components/com_modules/Dispatcher/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/Controller/DisplayController.php b/components/com_newsfeeds/Controller/DisplayController.php
index 885b43285d5ef..4fdcd0302632f 100644
--- a/components/com_newsfeeds/Controller/DisplayController.php
+++ b/components/com_newsfeeds/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/Helper/AssociationHelper.php b/components/com_newsfeeds/Helper/AssociationHelper.php
index a6ec8addeb354..0619670d4d9f2 100644
--- a/components/com_newsfeeds/Helper/AssociationHelper.php
+++ b/components/com_newsfeeds/Helper/AssociationHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/Helper/Route.php b/components/com_newsfeeds/Helper/Route.php
index b5ec4b0edd1ce..e8edcef953465 100644
--- a/components/com_newsfeeds/Helper/Route.php
+++ b/components/com_newsfeeds/Helper/Route.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/Model/CategoriesModel.php b/components/com_newsfeeds/Model/CategoriesModel.php
index adaaa7c72bd72..40ada77302524 100644
--- a/components/com_newsfeeds/Model/CategoriesModel.php
+++ b/components/com_newsfeeds/Model/CategoriesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/Model/CategoryModel.php b/components/com_newsfeeds/Model/CategoryModel.php
index 535a026711ae2..68b10deb3c701 100644
--- a/components/com_newsfeeds/Model/CategoryModel.php
+++ b/components/com_newsfeeds/Model/CategoryModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/Model/NewsfeedModel.php b/components/com_newsfeeds/Model/NewsfeedModel.php
index 2886690807352..ded1a02c7328f 100644
--- a/components/com_newsfeeds/Model/NewsfeedModel.php
+++ b/components/com_newsfeeds/Model/NewsfeedModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/Service/Category.php b/components/com_newsfeeds/Service/Category.php
index 1f9041fefa9d1..a842a22d1f418 100644
--- a/components/com_newsfeeds/Service/Category.php
+++ b/components/com_newsfeeds/Service/Category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/Service/Router.php b/components/com_newsfeeds/Service/Router.php
index caea544834401..3ad8197010209 100644
--- a/components/com_newsfeeds/Service/Router.php
+++ b/components/com_newsfeeds/Service/Router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/View/Categories/HtmlView.php b/components/com_newsfeeds/View/Categories/HtmlView.php
index 1fb80018c9e92..ab264b008790b 100644
--- a/components/com_newsfeeds/View/Categories/HtmlView.php
+++ b/components/com_newsfeeds/View/Categories/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/View/Category/HtmlView.php b/components/com_newsfeeds/View/Category/HtmlView.php
index ce784452f47a6..08c18c5279aad 100644
--- a/components/com_newsfeeds/View/Category/HtmlView.php
+++ b/components/com_newsfeeds/View/Category/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -50,6 +50,9 @@ public function display($tpl = null)
 	{
 		$this->commonCategoryDisplay();
 
+		// Flag indicates to not add limitstart=0 to URL
+		$this->pagination->hideEmptyLimitstart = true;
+
 		// Prepare the data.
 		// Compute the newsfeed slug.
 		foreach ($this->items as $item)
diff --git a/components/com_newsfeeds/View/Newsfeed/HtmlView.php b/components/com_newsfeeds/View/Newsfeed/HtmlView.php
index 1a64a590ac733..3ae5227c1e825 100644
--- a/components/com_newsfeeds/View/Newsfeed/HtmlView.php
+++ b/components/com_newsfeeds/View/Newsfeed/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/helpers/route.php b/components/com_newsfeeds/helpers/route.php
index a9f6a2ae7f39e..09d6a3cbe7fbd 100644
--- a/components/com_newsfeeds/helpers/route.php
+++ b/components/com_newsfeeds/helpers/route.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/tmpl/categories/default.php b/components/com_newsfeeds/tmpl/categories/default.php
index 0ad5aee58872e..556e3851098e3 100644
--- a/components/com_newsfeeds/tmpl/categories/default.php
+++ b/components/com_newsfeeds/tmpl/categories/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/tmpl/categories/default_items.php b/components/com_newsfeeds/tmpl/categories/default_items.php
index 40abbd6f3f567..e9c47b143c978 100644
--- a/components/com_newsfeeds/tmpl/categories/default_items.php
+++ b/components/com_newsfeeds/tmpl/categories/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -24,7 +24,7 @@
 						<?php echo $this->escape($item->title); ?>
 					</a>
 					<?php if ($this->params->get('show_cat_items_cat') == 1) : ?>
-						<span class="badge badge-info tip hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'COM_NEWSFEEDS_NUM_ITEMS'); ?>">
+						<span class="badge badge-info">
 							<?php echo Text::_('COM_NEWSFEEDS_NUM_ITEMS'); ?>&nbsp;
 							<?php echo $item->numitems; ?>
 						</span>
diff --git a/components/com_newsfeeds/tmpl/category/default.php b/components/com_newsfeeds/tmpl/category/default.php
index 53f972d76ee52..d0e094b28b873 100644
--- a/components/com_newsfeeds/tmpl/category/default.php
+++ b/components/com_newsfeeds/tmpl/category/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/tmpl/category/default_children.php b/components/com_newsfeeds/tmpl/category/default_children.php
index ed750b8c81a23..b8db06ec5f2fb 100644
--- a/components/com_newsfeeds/tmpl/category/default_children.php
+++ b/components/com_newsfeeds/tmpl/category/default_children.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/tmpl/category/default_items.php b/components/com_newsfeeds/tmpl/category/default_items.php
index e4bdfa207bfd7..fe61ba3771bf3 100644
--- a/components/com_newsfeeds/tmpl/category/default_items.php
+++ b/components/com_newsfeeds/tmpl/category/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -35,7 +35,7 @@
 								</span>
 								<?php echo Text::_('COM_NEWSFEEDS_FILTER_LABEL') . '&#160;'; ?>
 							</label>
-							<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo Text::_('COM_NEWSFEEDS_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo Text::_('COM_NEWSFEEDS_FILTER_SEARCH_DESC'); ?>">
+							<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" placeholder="<?php echo Text::_('COM_NEWSFEEDS_FILTER_SEARCH_DESC'); ?>">
 						</div>
 					<?php endif; ?>
 					<?php if ($this->params->get('show_pagination_limit')) : ?>
diff --git a/components/com_newsfeeds/tmpl/newsfeed/default.php b/components/com_newsfeeds/tmpl/newsfeed/default.php
index 57f55073b7f5e..e55b74330bce5 100644
--- a/components/com_newsfeeds/tmpl/newsfeed/default.php
+++ b/components/com_newsfeeds/tmpl/newsfeed/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_privacy/controller.php b/components/com_privacy/controller.php
new file mode 100644
index 0000000000000..3818796da0b15
--- /dev/null
+++ b/components/com_privacy/controller.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Privacy Controller
+ *
+ * @since  3.9.0
+ */
+class PrivacyController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  $this
+	 *
+	 * @since   3.9.0
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		$view = $this->input->get('view', $this->default_view);
+
+		// Submitting information requests through the frontend is restricted to authenticated users at this time
+		if ($view === 'request' && JFactory::getUser()->guest)
+		{
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=login', false));
+
+			return $this;
+		}
+
+		// Set a Referrer-Policy header for views which require it
+		if (in_array($view, array('confirm', 'remind')))
+		{
+			JFactory::getApplication()->setHeader('Referrer-Policy', 'no-referrer', true);
+		}
+
+		return parent::display($cachable, $urlparams);
+	}
+}
diff --git a/components/com_privacy/controllers/request.php b/components/com_privacy/controllers/request.php
new file mode 100644
index 0000000000000..e111401ddb2f5
--- /dev/null
+++ b/components/com_privacy/controllers/request.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Request action controller class.
+ *
+ * @since  3.9.0
+ */
+class PrivacyControllerRequest extends JControllerLegacy
+{
+	/**
+	 * Method to confirm the information request.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function confirm()
+	{
+		// Check the request token.
+		$this->checkToken('post');
+
+		/** @var PrivacyModelConfirm $model */
+		$model = $this->getModel('Confirm', 'PrivacyModel');
+		$data  = $this->input->post->get('jform', array(), 'array');
+
+		$return	= $model->confirmRequest($data);
+
+		// Check for a hard error.
+		if ($return instanceof Exception)
+		{
+			// Get the error message to display.
+			if (JFactory::getApplication()->get('error_reporting'))
+			{
+				$message = $return->getMessage();
+			}
+			else
+			{
+				$message = JText::_('COM_PRIVACY_ERROR_CONFIRMING_REQUEST');
+			}
+
+			// Go back to the confirm form.
+			$this->setRedirect(JRoute::_('index.php?option=com_privacy&view=confirm', false), $message, 'error');
+
+			return false;
+		}
+		elseif ($return === false)
+		{
+			// Confirm failed.
+			// Go back to the confirm form.
+			$message = JText::sprintf('COM_PRIVACY_ERROR_CONFIRMING_REQUEST_FAILED', $model->getError());
+			$this->setRedirect(JRoute::_('index.php?option=com_privacy&view=confirm', false), $message, 'notice');
+
+			return false;
+		}
+		else
+		{
+			// Confirm succeeded.
+			$this->setRedirect(JRoute::_(JUri::root()), JText::_('COM_PRIVACY_CONFIRM_REQUEST_SUCCEEDED'), 'info');
+
+			return true;
+		}
+	}
+
+	/**
+	 * Method to submit an information request.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function submit()
+	{
+		// Check the request token.
+		$this->checkToken('post');
+
+		/** @var PrivacyModelRequest $model */
+		$model = $this->getModel('Request', 'PrivacyModel');
+		$data  = $this->input->post->get('jform', array(), 'array');
+
+		$return	= $model->createRequest($data);
+
+		// Check for a hard error.
+		if ($return instanceof Exception)
+		{
+			// Get the error message to display.
+			if (JFactory::getApplication()->get('error_reporting'))
+			{
+				$message = $return->getMessage();
+			}
+			else
+			{
+				$message = JText::_('COM_PRIVACY_ERROR_CREATING_REQUEST');
+			}
+
+			// Go back to the confirm form.
+			$this->setRedirect(JRoute::_('index.php?option=com_privacy&view=request', false), $message, 'error');
+
+			return false;
+		}
+		elseif ($return === false)
+		{
+			// Confirm failed.
+			// Go back to the confirm form.
+			$message = JText::sprintf('COM_PRIVACY_ERROR_CREATING_REQUEST_FAILED', $model->getError());
+			$this->setRedirect(JRoute::_('index.php?option=com_privacy&view=request', false), $message, 'notice');
+
+			return false;
+		}
+		else
+		{
+			// Confirm succeeded.
+			$this->setRedirect(JRoute::_(JUri::root()), JText::_('COM_PRIVACY_CREATE_REQUEST_SUCCEEDED'), 'info');
+
+			return true;
+		}
+	}
+
+	/**
+	 * Method to extend the privacy consent.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function remind()
+	{
+		// Check the request token.
+		$this->checkToken('post');
+
+		/** @var PrivacyModelConfirm $model */
+		$model = $this->getModel('Remind', 'PrivacyModel');
+		$data  = $this->input->post->get('jform', array(), 'array');
+
+		$return	= $model->remindRequest($data);
+
+		// Check for a hard error.
+		if ($return instanceof Exception)
+		{
+			// Get the error message to display.
+			if (JFactory::getApplication()->get('error_reporting'))
+			{
+				$message = $return->getMessage();
+			}
+			else
+			{
+				$message = JText::_('COM_PRIVACY_ERROR_REMIND_REQUEST');
+			}
+
+			// Go back to the confirm form.
+			$this->setRedirect(JRoute::_('index.php?option=com_privacy&view=remind', false), $message, 'error');
+
+			return false;
+		}
+		elseif ($return === false)
+		{
+			// Confirm failed.
+			// Go back to the confirm form.
+			$message = JText::sprintf('COM_PRIVACY_ERROR_CONFIRMING_REMIND_FAILED', $model->getError());
+			$this->setRedirect(JRoute::_('index.php?option=com_privacy&view=remind', false), $message, 'notice');
+
+			return false;
+		}
+		else
+		{
+			// Confirm succeeded.
+			$this->setRedirect(JRoute::_(JUri::root()), JText::_('COM_PRIVACY_CONFIRM_REMIND_SUCCEEDED'), 'info');
+
+			return true;
+		}
+	}
+}
diff --git a/components/com_privacy/models/confirm.php b/components/com_privacy/models/confirm.php
new file mode 100644
index 0000000000000..ec09e6f819c8e
--- /dev/null
+++ b/components/com_privacy/models/confirm.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Request confirmation model class.
+ *
+ * @since  3.9.0
+ */
+class PrivacyModelConfirm extends JModelAdmin
+{
+	/**
+	 * Confirms the information request.
+	 *
+	 * @param   array  $data  The data expected for the form.
+	 *
+	 * @return  mixed  Exception | JException | boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function confirmRequest($data)
+	{
+		// Get the form.
+		$form = $this->getForm();
+		$data['email'] = JStringPunycode::emailToPunycode($data['email']);
+
+		// Check for an error.
+		if ($form instanceof Exception)
+		{
+			return $form;
+		}
+
+		// Filter and validate the form data.
+		$data = $form->filter($data);
+		$return = $form->validate($data);
+
+		// Check for an error.
+		if ($return instanceof Exception)
+		{
+			return $return;
+		}
+
+		// Check the validation results.
+		if ($return === false)
+		{
+			// Get the validation messages from the form.
+			foreach ($form->getErrors() as $formError)
+			{
+				$this->setError($formError->getMessage());
+			}
+
+			return false;
+		}
+
+		// Search for the information request
+		/** @var PrivacyTableRequest $table */
+		$table = $this->getTable();
+
+		if (!$table->load(array('email' => $data['email'], 'status' => 0)))
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_NO_PENDING_REQUESTS'));
+
+			return false;
+		}
+
+		// A request can only be confirmed if it is in a pending status and has a confirmation token
+		if ($table->status != '0' || !$table->confirm_token)
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_NO_PENDING_REQUESTS'));
+
+			return false;
+		}
+
+		// A request can only be confirmed if the token is less than 24 hours old
+		$confirmTokenCreatedAt = new JDate($table->confirm_token_created_at);
+		$confirmTokenCreatedAt->add(new DateInterval('P1D'));
+
+		$now = new JDate('now');
+
+		if ($now > $confirmTokenCreatedAt)
+		{
+			// Invalidate the request
+			$table->status = -1;
+			$table->confirm_token = '';
+
+			try
+			{
+				$table->store();
+			}
+			catch (JDatabaseException $exception)
+			{
+				// The error will be logged in the database API, we just need to catch it here to not let things fatal out
+			}
+
+			$this->setError(JText::_('COM_PRIVACY_ERROR_CONFIRM_TOKEN_EXPIRED'));
+
+			return false;
+		}
+
+		// Verify the token
+		if (!JUserHelper::verifyPassword($data['confirm_token'], $table->confirm_token))
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_NO_PENDING_REQUESTS'));
+
+			return false;
+		}
+
+		// Everything is good to go, transition the request to confirmed
+		$saved = $this->save(
+			array(
+				'id'     => $table->id,
+				'status' => 1,
+				'confirm_token' => '',
+			)
+		);
+
+		if (!$saved)
+		{
+			// Error was set by the save method
+			return false;
+		}
+
+		// Push a notification to the site's super users, deliberately ignoring if this process fails so the below message goes out
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_messages/models', 'MessagesModel');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_messages/tables');
+
+		/** @var MessagesModelMessage $messageModel */
+		$messageModel = JModelLegacy::getInstance('Message', 'MessagesModel');
+
+		$messageModel->notifySuperUsers(
+			JText::_('COM_PRIVACY_ADMIN_NOTIFICATION_USER_CONFIRMED_REQUEST_SUBJECT'),
+			JText::sprintf('COM_PRIVACY_ADMIN_NOTIFICATION_USER_CONFIRMED_REQUEST_MESSAGE', $table->email)
+		);
+
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_actionlogs/models', 'ActionlogsModel');
+
+		$message = array(
+			'action'       => 'request-confirmed',
+			'subjectemail' => $table->email,
+			'id'           => $table->id,
+			'itemlink'     => 'index.php?option=com_privacy&view=request&id=' . $table->id,
+		);
+
+		/** @var ActionlogsModelActionlog $model */
+		$model = JModelLegacy::getInstance('Actionlog', 'ActionlogsModel');
+		$model->addLog(array($message), 'COM_PRIVACY_ACTION_LOG_CONFIRMED_REQUEST', 'com_privacy.request');
+
+		return true;
+	}
+
+	/**
+	 * Method for getting the form from the model.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm|boolean  A JForm object on success, false on failure
+	 *
+	 * @since   3.9.0
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_privacy.confirm', 'confirm', array('control' => 'jform'));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		$input = JFactory::getApplication()->input;
+
+		if ($input->getMethod() === 'GET')
+		{
+			$form->setValue('confirm_token', '', $input->get->getAlnum('confirm_token'));
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get a table object, load it if necessary.
+	 *
+	 * @param   string  $name     The table name. Optional.
+	 * @param   string  $prefix   The class prefix. Optional.
+	 * @param   array   $options  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A JTable object
+	 *
+	 * @since   3.9.0
+	 * @throws  \Exception
+	 */
+	public function getTable($name = 'Request', $prefix = 'PrivacyTable', $options = array())
+	{
+		return parent::getTable($name, $prefix, $options);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function populateState()
+	{
+		// Get the application object.
+		$params = JFactory::getApplication()->getParams('com_privacy');
+
+		// Load the parameters.
+		$this->setState('params', $params);
+	}
+}
diff --git a/components/com_privacy/models/forms/confirm.xml b/components/com_privacy/models/forms/confirm.xml
new file mode 100644
index 0000000000000..6113c06056b4d
--- /dev/null
+++ b/components/com_privacy/models/forms/confirm.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset name="default" label="COM_PRIVACY_CONFIRM_REQUEST_FIELDSET_LABEL">
+		<field
+			name="email"
+			type="text"
+			label="JGLOBAL_EMAIL"
+			description="COM_PRIVACY_FIELD_CONFIRM_EMAIL_DESC"
+			validate="email"
+			required="true"
+			size="30"
+		/>
+
+		<field
+			name="confirm_token"
+			type="text"
+			label="COM_PRIVACY_FIELD_CONFIRM_CONFIRM_TOKEN_LABEL"
+			description="COM_PRIVACY_FIELD_CONFIRM_CONFIRM_TOKEN_DESC"
+			filter="alnum"
+			required="true"
+			size="32"
+		/>
+	</fieldset>
+</form>
diff --git a/components/com_privacy/models/forms/remind.xml b/components/com_privacy/models/forms/remind.xml
new file mode 100644
index 0000000000000..f97926394bdfc
--- /dev/null
+++ b/components/com_privacy/models/forms/remind.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset name="default" label="COM_PRIVACY_REMIND_REQUEST_FIELDSET_LABEL">
+		<field
+			name="email"
+			type="text"
+			label="JGLOBAL_EMAIL"
+			description="COM_PRIVACY_FIELD_CONFIRM_EMAIL_DESC"
+			validate="email"
+			required="true"
+			size="30"
+		/>
+
+		<field
+			name="remind_token"
+			type="text"
+			label="COM_PRIVACY_FIELD_REMIND_CONFIRM_TOKEN_LABEL"
+			description="COM_PRIVACY_FIELD_REMIND_CONFIRM_TOKEN_DESC"
+			filter="alnum"
+			required="true"
+			size="32"
+		/>
+	</fieldset>
+</form>
diff --git a/components/com_privacy/models/forms/request.xml b/components/com_privacy/models/forms/request.xml
new file mode 100644
index 0000000000000..195e7c79e3c1b
--- /dev/null
+++ b/components/com_privacy/models/forms/request.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset name="default">
+		<field
+			name="email"
+			type="email"
+			label="JGLOBAL_EMAIL"
+			description="COM_PRIVACY_FIELD_CONFIRM_EMAIL_DESC"
+			validate="email"
+			required="true"
+			size="30"
+		/>
+
+		<field
+			name="request_type"
+			type="list"
+			label="COM_PRIVACY_FIELD_REQUEST_TYPE_LABEL"
+			description="COM_PRIVACY_FIELD_REQUEST_TYPE_DESC"
+			filter="string"
+			default="export"
+			validate="options"
+			>
+			<option value="export">COM_PRIVACY_REQUEST_TYPE_EXPORT</option>
+			<option value="remove">COM_PRIVACY_REQUEST_TYPE_REMOVE</option>
+		</field>
+	</fieldset>
+</form>
diff --git a/components/com_privacy/models/remind.php b/components/com_privacy/models/remind.php
new file mode 100644
index 0000000000000..c612b7479ac5f
--- /dev/null
+++ b/components/com_privacy/models/remind.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Remind confirmation model class.
+ *
+ * @since  3.9.0
+ */
+class PrivacyModelRemind extends JModelAdmin
+{
+	/**
+	 * Confirms the remind request.
+	 *
+	 * @param   array  $data  The data expected for the form.
+	 *
+	 * @return  mixed  Exception | JException | boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function remindRequest($data)
+	{
+		// Get the form.
+		$form = $this->getForm();
+		$data['email'] = JStringPunycode::emailToPunycode($data['email']);
+
+		// Check for an error.
+		if ($form instanceof Exception)
+		{
+			return $form;
+		}
+
+		// Filter and validate the form data.
+		$data = $form->filter($data);
+		$return = $form->validate($data);
+
+		// Check for an error.
+		if ($return instanceof Exception)
+		{
+			return $return;
+		}
+
+		// Check the validation results.
+		if ($return === false)
+		{
+			// Get the validation messages from the form.
+			foreach ($form->getErrors() as $formError)
+			{
+				$this->setError($formError->getMessage());
+			}
+
+			return false;
+		}
+
+		/** @var PrivacyTableConsent $table */
+		$table = $this->getTable();
+
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName(array('r.id', 'r.user_id', 'r.token')));
+		$query->from($db->quoteName('#__privacy_consents', 'r'));
+		$query->join('LEFT', $db->quoteName('#__users', 'u') . ' ON u.id = r.user_id');
+		$query->where($db->quoteName('u.email') . ' = ' . $db->quote($data['email']));
+		$query->where($db->quoteName('r.remind') . ' = 1');
+		$db->setQuery($query);
+
+		try
+		{
+			$remind = $db->loadObject();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_NO_PENDING_REMIND'));
+
+			return false;
+		}
+
+		if (!$remind)
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_NO_PENDING_REMIND'));
+
+			return false;
+		}
+
+		// Verify the token
+		if (!JUserHelper::verifyPassword($data['remind_token'], $remind->token))
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_NO_REMIND_REQUESTS'));
+
+			return false;
+		}
+
+		// Everything is good to go, transition the request to extended
+		$saved = $this->save(
+			array(
+				'id'      => $remind->id,
+				'remind'  => 0,
+				'token'   => '',
+				'created' => JFactory::getDate()->toSql(),
+			)
+		);
+
+		if (!$saved)
+		{
+			// Error was set by the save method
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method for getting the form from the model.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm|boolean  A JForm object on success, false on failure
+	 *
+	 * @since   3.9.0
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_privacy.remind', 'remind', array('control' => 'jform'));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		$input = JFactory::getApplication()->input;
+
+		if ($input->getMethod() === 'GET')
+		{
+			$form->setValue('remind_token', '', $input->get->getAlnum('remind_token'));
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get a table object, load it if necessary.
+	 *
+	 * @param   string  $name     The table name. Optional.
+	 * @param   string  $prefix   The class prefix. Optional.
+	 * @param   array   $options  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A JTable object
+	 *
+	 * @since   3.9.0
+	 * @throws  \Exception
+	 */
+	public function getTable($name = 'Consent', $prefix = 'PrivacyTable', $options = array())
+	{
+		return parent::getTable($name, $prefix, $options);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function populateState()
+	{
+		// Get the application object.
+		$params = JFactory::getApplication()->getParams('com_privacy');
+
+		// Load the parameters.
+		$this->setState('params', $params);
+	}
+}
diff --git a/components/com_privacy/models/request.php b/components/com_privacy/models/request.php
new file mode 100644
index 0000000000000..0a9f0524bb230
--- /dev/null
+++ b/components/com_privacy/models/request.php
@@ -0,0 +1,269 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Request model class.
+ *
+ * @since  3.9.0
+ */
+class PrivacyModelRequest extends JModelAdmin
+{
+	/**
+	 * Creates an information request.
+	 *
+	 * @param   array  $data  The data expected for the form.
+	 *
+	 * @return  mixed  Exception | JException | boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function createRequest($data)
+	{
+		// Creating requests requires the site's email sending be enabled
+		if (!JFactory::getConfig()->get('mailonline', 1))
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_CANNOT_CREATE_REQUEST_WHEN_SENDMAIL_DISABLED'));
+
+			return false;
+		}
+
+		// Get the form.
+		$form = $this->getForm();
+		$data['email'] = JStringPunycode::emailToPunycode($data['email']);
+
+		// Check for an error.
+		if ($form instanceof Exception)
+		{
+			return $form;
+		}
+
+		// Filter and validate the form data.
+		$data = $form->filter($data);
+		$return = $form->validate($data);
+
+		// Check for an error.
+		if ($return instanceof Exception)
+		{
+			return $return;
+		}
+
+		// Check the validation results.
+		if ($return === false)
+		{
+			// Get the validation messages from the form.
+			foreach ($form->getErrors() as $formError)
+			{
+				$this->setError($formError->getMessage());
+			}
+
+			return false;
+		}
+
+		// Search for an open information request matching the email and type
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('COUNT(id)')
+			->from('#__privacy_requests')
+			->where('email = ' . $db->quote($data['email']))
+			->where('request_type = ' . $db->quote($data['request_type']))
+			->where('status IN (0, 1)');
+
+		try
+		{
+			$result = (int) $db->setQuery($query)->loadResult();
+		}
+		catch (JDatabaseException $exception)
+		{
+			// Can't check for existing requests, so don't create a new one
+			$this->setError(JText::_('COM_PRIVACY_ERROR_CHECKING_FOR_EXISTING_REQUESTS'));
+
+			return false;
+		}
+
+		if ($result > 0)
+		{
+			$this->setError(JText::_('COM_PRIVACY_ERROR_PENDING_REQUEST_OPEN'));
+
+			return false;
+		}
+
+		// Everything is good to go, create the request
+		$token       = JApplicationHelper::getHash(JUserHelper::genRandomPassword());
+		$hashedToken = JUserHelper::hashPassword($token);
+
+		$data['confirm_token']            = $hashedToken;
+		$data['confirm_token_created_at'] = JFactory::getDate()->toSql();
+
+		if (!$this->save($data))
+		{
+			// The save function will set the error message, so just return here
+			return false;
+		}
+
+		// Push a notification to the site's super users, deliberately ignoring if this process fails so the below message goes out
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_messages/models', 'MessagesModel');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_messages/tables');
+
+		/** @var MessagesModelMessage $messageModel */
+		$messageModel = JModelLegacy::getInstance('Message', 'MessagesModel');
+
+		$messageModel->notifySuperUsers(
+			JText::_('COM_PRIVACY_ADMIN_NOTIFICATION_USER_CREATED_REQUEST_SUBJECT'),
+			JText::sprintf('COM_PRIVACY_ADMIN_NOTIFICATION_USER_CREATED_REQUEST_MESSAGE', $data['email'])
+		);
+
+		// The mailer can be set to either throw Exceptions or return boolean false, account for both
+		try
+		{
+			$app = JFactory::getApplication();
+
+			$linkMode = $app->get('force_ssl', 0) == 2 ? 1 : -1;
+
+			$substitutions = array(
+				'[SITENAME]' => $app->get('sitename'),
+				'[URL]'      => JUri::root(),
+				'[TOKENURL]' => JRoute::link('site', 'index.php?option=com_privacy&view=confirm&confirm_token=' . $token, false, $linkMode),
+				'[FORMURL]'  => JRoute::link('site', 'index.php?option=com_privacy&view=confirm', false, $linkMode),
+				'[TOKEN]'    => $token,
+				'\\n'        => "\n",
+			);
+
+			switch ($data['request_type'])
+			{
+				case 'export':
+					$emailSubject = JText::_('COM_PRIVACY_EMAIL_REQUEST_SUBJECT_EXPORT_REQUEST');
+					$emailBody    = JText::_('COM_PRIVACY_EMAIL_REQUEST_BODY_EXPORT_REQUEST');
+
+					break;
+
+				case 'remove':
+					$emailSubject = JText::_('COM_PRIVACY_EMAIL_REQUEST_SUBJECT_REMOVE_REQUEST');
+					$emailBody    = JText::_('COM_PRIVACY_EMAIL_REQUEST_BODY_REMOVE_REQUEST');
+
+					break;
+
+				default:
+					$this->setError(JText::_('COM_PRIVACY_ERROR_UNKNOWN_REQUEST_TYPE'));
+
+					return false;
+			}
+
+			foreach ($substitutions as $k => $v)
+			{
+				$emailSubject = str_replace($k, $v, $emailSubject);
+				$emailBody    = str_replace($k, $v, $emailBody);
+			}
+
+			$mailer = JFactory::getMailer();
+			$mailer->setSubject($emailSubject);
+			$mailer->setBody($emailBody);
+			$mailer->addRecipient($data['email']);
+
+			$mailResult = $mailer->Send();
+
+			if ($mailResult instanceof JException)
+			{
+				// JError was already called so we just need to return now
+				return false;
+			}
+			elseif ($mailResult === false)
+			{
+				$this->setError($mailer->ErrorInfo);
+
+				return false;
+			}
+
+			/** @var PrivacyTableRequest $table */
+			$table = $this->getTable();
+
+			if (!$table->load($this->getState($this->getName() . '.id')))
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			// Log the request's creation
+			JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_actionlogs/models', 'ActionlogsModel');
+
+			$message = array(
+				'action'       => 'request-created',
+				'requesttype'  => $table->request_type,
+				'subjectemail' => $table->email,
+				'id'           => $table->id,
+				'itemlink'     => 'index.php?option=com_privacy&view=request&id=' . $table->id,
+			);
+
+			/** @var ActionlogsModelActionlog $model */
+			$model = JModelLegacy::getInstance('Actionlog', 'ActionlogsModel');
+			$model->addLog(array($message), 'COM_PRIVACY_ACTION_LOG_CREATED_REQUEST', 'com_privacy.request');
+
+			// The email sent and the record is saved, everything is good to go from here
+			return true;
+		}
+		catch (phpmailerException $exception)
+		{
+			$this->setError($exception->getMessage());
+
+			return false;
+		}
+	}
+
+	/**
+	 * Method for getting the form from the model.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm|boolean  A JForm object on success, false on failure
+	 *
+	 * @since   3.9.0
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		return $this->loadForm('com_privacy.request', 'request', array('control' => 'jform'));
+	}
+
+	/**
+	 * Method to get a table object, load it if necessary.
+	 *
+	 * @param   string  $name     The table name. Optional.
+	 * @param   string  $prefix   The class prefix. Optional.
+	 * @param   array   $options  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A JTable object
+	 *
+	 * @since   3.9.0
+	 * @throws  \Exception
+	 */
+	public function getTable($name = 'Request', $prefix = 'PrivacyTable', $options = array())
+	{
+		return parent::getTable($name, $prefix, $options);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function populateState()
+	{
+		// Get the application object.
+		$params = JFactory::getApplication()->getParams('com_privacy');
+
+		// Load the parameters.
+		$this->setState('params', $params);
+	}
+}
diff --git a/components/com_privacy/privacy.php b/components/com_privacy/privacy.php
new file mode 100644
index 0000000000000..48eb01941972c
--- /dev/null
+++ b/components/com_privacy/privacy.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$controller = JControllerLegacy::getInstance('Privacy');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/components/com_privacy/router.php b/components/com_privacy/router.php
new file mode 100644
index 0000000000000..2574acc212780
--- /dev/null
+++ b/components/com_privacy/router.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Routing class from com_privacy
+ *
+ * @since  3.9.0
+ */
+class PrivacyRouter extends JComponentRouterView
+{
+	/**
+	 * Privacy Component router constructor
+	 *
+	 * @param   JApplicationCms  $app   The application object
+	 * @param   JMenu            $menu  The menu object to work with
+	 *
+	 * @since   3.9.0
+	 */
+	public function __construct($app = null, $menu = null)
+	{
+		$this->registerView(new JComponentRouterViewconfiguration('confirm'));
+		$this->registerView(new JComponentRouterViewconfiguration('request'));
+		$this->registerView(new JComponentRouterViewconfiguration('remind'));
+
+		parent::__construct($app, $menu);
+
+		$this->attachRule(new JComponentRouterRulesMenu($this));
+		$this->attachRule(new JComponentRouterRulesStandard($this));
+		$this->attachRule(new JComponentRouterRulesNomenu($this));
+	}
+}
+
+/**
+ * Privacy router functions
+ *
+ * These functions are proxies for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  &$query  REQUEST query
+ *
+ * @return  array  Segments of the SEF url
+ *
+ * @since   3.9.0
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function privacyBuildRoute(&$query)
+{
+	$app = JFactory::getApplication();
+	$router = new PrivacyRouter($app, $app->getMenu());
+
+	return $router->build($query);
+}
+
+/**
+ * Convert SEF URL segments into query variables
+ *
+ * @param   array  $segments  Segments in the current URL
+ *
+ * @return  array  Query variables
+ *
+ * @since   3.9.0
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function privacyParseRoute($segments)
+{
+	$app = JFactory::getApplication();
+	$router = new PrivacyRouter($app, $app->getMenu());
+
+	return $router->parse($segments);
+}
diff --git a/components/com_privacy/views/confirm/tmpl/default.php b/components/com_privacy/views/confirm/tmpl/default.php
new file mode 100644
index 0000000000000..8cbf6e703037b
--- /dev/null
+++ b/components/com_privacy/views/confirm/tmpl/default.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var PrivacyViewConfirm $this */
+
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidator');
+
+?>
+<div class="request-confirm<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<div class="page-header">
+			<h1>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
+		</div>
+	<?php endif; ?>
+	<form action="<?php echo JRoute::_('index.php?option=com_privacy&task=request.confirm'); ?>" method="post" class="form-validate form-horizontal well">
+		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
+			<fieldset>
+				<?php if (!empty($fieldset->label)) : ?>
+					<legend><?php echo JText::_($fieldset->label); ?></legend>
+				<?php endif; ?>
+				<?php echo $this->form->renderFieldset($fieldset->name); ?>
+			</fieldset>
+		<?php endforeach; ?>
+		<div class="control-group">
+			<div class="controls">
+				<button type="submit" class="btn btn-primary validate">
+					<?php echo JText::_('JSUBMIT'); ?>
+				</button>
+			</div>
+		</div>
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+</div>
diff --git a/components/com_privacy/views/confirm/tmpl/default.xml b/components/com_privacy/views/confirm/tmpl/default.xml
new file mode 100644
index 0000000000000..e25592846aa3f
--- /dev/null
+++ b/components/com_privacy/views/confirm/tmpl/default.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="com_privacy_confirm_view_default_title" option="com_privacy_confirm_view_default_option">
+		<help
+			key="JHELP_MENUS_MENU_ITEM_PRIVACY_CONFIRM_REQUEST"
+		/>
+		<message>
+			<![CDATA[COM_PRIVACY_CONFIRM_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/components/com_privacy/views/confirm/view.html.php b/components/com_privacy/views/confirm/view.html.php
new file mode 100644
index 0000000000000..1e9776d2ec0f0
--- /dev/null
+++ b/components/com_privacy/views/confirm/view.html.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Request confirmation view class
+ *
+ * @since  3.9.0
+ */
+class PrivacyViewConfirm extends JViewLegacy
+{
+	/**
+	 * The form object
+	 *
+	 * @var    JForm
+	 * @since  3.9.0
+	 */
+	protected $form;
+
+	/**
+	 * The CSS class suffix to append to the view container
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	protected $pageclass_sfx;
+
+	/**
+	 * The view parameters
+	 *
+	 * @var    Registry
+	 * @since  3.9.0
+	 */
+	protected $params;
+
+	/**
+	 * The state information
+	 *
+	 * @var    JObject
+	 * @since  3.9.0
+	 */
+	protected $state;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @see     JViewLegacy::loadTemplate()
+	 * @since   3.9.0
+	 * @throws  Exception
+	 */
+	public function display($tpl = null)
+	{
+		// Initialise variables.
+		$this->form   = $this->get('Form');
+		$this->state  = $this->get('State');
+		$this->params = $this->state->params;
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($this->params->get('pageclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+		$this->prepareDocument();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function prepareDocument()
+	{
+		$app   = JFactory::getApplication();
+		$menus = $app->getMenu();
+		$title = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('COM_PRIVACY_VIEW_CONFIRM_PAGE_TITLE'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+	}
+}
diff --git a/components/com_privacy/views/remind/tmpl/default.php b/components/com_privacy/views/remind/tmpl/default.php
new file mode 100644
index 0000000000000..a438c89616713
--- /dev/null
+++ b/components/com_privacy/views/remind/tmpl/default.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var PrivacyViewConfirm $this */
+
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidator');
+
+?>
+<div class="remind-confirm<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<div class="page-header">
+			<h1>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
+		</div>
+	<?php endif; ?>
+	<form action="<?php echo JRoute::_('index.php?option=com_privacy&task=request.remind'); ?>" method="post" class="form-validate form-horizontal well">
+		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
+			<fieldset>
+				<?php if (!empty($fieldset->label)) : ?>
+					<legend><?php echo JText::_($fieldset->label); ?></legend>
+				<?php endif; ?>
+				<?php echo $this->form->renderFieldset($fieldset->name); ?>
+			</fieldset>
+		<?php endforeach; ?>
+		<div class="control-group">
+			<div class="controls">
+				<button type="submit" class="btn btn-primary validate">
+					<?php echo JText::_('JSUBMIT'); ?>
+				</button>
+			</div>
+		</div>
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+</div>
diff --git a/components/com_privacy/views/remind/tmpl/default.xml b/components/com_privacy/views/remind/tmpl/default.xml
new file mode 100644
index 0000000000000..9b0e5b83a7f67
--- /dev/null
+++ b/components/com_privacy/views/remind/tmpl/default.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="com_privacy_remind_view_default_title" option="com_privacy_remind_view_default_option">
+		<help
+			key="JHELP_MENUS_MENU_ITEM_PRIVACY_REMIND_REQUEST"
+		/>
+		<message>
+			<![CDATA[COM_PRIVACY_REMIND_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/components/com_privacy/views/remind/view.html.php b/components/com_privacy/views/remind/view.html.php
new file mode 100644
index 0000000000000..6ce0fe083ef8e
--- /dev/null
+++ b/components/com_privacy/views/remind/view.html.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Remind confirmation view class
+ *
+ * @since  3.9.0
+ */
+class PrivacyViewRemind extends JViewLegacy
+{
+	/**
+	 * The form object
+	 *
+	 * @var    JForm
+	 * @since  3.9.0
+	 */
+	protected $form;
+
+	/**
+	 * The CSS class suffix to append to the view container
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	protected $pageclass_sfx;
+
+	/**
+	 * The view parameters
+	 *
+	 * @var    Registry
+	 * @since  3.9.0
+	 */
+	protected $params;
+
+	/**
+	 * The state information
+	 *
+	 * @var    JObject
+	 * @since  3.9.0
+	 */
+	protected $state;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @see     JViewLegacy::loadTemplate()
+	 * @since   3.9.0
+	 * @throws  Exception
+	 */
+	public function display($tpl = null)
+	{
+		// Initialise variables.
+		$this->form   = $this->get('Form');
+		$this->state  = $this->get('State');
+		$this->params = $this->state->params;
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($this->params->get('pageclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+		$this->prepareDocument();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function prepareDocument()
+	{
+		$app   = JFactory::getApplication();
+		$menus = $app->getMenu();
+		$title = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('COM_PRIVACY_VIEW_REMIND_PAGE_TITLE'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+	}
+}
diff --git a/components/com_privacy/views/request/tmpl/default.php b/components/com_privacy/views/request/tmpl/default.php
new file mode 100644
index 0000000000000..8eb9a1bbb256f
--- /dev/null
+++ b/components/com_privacy/views/request/tmpl/default.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var PrivacyViewRequest $this */
+
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidator');
+JHtml::_('formbehavior.chosen', 'select');
+
+?>
+<div class="request-form<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<div class="page-header">
+			<h1>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
+		</div>
+	<?php endif; ?>
+	<?php if ($this->sendMailEnabled) : ?>
+		<form action="<?php echo JRoute::_('index.php?option=com_privacy&task=request.submit'); ?>" method="post" class="form-validate form-horizontal well">
+			<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
+				<fieldset>
+					<?php if (!empty($fieldset->label)) : ?>
+						<legend><?php echo JText::_($fieldset->label); ?></legend>
+					<?php endif; ?>
+					<?php echo $this->form->renderFieldset($fieldset->name); ?>
+				</fieldset>
+			<?php endforeach; ?>
+			<div class="control-group">
+				<div class="controls">
+					<button type="submit" class="btn btn-primary validate">
+						<?php echo JText::_('JSUBMIT'); ?>
+					</button>
+				</div>
+			</div>
+			<?php echo JHtml::_('form.token'); ?>
+		</form>
+	<?php else : ?>
+		<div class="alert alert-warning">
+			<p><?php echo JText::_('COM_PRIVACY_WARNING_CANNOT_CREATE_REQUEST_WHEN_SENDMAIL_DISABLED'); ?></p>
+		</div>
+	<?php endif; ?>
+</div>
diff --git a/components/com_privacy/views/request/tmpl/default.xml b/components/com_privacy/views/request/tmpl/default.xml
new file mode 100644
index 0000000000000..b4d2efda6551d
--- /dev/null
+++ b/components/com_privacy/views/request/tmpl/default.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="com_privacy_request_view_default_title" option="com_privacy_request_view_default_option">
+		<help
+			key="JHELP_MENUS_MENU_ITEM_PRIVACY_CREATE_REQUEST"
+		/>
+		<message>
+			<![CDATA[COM_PRIVACY_REQUEST_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/components/com_privacy/views/request/view.html.php b/components/com_privacy/views/request/view.html.php
new file mode 100644
index 0000000000000..5013815dadd31
--- /dev/null
+++ b/components/com_privacy/views/request/view.html.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Request view class
+ *
+ * @since  3.9.0
+ */
+class PrivacyViewRequest extends JViewLegacy
+{
+	/**
+	 * The form object
+	 *
+	 * @var    JForm
+	 * @since  3.9.0
+	 */
+	protected $form;
+
+	/**
+	 * The CSS class suffix to append to the view container
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	protected $pageclass_sfx;
+
+	/**
+	 * The view parameters
+	 *
+	 * @var    Registry
+	 * @since  3.9.0
+	 */
+	protected $params;
+
+	/**
+	 * Flag indicating the site supports sending email
+	 *
+	 * @var    boolean
+	 * @since  3.9.0
+	 */
+	protected $sendMailEnabled;
+
+	/**
+	 * The state information
+	 *
+	 * @var    JObject
+	 * @since  3.9.0
+	 */
+	protected $state;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @see     JViewLegacy::loadTemplate()
+	 * @since   3.9.0
+	 * @throws  Exception
+	 */
+	public function display($tpl = null)
+	{
+		// Initialise variables.
+		$this->form            = $this->get('Form');
+		$this->state           = $this->get('State');
+		$this->params          = $this->state->params;
+		$this->sendMailEnabled = (bool) JFactory::getConfig()->get('mailonline', 1);
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($this->params->get('pageclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+		$this->prepareDocument();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	protected function prepareDocument()
+	{
+		$app   = JFactory::getApplication();
+		$menus = $app->getMenu();
+		$title = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('COM_PRIVACY_VIEW_REQUEST_PAGE_TITLE'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+	}
+}
diff --git a/components/com_search/Controller/DisplayController.php b/components/com_search/Controller/DisplayController.php
index 4fc228fbec462..6b9c6b843ff92 100644
--- a/components/com_search/Controller/DisplayController.php
+++ b/components/com_search/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_search/Model/SearchModel.php b/components/com_search/Model/SearchModel.php
index 54af587d79300..7827c566a1e0b 100644
--- a/components/com_search/Model/SearchModel.php
+++ b/components/com_search/Model/SearchModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_search/View/Search/HtmlView.php b/components/com_search/View/Search/HtmlView.php
index d64a321c26233..6cfaa13205df6 100644
--- a/components/com_search/View/Search/HtmlView.php
+++ b/components/com_search/View/Search/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -240,6 +240,9 @@ public function display($tpl = null)
 			$total      = $this->get('total');
 			$pagination = $this->get('pagination');
 
+			// Flag indicates to not add limitstart=0 to URL
+			$pagination->hideEmptyLimitstart = true;
+
 			if ($state->get('match') === 'exact')
 			{
 				$searchWords = array($searchWord);
diff --git a/components/com_search/View/Search/OpensearchView.php b/components/com_search/View/Search/OpensearchView.php
index aacbff7d94efe..9adfd5228c62c 100644
--- a/components/com_search/View/Search/OpensearchView.php
+++ b/components/com_search/View/Search/OpensearchView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_search/router.php b/components/com_search/router.php
index 5818441c75a33..5a050ca1a72da 100644
--- a/components/com_search/router.php
+++ b/components/com_search/router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_search/tmpl/search/default.php b/components/com_search/tmpl/search/default.php
index fda6ebc8a15d8..296a1e6acb318 100644
--- a/components/com_search/tmpl/search/default.php
+++ b/components/com_search/tmpl/search/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_search/tmpl/search/default_error.php b/components/com_search/tmpl/search/default_error.php
index f082aabe4f992..fad5ece9a7097 100644
--- a/components/com_search/tmpl/search/default_error.php
+++ b/components/com_search/tmpl/search/default_error.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_search/tmpl/search/default_form.php b/components/com_search/tmpl/search/default_form.php
index cad6515e7f70c..05dd55b0c8d5a 100644
--- a/components/com_search/tmpl/search/default_form.php
+++ b/components/com_search/tmpl/search/default_form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_search/tmpl/search/default_results.php b/components/com_search/tmpl/search/default_results.php
index 1b403bff6cbcf..8761a9148b815 100644
--- a/components/com_search/tmpl/search/default_results.php
+++ b/components/com_search/tmpl/search/default_results.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/Controller/DisplayController.php b/components/com_tags/Controller/DisplayController.php
index d9c4f26b3f272..4fc4a115e6f4f 100644
--- a/components/com_tags/Controller/DisplayController.php
+++ b/components/com_tags/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/Controller/TagsController.php b/components/com_tags/Controller/TagsController.php
index 03858826a11bb..29599be044e25 100644
--- a/components/com_tags/Controller/TagsController.php
+++ b/components/com_tags/Controller/TagsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -28,17 +28,18 @@ class TagsController extends BaseController
 	 */
 	public function searchAjax()
 	{
+		$user = $this->app->getIdentity();
+
 		// Receive request data
 		$filters = array(
 			'like'      => trim($this->input->get('like', null, 'string')),
 			'title'     => trim($this->input->get('title', null, 'string')),
 			'flanguage' => $this->input->get('flanguage', null, 'word'),
 			'published' => $this->input->get('published', 1, 'int'),
-			'parent_id' => $this->input->get('parent_id', 0, 'int')
+			'parent_id' => $this->input->get('parent_id', 0, 'int'),
+			'access'    => $user->getAuthorisedViewLevels(),
 		);
 
-		$user = $this->app->getIdentity();
-
 		if ((!$user->authorise('core.edit.state', 'com_tags')) && (!$user->authorise('core.edit', 'com_tags')))
 		{
 			// Filter on published for those who do not have edit or edit.state rights.
diff --git a/components/com_tags/Helper/TagsHelperRoute.php b/components/com_tags/Helper/TagsHelperRoute.php
index 2cb7da9d260e1..010efa33332dc 100644
--- a/components/com_tags/Helper/TagsHelperRoute.php
+++ b/components/com_tags/Helper/TagsHelperRoute.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/Model/TagModel.php b/components/com_tags/Model/TagModel.php
index df481e8144688..59700886a49b0 100644
--- a/components/com_tags/Model/TagModel.php
+++ b/components/com_tags/Model/TagModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -18,6 +18,7 @@
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\CMS\Object\CMSObject;
+use Joomla\Component\Tags\Site\Helper\TagsHelperRoute;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/components/com_tags/Model/TagsModel.php b/components/com_tags/Model/TagsModel.php
index 29bbf440c8d4d..b78ad0375b4b3 100644
--- a/components/com_tags/Model/TagsModel.php
+++ b/components/com_tags/Model/TagsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/View/Tag/FeedView.php b/components/com_tags/View/Tag/FeedView.php
index ed028beb0a72b..968d69d10bf62 100644
--- a/components/com_tags/View/Tag/FeedView.php
+++ b/components/com_tags/View/Tag/FeedView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,6 +11,7 @@
 
 use Joomla\CMS\Document\Feed\FeedItem;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Tags\Site\Helper\TagsHelperRoute;
@@ -33,9 +34,26 @@ class FeedView extends BaseHtmlView
 	 */
 	public function display($tpl = null)
 	{
-		$app            = Factory::getApplication();
-		$document       = Factory::getDocument();
-		$document->link = Route::_(TagsHelperRoute::getTagRoute($app->input->getInt('id')));
+		$app       = Factory::getApplication();
+		$document  = Factory::getDocument();
+		$ids       = $app->input->get('id');
+		$i         = 0;
+		$tagIds    = '';
+		$filter    = new InputFilter;
+
+		foreach ($ids as $id)
+		{
+			if ($i !== 0)
+			{
+				$tagIds .= '&';
+			}
+
+			$tagIds .= 'id[' . $i . ']=' . $filter->clean($id, 'INT');
+
+			$i++;
+		}
+
+		$document->link = Route::_('index.php?option=com_tags&view=tag&' . $tagIds);
 
 		$app->input->set('limit', $app->get('feed_limit'));
 		$siteEmail        = $app->get('mailfrom');
diff --git a/components/com_tags/View/Tag/HtmlView.php b/components/com_tags/View/Tag/HtmlView.php
index a56d8dea28f65..75e6c098de3a5 100644
--- a/components/com_tags/View/Tag/HtmlView.php
+++ b/components/com_tags/View/Tag/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -128,6 +128,9 @@ public function display($tpl = null)
 		$parent     = $this->get('Parent');
 		$pagination = $this->get('Pagination');
 
+		// Flag indicates to not add limitstart=0 to URL
+		$pagination->hideEmptyLimitstart = true;
+
 		if (count($errors = $this->get('Errors')))
 		{
 			throw new \JViewGenericdataexception(implode("\n", $errors), 500);
diff --git a/components/com_tags/View/Tags/FeedView.php b/components/com_tags/View/Tags/FeedView.php
index 1c3ba93df9896..bdec1576a68c7 100644
--- a/components/com_tags/View/Tags/FeedView.php
+++ b/components/com_tags/View/Tags/FeedView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/View/Tags/HtmlView.php b/components/com_tags/View/Tags/HtmlView.php
index 6abafad193e58..8c421f1b0fb2b 100644
--- a/components/com_tags/View/Tags/HtmlView.php
+++ b/components/com_tags/View/Tags/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -81,28 +81,28 @@ class HtmlView extends BaseHtmlView
 	 */
 	public function display($tpl = null)
 	{
-		$app    = Factory::getApplication();
-		$params = $app->getParams();
-
 		// Get some data from the models
-		$state      = $this->get('State');
-		$items      = $this->get('Items');
-		$item       = $this->get('Item');
-		$pagination = $this->get('Pagination');
+		$this->state      = $this->get('State');
+		$this->items      = $this->get('Items');
+		$this->pagination = $this->get('Pagination');
+		$this->params     = $this->state->get('params');
+		$this->user       = Factory::getUser();
 
 		if (count($errors = $this->get('Errors')))
 		{
 			throw new \JViewGenericdataexception(implode("\n", $errors), 500);
 		}
 
+		// Flag indicates to not add limitstart=0 to URL
+		$this->pagination->hideEmptyLimitstart = true;
+
 		// Check whether access level allows access.
 		// @todo: Should already be computed in $item->params->get('access-view')
-		$user   = Factory::getUser();
-		$groups = $user->getAuthorisedViewLevels();
+		$groups = $this->user->getAuthorisedViewLevels();
 
-		if (!empty($items))
+		if (!empty($this->items))
 		{
-			foreach ($items as $itemElement)
+			foreach ($this->items as $itemElement)
 			{
 				if (!in_array($itemElement->access, $groups))
 				{
@@ -111,68 +111,29 @@ public function display($tpl = null)
 
 				// Prepare the data.
 				$temp = new Registry($itemElement->params);
-				$itemElement->params = clone $params;
+				$itemElement->params = clone $this->params;
 				$itemElement->params->merge($temp);
 				$itemElement->params = (array) json_decode($itemElement->params);
 			}
 		}
 
-		$this->state      = &$state;
-		$this->items      = &$items;
-		$this->pagination = &$pagination;
-		$this->user       = &$user;
-		$this->item       = &$item;
-
 		// Escape strings for HTML output
-		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
+		$this->pageclass_sfx = htmlspecialchars($this->params->get('pageclass_sfx'));
 
-		// Merge tag params. If this is single-tag view, menu params override tag params
-		// Otherwise, article params override menu item params
-		$this->params = $this->state->get('params');
-		$active       = $app->getMenu()->getActive();
-		$temp         = clone $this->params;
+		$active = Factory::getApplication()->getMenu()->getActive();
 
-		// Check to see which parameters should take priority
-		if ($active)
+		// Load layout from active query (in case it is an alternative menu item)
+		if ($active && $active->query['option'] === 'com_tags' && $active->query['view'] === 'tags')
 		{
-			$currentLink = $active->link;
-
-			// If the current view is the active item and the tags view, then the menu item params take priority
-			if (strpos($currentLink, 'view=tags'))
-			{
-				$this->params = $active->params;
-				$this->params->merge($temp);
-
-				// Load layout from active query (in case it is an alternative menu item)
-				if (isset($active->query['layout']))
-				{
-					$this->setLayout($active->query['layout']);
-				}
-			}
-			else
+			if (isset($active->query['layout']))
 			{
-				// Current view is not a single tag, so the tag params take priority here
-				// Merge the menu item params with the tag params so that the tag params take priority
-				$temp->merge($item->params);
-				$item->params = $temp;
-
-				// Check for alternative layouts (since we are not in a single-article menu item)
-				// Single tag menu item layout takes priority over alt layout for a tag
-				if ($layout = $item->params->get('tag_layout'))
-				{
-					$this->setLayout($layout);
-				}
+				$this->setLayout($active->query['layout']);
 			}
 		}
-		elseif (!empty($items[0]))
+		else
 		{
-			// Merge so that tag params take priority
-			$temp->merge($items[0]->params);
-			$items[0]->params = $temp;
-
-			// Check for alternative layouts (since we are not in a single-tag menu item)
-			// Single-tag menu item layout takes priority over alt layout for a tag
-			if ($layout = $items[0]->params->get('tag_layout'))
+			// Load default All Tags layout from component
+			if ($layout = $this->params->get('tags_layout'))
 			{
 				$this->setLayout($layout);
 			}
diff --git a/components/com_tags/helpers/route.php b/components/com_tags/helpers/route.php
index 19a90c5ffd2ac..91ef2c78ed28c 100644
--- a/components/com_tags/helpers/route.php
+++ b/components/com_tags/helpers/route.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/router.php b/components/com_tags/router.php
index 886d84d8ac23b..e0e2f1508da28 100644
--- a/components/com_tags/router.php
+++ b/components/com_tags/router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/tmpl/tag/default.php b/components/com_tags/tmpl/tag/default.php
index 2c9e3ecd11e48..b4acc900a2e3b 100644
--- a/components/com_tags/tmpl/tag/default.php
+++ b/components/com_tags/tmpl/tag/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/tmpl/tag/default.xml b/components/com_tags/tmpl/tag/default.xml
index e9785f203189b..64b26ace479cd 100644
--- a/components/com_tags/tmpl/tag/default.xml
+++ b/components/com_tags/tmpl/tag/default.xml
@@ -13,8 +13,8 @@
 	<fields name="request">
 		<fieldset name="request">
 
-			<field 
-				name="id" 
+			<field
+				name="id"
 				type="tag"
 				label="COM_TAGS_FIELD_TAG_LABEL"
 				custom="deny"
@@ -22,14 +22,14 @@
 				multiple="true"
 			/>
 
-			<field 
-				name="types" 
+			<field
+				name="types"
 				type="contenttype"
 				label="COM_TAGS_FIELD_TYPE_LABEL"
 				multiple="true"
 			/>
 
-			<field 
+			<field
 				name="tag_list_language_filter"
 				type="contentlanguage"
 				label="COM_TAGS_FIELD_LANGUAGE_FILTER_LABEL"
@@ -47,8 +47,8 @@
 <fields name="params">
 	<fieldset name="basic" label="COM_TAGS_OPTIONS">
 
-			<field 
-				name="show_tag_title" 
+			<field
+				name="show_tag_title"
 				type="list"
 				label="COM_TAGS_SHOW_TAG_TITLE_LABEL"
 				useglobal="true"
@@ -58,8 +58,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="tag_list_show_tag_image" 
+			<field
+				name="tag_list_show_tag_image"
 				type="list"
 				label="COM_TAGS_SHOW_TAG_IMAGE_LABEL"
 				useglobal="true"
@@ -69,8 +69,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="tag_list_show_tag_description" 
+			<field
+				name="tag_list_show_tag_description"
 				type="list"
 				label="COM_TAGS_SHOW_TAG_DESCRIPTION_LABEL"
 				useglobal="true"
@@ -80,24 +80,24 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="tag_list_image" 
+			<field
+				name="tag_list_image"
 				type="media"
 				label="COM_TAGS_TAG_LIST_MEDIA_LABEL"
 			/>
 
-			<field 
-				name="tag_list_description" 
+			<field
+				name="tag_list_description"
 				type="textarea"
 				class="inputbox"
 				label="COM_TAGS_SHOW_TAG_LIST_DESCRIPTION_LABEL"
 				description="COM_TAGS_TAG_LIST_DESCRIPTION_DESC"
-				rows="3" 
-				cols="30" 
+				rows="3"
+				cols="30"
 				filter="safehtml"
 			/>
 
-			<field 
+			<field
 				name="tag_list_orderby"
 				type="list"
 				label="JGLOBAL_FIELD_FIELD_ORDERING_LABEL"
@@ -111,8 +111,8 @@
 				<option value="c.core_publish_up">JGLOBAL_PUBLISHED_DATE</option>
 			</field>
 
-			<field 
-				name="tag_list_orderby_direction" 
+			<field
+				name="tag_list_orderby_direction"
 				type="list"
 				label="JGLOBAL_ORDER_DIRECTION_LABEL"
 				useglobal="true"
@@ -125,15 +125,15 @@
 
 		<fieldset name="advanced" label="COM_TAGS_ITEM_OPTIONS">
 
-			<field 
-				name="spacer2" 
-				type="spacer" 
+			<field
+				name="spacer2"
+				type="spacer"
 				label="COM_TAGS_SUBSLIDER_DRILL_TAG_LIST_LABEL"
 				class="text"
 			/>
 
-			<field 
-				name="tag_list_show_item_image" 
+			<field
+				name="tag_list_show_item_image"
 				type="list"
 				label="COM_TAGS_TAG_LIST_SHOW_ITEM_IMAGE_LABEL"
 				useglobal="true"
@@ -143,8 +143,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="tag_list_show_item_description" 
+			<field
+				name="tag_list_show_item_description"
 				type="list"
 				label="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_LABEL"
 				useglobal="true"
@@ -178,7 +178,7 @@
 		<fieldset name="pagination" label="COM_TAGS_PAGINATION_OPTIONS">
 
 			<field
-				name="show_pagination_limit" 
+				name="show_pagination_limit"
 				type="list"
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
@@ -188,8 +188,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_pagination" 
+			<field
+				name="show_pagination"
 				type="list"
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
@@ -200,8 +200,8 @@
 				<option value="2">JGLOBAL_AUTO</option>
 			</field>
 
-			<field 
-				name="show_pagination_results" 
+			<field
+				name="show_pagination_results"
 				type="list"
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
@@ -216,7 +216,7 @@
 		<fieldset name="selection" label="COM_TAGS_LIST_SELECTION_OPTIONS">
 
 			<field
-				name="return_any_or_all" 
+				name="return_any_or_all"
 				type="list"
 				label="COM_TAGS_SEARCH_TYPE_LABEL"
 				useglobal="true"
@@ -225,8 +225,8 @@
 				<option value="1">COM_TAGS_ANY</option>
 			</field>
 
-			<field 
-				name="include_children" 
+			<field
+				name="include_children"
 				type="list"
 				label="COM_TAGS_INCLUDE_CHILDREN_LABEL"
 				default=""
@@ -241,7 +241,7 @@
 		<fieldset name="integration">
 
 			<field
-				name="show_feed_link" 
+				name="show_feed_link"
 				type="list"
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
diff --git a/components/com_tags/tmpl/tag/default_items.php b/components/com_tags/tmpl/tag/default_items.php
index bcee3fa336093..6cfc3e5f0852c 100644
--- a/components/com_tags/tmpl/tag/default_items.php
+++ b/components/com_tags/tmpl/tag/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/tmpl/tag/list.php b/components/com_tags/tmpl/tag/list.php
index e160f80dfae03..6fbc0a960b747 100644
--- a/components/com_tags/tmpl/tag/list.php
+++ b/components/com_tags/tmpl/tag/list.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/tmpl/tag/list.xml b/components/com_tags/tmpl/tag/list.xml
index 6338d5b1c12a3..3472c70aeb317 100644
--- a/components/com_tags/tmpl/tag/list.xml
+++ b/components/com_tags/tmpl/tag/list.xml
@@ -13,23 +13,23 @@
 	<fields name="request">
 		<fieldset name="request">
 
-			<field 
-				name="id" 
-				type="tag" 
+			<field
+				name="id"
+				type="tag"
 				label="COM_TAGS_FIELD_TAG_LABEL"
 				custom="deny"
 				required="true"
 				multiple="true"
 			/>
 
-			<field 
-				name="types" 
+			<field
+				name="types"
 				type="contenttype"
 				label="COM_TAGS_FIELD_TYPE_LABEL"
 				multiple="true"
 			/>
 
-			<field 
+			<field
 				name="tag_list_language_filter"
 				type="contentlanguage"
 				label="COM_TAGS_FIELD_LANGUAGE_FILTER_LABEL"
@@ -46,8 +46,8 @@
 	<fields name="params">
 		<fieldset name="basic" label="COM_TAGS_OPTIONS">
 
-			<field 
-				name="show_tag_title" 
+			<field
+				name="show_tag_title"
 				type="list"
 				label="COM_TAGS_SHOW_TAG_TITLE_LABEL"
 				useglobal="true"
@@ -57,8 +57,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="tag_list_show_tag_image" 
+			<field
+				name="tag_list_show_tag_image"
 				type="list"
 				label="COM_TAGS_SHOW_TAG_IMAGE_LABEL"
 				useglobal="true"
@@ -68,8 +68,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="tag_list_show_tag_description" 
+			<field
+				name="tag_list_show_tag_description"
 				type="list"
 				label="COM_TAGS_SHOW_TAG_DESCRIPTION_LABEL"
 				useglobal="true"
@@ -79,24 +79,24 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="tag_list_image" 
+			<field
+				name="tag_list_image"
 				type="media"
 				label="COM_TAGS_TAG_LIST_MEDIA_LABEL"
 			/>
 
-			<field 
-				name="tag_list_description" 
+			<field
+				name="tag_list_description"
 				type="textarea"
 				label="COM_TAGS_SHOW_TAG_LIST_DESCRIPTION_LABEL"
 				description="COM_TAGS_TAG_LIST_DESCRIPTION_DESC"
 				class="inputbox"
-				rows="3" 
-				cols="30" 
+				rows="3"
+				cols="30"
 				filter="safehtml"
 			/>
 
-			<field 
+			<field
 				name="tag_list_orderby"
 				type="list"
 				label="JGLOBAL_FIELD_FIELD_ORDERING_LABEL"
@@ -110,8 +110,8 @@
 				<option value="c.core_publish_up">JGLOBAL_PUBLISHED_DATE</option>
 			</field>
 
-			<field 
-				name="tag_list_orderby_direction" 
+			<field
+				name="tag_list_orderby_direction"
 				type="list"
 				label="JGLOBAL_ORDER_DIRECTION_LABEL"
 				useglobal="true"
@@ -124,15 +124,15 @@
 
 		<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
 
-			<field 
-				name="spacer2" 
-				type="spacer" 
+			<field
+				name="spacer2"
+				type="spacer"
 				label="COM_TAGS_SUBSLIDER_DRILL_TAG_LIST_LABEL"
 				class="text"
 			/>
 
-			<field 
-				name="tag_list_show_item_image" 
+			<field
+				name="tag_list_show_item_image"
 				type="list"
 				label="COM_TAGS_TAG_LIST_SHOW_ITEM_IMAGE_LABEL"
 				useglobal="true"
@@ -142,8 +142,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="tag_list_show_item_description" 
+			<field
+				name="tag_list_show_item_description"
 				type="list"
 				label="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_LABEL"
 				useglobal="true"
@@ -174,8 +174,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field	
-				name="show_pagination_limit" 
+			<field
+				name="show_pagination_limit"
 				type="list"
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
@@ -185,8 +185,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="display_num" 
+			<field
+				name="display_num"
 				type="list"
 				label="COM_TAGS_FIELD_NUMBER_ITEMS_LIST_LABEL"
 				class="chzn-color"
@@ -203,8 +203,8 @@
 				<option value="0">JALL</option>
 			</field>
 
-			<field 
-				name="show_pagination" 
+			<field
+				name="show_pagination"
 				type="list"
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
@@ -215,8 +215,8 @@
 				<option value="2">JGLOBAL_AUTO</option>
 			</field>
 
-			<field 
-				name="show_pagination_results" 
+			<field
+				name="show_pagination_results"
 				type="list"
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
@@ -226,8 +226,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="tag_list_show_date" 
+			<field
+				name="tag_list_show_date"
 				type="list"
 				label="JGLOBAL_SHOW_DATE_LABEL"
 				useglobal="true"
@@ -239,8 +239,8 @@
 				<option value="published">JPUBLISHED</option>
 			</field>
 
-			<field 
-				name="date_format" 
+			<field
+				name="date_format"
 				type="text"
 				label="JGLOBAL_DATE_FORMAT_LABEL"
 				description="JGLOBAL_DATE_FORMAT_DESC"
@@ -251,8 +251,8 @@
 
 		<fieldset name="selection" label="COM_TAGS_LIST_SELECTION_OPTIONS">
 
-			<field 
-				name="return_any_or_all" 
+			<field
+				name="return_any_or_all"
 				type="list"
 				label="COM_TAGS_SEARCH_TYPE_LABEL"
 				useglobal="true"
@@ -261,8 +261,8 @@
 				<option value="1">COM_TAGS_ANY</option>
 			</field>
 
-			<field 
-				name="include_children" 
+			<field
+				name="include_children"
 				type="list"
 				label="COM_TAGS_INCLUDE_CHILDREN_LABEL"
 				default=""
@@ -276,8 +276,8 @@
 
 		<fieldset name="integration">
 
-			<field 
-				name="show_feed_link" 
+			<field
+				name="show_feed_link"
 				type="list"
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
diff --git a/components/com_tags/tmpl/tag/list_items.php b/components/com_tags/tmpl/tag/list_items.php
index 63e04afe4a8df..88c8ec5808d51 100644
--- a/components/com_tags/tmpl/tag/list_items.php
+++ b/components/com_tags/tmpl/tag/list_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/tmpl/tags/default.php b/components/com_tags/tmpl/tags/default.php
index dd85631e26300..efc629e0bd801 100644
--- a/components/com_tags/tmpl/tags/default.php
+++ b/components/com_tags/tmpl/tags/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/tmpl/tags/default.xml b/components/com_tags/tmpl/tags/default.xml
index 73c394f70182c..cf7c40f423132 100644
--- a/components/com_tags/tmpl/tags/default.xml
+++ b/components/com_tags/tmpl/tags/default.xml
@@ -11,18 +11,18 @@
 	<!-- Add fields to the request variables for the layout. -->
 	<fields name="request">
 		<fieldset name="request">
-		
-			<field 
-				name="parent_id" 
-				type="tag" 
+
+			<field
+				name="parent_id"
+				type="tag"
 				label="COM_TAGS_FIELD_PARENT_TAG_LABEL"
 				mode="nested"
 				>
 				<option value="">JNONE</option>
 				<option value="1">JGLOBAL_ROOT</option>
 			</field>
-			
-			<field 
+
+			<field
 				name="tag_list_language_filter"
 				type="contentlanguage"
 				label="COM_TAGS_FIELD_LANGUAGE_FILTER_LABEL"
@@ -32,13 +32,13 @@
 				<option value="all">JALL</option>
 				<option value="current_language">JCURRENT</option>
 			</field>
-			
+
 		</fieldset>
 	</fields>
 	<!-- Add fields to the parameters object for the layout. -->
 	<fields name="params">
 		<fieldset name="basic">
-			
+
 			<field
 				name="tag_columns"
 				type="number"
@@ -47,18 +47,18 @@
 				filter="integer"
 			/>
 
-			<field 
-				name="all_tags_description" 
+			<field
+				name="all_tags_description"
 				type="textarea"
 				label="COM_TAGS_ALL_TAGS_DESCRIPTION_LABEL"
 				class="inputbox"
-				rows="3" 
-				cols="30" 
+				rows="3"
+				cols="30"
 				filter="safehtml"
 			/>
 
-			<field 
-				name="all_tags_show_description_image" 
+			<field
+				name="all_tags_show_description_image"
 				type="list"
 				label="COM_TAGS_SHOW_ALL_TAGS_IMAGE_LABEL"
 				class="chzn-color"
@@ -68,13 +68,13 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="all_tags_description_image" 
+			<field
+				name="all_tags_description_image"
 				type="media"
 				label="COM_TAGS_ALL_TAGS_MEDIA_LABEL"
 			/>
 
-			<field 
+			<field
 				name="all_tags_orderby"
 				type="list"
 				label="JGLOBAL_FIELD_FIELD_ORDERING_LABEL"
@@ -87,8 +87,8 @@
 				<option value="publish_up">JGLOBAL_PUBLISHED_DATE</option>
 			</field>
 
-			<field 
-				name="all_tags_orderby_direction" 
+			<field
+				name="all_tags_orderby_direction"
 				type="list"
 				label="JGLOBAL_ORDER_DIRECTION_LABEL"
 				useglobal="true"
@@ -97,8 +97,8 @@
 				<option value="DESC">JGLOBAL_ORDER_DESCENDING</option>
 			</field>
 
-			<field 
-				name="all_tags_show_tag_image" 
+			<field
+				name="all_tags_show_tag_image"
 				type="list"
 				label="COM_TAGS_SHOW_ITEM_IMAGE_LABEL"
 				useglobal="true"
@@ -108,8 +108,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="all_tags_show_tag_description" 
+			<field
+				name="all_tags_show_tag_description"
 				type="list"
 				label="COM_TAGS_SHOW_ITEM_DESCRIPTION_LABEL"
 				class="chzn-color"
@@ -126,8 +126,8 @@
 				filter="integer"
 			/>
 
-			<field 
-				name="all_tags_show_tag_hits" 
+			<field
+				name="all_tags_show_tag_hits"
 				type="list"
 				label="JGLOBAL_HITS"
 				useglobal="true"
@@ -136,12 +136,12 @@
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 			</field>
-			
+
 		</fieldset>
-		<fieldset 
-			name="selection" 
-			label="COM_TAGS_LIST_ALL_SELECTION_OPTIONS"> 
-			
+		<fieldset
+			name="selection"
+			label="COM_TAGS_LIST_ALL_SELECTION_OPTIONS">
+
 			<field
 				name="maximum"
 				type="number"
@@ -161,9 +161,9 @@
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 			</field>
-		
-			<field	
-				name="show_pagination_limit" 
+
+			<field
+				name="show_pagination_limit"
 				type="list"
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
@@ -172,9 +172,9 @@
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 			</field>
-			
-			<field 
-				name="show_pagination" 
+
+			<field
+				name="show_pagination"
 				type="list"
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
@@ -185,8 +185,8 @@
 				<option value="2">JGLOBAL_AUTO</option>
 			</field>
 
-			<field 
-				name="show_pagination_results" 
+			<field
+				name="show_pagination_results"
 				type="list"
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
@@ -195,11 +195,11 @@
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 			</field>
-			
+
 		</fieldset>
 		<fieldset name="integration">
 			<field
-				name="show_feed_link" 
+				name="show_feed_link"
 				type="list"
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
@@ -211,4 +211,4 @@
 
 		</fieldset>
 	</fields>
-</metadata>
\ No newline at end of file
+</metadata>
diff --git a/components/com_tags/tmpl/tags/default_items.php b/components/com_tags/tmpl/tags/default_items.php
index c8aec3704ad29..0451aa1e25db5 100644
--- a/components/com_tags/tmpl/tags/default_items.php
+++ b/components/com_tags/tmpl/tags/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/Controller/DisplayController.php b/components/com_users/Controller/DisplayController.php
index 3c4d2115ef6d9..d328aa958717e 100644
--- a/components/com_users/Controller/DisplayController.php
+++ b/components/com_users/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -132,6 +132,12 @@ public function display($cachable = false, $urlparams = false)
 					break;
 			}
 
+			// Make sure we don't send a referer
+			if (in_array($vName, array('remind', 'reset')))
+			{
+				JFactory::getApplication()->setHeader('Referrer-Policy', 'no-referrer', true);
+			}
+
 			// Push the model into the view (as default).
 			$view->setModel($model, true);
 			$view->setLayout($lName);
diff --git a/components/com_users/Controller/ProfileController.php b/components/com_users/Controller/ProfileController.php
index 22a3069b395f6..caea4ad5269e3 100644
--- a/components/com_users/Controller/ProfileController.php
+++ b/components/com_users/Controller/ProfileController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Users\Site\Controller;
@@ -251,58 +251,21 @@ public function save()
 	}
 
 	/**
-	 * Function that allows child controller access to model data after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  $model      The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   3.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = array())
-	{
-		$item = $model->getData();
-		$tags = $validData['tags'];
-
-		if ($tags)
-		{
-			$item->tags = new TagsHelper;
-			$item->tags->getTagIds($item->id, 'com_users.user');
-			$item->metadata['tags'] = $item->tags;
-		}
-	}
-
-	/**
-	 * Returns the updated options for help site selector
+	 * Method to cancel an edit.
 	 *
 	 * @return  void
 	 *
-	 * @since   3.5
-	 * @throws  \Exception
+	 * @since   __DEPLOY_VERSION__
 	 */
-	public function gethelpsites()
+	public function cancel()
 	{
-		// Set FTP credentials, if given
-		ClientHelper::setCredentialsFromRequest('ftp');
-
-		if (($data = file_get_contents('https://update.joomla.org/helpsites/helpsites.xml')) === false)
-		{
-			throw new \Exception(Text::_('COM_CONFIG_ERROR_HELPREFRESH_FETCH'), 500);
-		}
-		elseif (!File::write(JPATH_ADMINISTRATOR . '/help/helpsites.xml', $data))
-		{
-			throw new \Exception(Text::_('COM_CONFIG_ERROR_HELPREFRESH_ERROR_STORE'), 500);
-		}
+		// Check for request forgeries.
+		$this->checkToken();
 
-		$options = array_merge(
-			array(
-				HTMLHelper::_('select.option', '', Text::_('JOPTION_USE_DEFAULT'))
-			),
-			Help::createSiteList(JPATH_ADMINISTRATOR . '/help/helpsites.xml')
-		);
+		// Flush the data from the session.
+		$this->app->setUserState('com_users.edit.profile', null);
 
-		echo new JsonResponse($options);
-		Factory::getApplication()->close();
+		// Redirect to user profile.
+		$this->setRedirect(Route::_('index.php?option=com_users&view=profile', false));
 	}
 }
diff --git a/components/com_users/Controller/RegistrationController.php b/components/com_users/Controller/RegistrationController.php
index c84162483d983..57c2cd872ea7e 100644
--- a/components/com_users/Controller/RegistrationController.php
+++ b/components/com_users/Controller/RegistrationController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -66,6 +66,44 @@ public function activate()
 			return false;
 		}
 
+		// Get the User ID
+		$userIdToActivate = $model->getUserIdFromToken($token);
+
+		if (!$userIdToActivate)
+		{
+			throw new \Exception(Text::_('COM_USERS_ACTIVATION_TOKEN_NOT_FOUND'), 403);
+
+			return false;
+		}
+
+		// Get the user we want to activate
+		$userToActivate = Factory::getUser($userIdToActivate);
+
+		// Admin activation is on and admin is activating the account
+		if (($uParams->get('useractivation') == 2) && $userToActivate->getParam('activate', 0))
+		{
+			// If a user admin is not logged in, redirect them to the login page with a error message
+			if (!$user->authorise('core.create', 'com_users'))
+			{
+				$activationUrl = 'index.php?option=com_users&task=registration.activate&token=' . $token;
+				$loginUrl      = 'index.php?option=com_users&view=login&return=' . base64_encode($activationUrl);
+
+				// In case we still run into this in the second step the user does not have the right permissions
+				$message = Text::_('COM_USERS_REGISTRATION_ACL_ADMIN_ACTIVATION_PERMISSIONS');
+
+				// When we are not logged in we should login
+				if ($user->guest)
+				{
+					$message = Text::_('COM_USERS_REGISTRATION_ACL_ADMIN_ACTIVATION');
+				}
+
+				$this->setMessage($message);
+				$this->setRedirect(Route::_($loginUrl, false));
+
+				return false;
+			}
+		}
+
 		// Attempt to activate the user.
 		$return = $model->activate($token);
 
diff --git a/components/com_users/Controller/RemindController.php b/components/com_users/Controller/RemindController.php
index e74b14926fce2..c5d11f85aa01d 100644
--- a/components/com_users/Controller/RemindController.php
+++ b/components/com_users/Controller/RemindController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/Controller/ResetController.php b/components/com_users/Controller/ResetController.php
index 5529a95c098db..3bd82834f6470 100644
--- a/components/com_users/Controller/ResetController.php
+++ b/components/com_users/Controller/ResetController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Users\Site\Controller;
diff --git a/components/com_users/Controller/UserController.php b/components/com_users/Controller/UserController.php
index 342050e2c7e36..d01b5b8b358ba 100644
--- a/components/com_users/Controller/UserController.php
+++ b/components/com_users/Controller/UserController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/Model/LoginModel.php b/components/com_users/Model/LoginModel.php
index 4ecc9da11c7e9..226db2378ee5b 100644
--- a/components/com_users/Model/LoginModel.php
+++ b/components/com_users/Model/LoginModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/Model/ProfileModel.php b/components/com_users/Model/ProfileModel.php
index 883a9adacd1bb..07daeaa2cd800 100644
--- a/components/com_users/Model/ProfileModel.php
+++ b/components/com_users/Model/ProfileModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -407,13 +407,6 @@ public function save($data)
 			return false;
 		}
 
-		// Some contexts may not use tags data at all, so we allow callers to disable loading tag data
-		if ($this->getState('load_tags', true))
-		{
-			$user->tags = new TagsHelper;
-			$user->tags->getTagIds($user->id, 'com_users.user');
-		}
-
 		return $user->id;
 	}
 
diff --git a/components/com_users/Model/RegistrationModel.php b/components/com_users/Model/RegistrationModel.php
index 710c9e01dc316..8495db5d15197 100644
--- a/components/com_users/Model/RegistrationModel.php
+++ b/components/com_users/Model/RegistrationModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -64,19 +64,16 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 	}
 
 	/**
-	 * Method to activate a user account.
+	 * Method to get the user ID from the given token
 	 *
 	 * @param   string  $token  The activation token.
 	 *
-	 * @return  mixed    False on failure, user object on success.
+	 * @return  mixed   False on failure, id of the user on success
 	 *
-	 * @since   1.6
-	 * @throws  \Exception
+	 * @since   3.8.13
 	 */
-	public function activate($token)
+	public function getUserIdFromToken($token)
 	{
-		$app = Factory::getApplication();
-		$userParams = ComponentHelper::getParams('com_users');
 		$db = $this->getDbo();
 
 		// Get the user id based on the token.
@@ -90,7 +87,7 @@ public function activate($token)
 
 		try
 		{
-			$userId = (int) $db->loadResult();
+			return (int) $db->loadResult();
 		}
 		catch (\RuntimeException $e)
 		{
@@ -98,6 +95,22 @@ public function activate($token)
 
 			return false;
 		}
+	}
+
+	/**
+	 * Method to activate a user account.
+	 *
+	 * @param   string  $token  The activation token.
+	 *
+	 * @return  mixed    False on failure, user object on success.
+	 *
+	 * @since   1.6
+	 */
+	public function activate($token)
+	{
+		$app        = Factory::getApplication();
+		$userParams = ComponentHelper::getParams('com_users');
+		$userId     = $this->getUserIdFromToken($token);
 
 		// Check for a valid user id.
 		if (!$userId)
@@ -116,22 +129,14 @@ public function activate($token)
 		// Admin activation is on and user is verifying their email
 		if (($userParams->get('useractivation') == 2) && !$user->getParam('activate', 0))
 		{
-			$uri = Uri::getInstance();
+			$linkMode = $app->get('force_ssl', 0) == 2 ? 1 : -1;
 
 			// Compile the admin notification mail values.
 			$data = $user->getProperties();
 			$data['activation'] = ApplicationHelper::getHash(UserHelper::genRandomPassword());
 			$user->set('activation', $data['activation']);
 			$data['siteurl'] = Uri::base();
-			$base = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
-			$data['activate'] = $base . Route::_('index.php?option=com_users&task=registration.activate&token=' . $data['activation'], false);
-
-			// Remove administrator/ from activate URL in case this method is called from admin
-			if (Factory::getApplication()->isClient('administrator'))
-			{
-				$adminPos         = strrpos($data['activate'], 'administrator/');
-				$data['activate'] = substr_replace($data['activate'], '', $adminPos, 14);
-			}
+			$data['activate'] = Route::link('site', 'index.php?option=com_users&task=registration.activate&token=' . $data['activation'], false, $linkMode);
 
 			$data['fromname'] = $app->get('fromname');
 			$data['mailfrom'] = $app->get('mailfrom');
@@ -153,7 +158,8 @@ public function activate($token)
 			);
 
 			// Get all admin users
-			$query->clear()
+			$db = $this->getDbo();
+			$query = $db->getQuery(true)
 				->select($db->quoteName(array('name', 'email', 'sendEmail', 'id')))
 				->from($db->quoteName('#__users'))
 				->where($db->quoteName('sendEmail') . ' = 1')
@@ -517,16 +523,9 @@ public function register($temp)
 		if ($useractivation == 2)
 		{
 			// Set the link to confirm the user email.
-			$uri = Uri::getInstance();
-			$base = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
-			$data['activate'] = $base . Route::_('index.php?option=com_users&task=registration.activate&token=' . $data['activation'], false);
+			$linkMode = $app->get('force_ssl', 0) == 2 ? 1 : -1;
 
-			// Remove administrator/ from activate URL in case this method is called from admin
-			if (Factory::getApplication()->isClient('administrator'))
-			{
-				$adminPos         = strrpos($data['activate'], 'administrator/');
-				$data['activate'] = substr_replace($data['activate'], '', $adminPos, 14);
-			}
+			$data['activate'] = Route::link('site', 'index.php?option=com_users&task=registration.activate&token=' . $data['activation'], false, $linkMode);
 
 			$emailSubject = Text::sprintf(
 				'COM_USERS_EMAIL_ACCOUNT_DETAILS',
@@ -561,16 +560,9 @@ public function register($temp)
 		elseif ($useractivation == 1)
 		{
 			// Set the link to activate the user account.
-			$uri = Uri::getInstance();
-			$base = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
-			$data['activate'] = $base . Route::_('index.php?option=com_users&task=registration.activate&token=' . $data['activation'], false);
+			$linkMode = $app->get('force_ssl', 0) == 2 ? 1 : -1;
 
-			// Remove administrator/ from activate URL in case this method is called from admin
-			if (Factory::getApplication()->isClient('administrator'))
-			{
-				$adminPos         = strrpos($data['activate'], 'administrator/');
-				$data['activate'] = substr_replace($data['activate'], '', $adminPos, 14);
-			}
+			$data['activate'] = Route::link('site', 'index.php?option=com_users&task=registration.activate&token=' . $data['activation'], false, $linkMode);
 
 			$emailSubject = Text::sprintf(
 				'COM_USERS_EMAIL_ACCOUNT_DETAILS',
diff --git a/components/com_users/Model/RemindModel.php b/components/com_users/Model/RemindModel.php
index a55c7bc33f443..9d637a93cebde 100644
--- a/components/com_users/Model/RemindModel.php
+++ b/components/com_users/Model/RemindModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -220,9 +220,9 @@ public function processRemindRequest($data)
 
 			return false;
 		}
-		else
-		{
-			return true;
-		}
+
+		Factory::getApplication()->triggerEvent('onUserAfterRemind', array($user));
+
+		return true;
 	}
 }
diff --git a/components/com_users/Model/ResetModel.php b/components/com_users/Model/ResetModel.php
index 77f89330d1ab9..c591277bcb749 100644
--- a/components/com_users/Model/ResetModel.php
+++ b/components/com_users/Model/ResetModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -157,7 +157,6 @@ public function processResetComplete($data)
 	{
 		// Get the form.
 		$form = $this->getResetCompleteForm();
-		$data['email'] = PunycodeHelper::emailToPunycode($data['email']);
 
 		// Check for an error.
 		if ($form instanceof \Exception)
@@ -257,7 +256,6 @@ public function processResetConfirm($data)
 	{
 		// Get the form.
 		$form = $this->getResetConfirmForm();
-		$data['email'] = PunycodeHelper::emailToPunycode($data['email']);
 
 		// Check for an error.
 		if ($form instanceof \Exception)
diff --git a/components/com_users/Rule/LoginUniqueFieldRule.php b/components/com_users/Rule/LoginUniqueFieldRule.php
index 429aa40e846f2..4806b6b2a295d 100644
--- a/components/com_users/Rule/LoginUniqueFieldRule.php
+++ b/components/com_users/Rule/LoginUniqueFieldRule.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/Rule/LogoutUniqueFieldRule.php b/components/com_users/Rule/LogoutUniqueFieldRule.php
index d310523733258..4a964ce292bf5 100644
--- a/components/com_users/Rule/LogoutUniqueFieldRule.php
+++ b/components/com_users/Rule/LogoutUniqueFieldRule.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/Service/Router.php b/components/com_users/Service/Router.php
index 521208f8ec185..e013759a9508f 100644
--- a/components/com_users/Service/Router.php
+++ b/components/com_users/Service/Router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/View/Login/HtmlView.php b/components/com_users/View/Login/HtmlView.php
index 43031b92a9954..8822b0d3eb4e5 100644
--- a/components/com_users/View/Login/HtmlView.php
+++ b/components/com_users/View/Login/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/View/Profile/HtmlView.php b/components/com_users/View/Profile/HtmlView.php
index 6dd9a3dfdcea5..5c8ce47395dda 100644
--- a/components/com_users/View/Profile/HtmlView.php
+++ b/components/com_users/View/Profile/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -147,9 +147,6 @@ public function display($tpl = null)
 			throw new \Exception(Text::_('JERROR_USERS_PROFILE_NOT_FOUND'), 404);
 		}
 
-		$this->data->tags = new TagsHelper;
-		$this->data->tags->getItemTags('com_users.user', $this->data->id);
-
 		PluginHelper::importPlugin('content');
 		$this->data->text = '';
 		Factory::getApplication()->triggerEvent('onContentPrepare', array ('com_users.user', &$this->data, &$this->data->params, 0));
diff --git a/components/com_users/View/Registration/HtmlView.php b/components/com_users/View/Registration/HtmlView.php
index 478d8138f7fc3..ddd34ac6ecf21 100644
--- a/components/com_users/View/Registration/HtmlView.php
+++ b/components/com_users/View/Registration/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/View/Remind/HtmlView.php b/components/com_users/View/Remind/HtmlView.php
index 206944ec9e5c9..8362aac43092e 100644
--- a/components/com_users/View/Remind/HtmlView.php
+++ b/components/com_users/View/Remind/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/View/Reset/HtmlView.php b/components/com_users/View/Reset/HtmlView.php
index 4a937fd0efe37..df2385bf512f6 100644
--- a/components/com_users/View/Reset/HtmlView.php
+++ b/components/com_users/View/Reset/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/forms/profile.xml b/components/com_users/forms/profile.xml
index fdbf7f28ee156..e4e6d45b0998e 100644
--- a/components/com_users/forms/profile.xml
+++ b/components/com_users/forms/profile.xml
@@ -57,11 +57,11 @@
 			type="email"
 			label="COM_USERS_PROFILE_EMAIL1_LABEL"
 			filter="string"
-			message="COM_USERS_PROFILE_EMAIL1_MESSAGE"
 			required="true"
 			size="30"
 			unique="true"
 			validate="email"
+			validDomains="com_users.domains"
 			autocomplete="email"
 		/>
 
@@ -72,4 +72,4 @@
 		name="twofactor"
 		type="hidden"
 	/>
-</form>
\ No newline at end of file
+</form>
diff --git a/components/com_users/forms/registration.xml b/components/com_users/forms/registration.xml
index 03bc9052e7dff..11d907e56e986 100644
--- a/components/com_users/forms/registration.xml
+++ b/components/com_users/forms/registration.xml
@@ -67,11 +67,11 @@
 			description="COM_USERS_REGISTER_EMAIL1_DESC"
 			field="id"
 			filter="string"
-			message="COM_USERS_REGISTER_EMAIL1_MESSAGE"
 			required="true"
 			size="30"
 			unique="true"
 			validate="email"
+			validDomains="com_users.domains"
 			autocomplete="email"
 		/>
 
diff --git a/components/com_users/layouts/joomla/form/renderfield.php b/components/com_users/layouts/joomla/form/renderfield.php
new file mode 100644
index 0000000000000..d86dded0df3ef
--- /dev/null
+++ b/components/com_users/layouts/joomla/form/renderfield.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * ---------------------
+ *    $options         : (array)  Optional parameters
+ *    $label           : (string) The html code for the label (not required if $options['hiddenLabel'] is true)
+ *    $input           : (string) The input field html code
+ */
+
+if (!empty($options['showonEnabled']))
+{
+	JHtml::_('jquery.framework');
+	JHtml::_('script', 'jui/cms.js', array('version' => 'auto', 'relative' => true));
+}
+
+$class = empty($options['class']) ? '' : ' ' . $options['class'];
+$rel   = empty($options['rel']) ? '' : ' ' . $options['rel'];
+
+/**
+ * @TODO:
+ *
+ * As mentioned in #8473 (https://github.com/joomla/joomla-cms/pull/8473), ...
+ * as long as we cannot access the field properties properly, this seems to
+ * be the way to go for now.
+ *
+ * On a side note: Parsing html is seldom a good idea.
+ * https://stackoverflow.com/questions/1732348/regex-match-open-tags-except-xhtml-self-contained-tags/1732454#1732454
+ */
+preg_match('/class=\"([^\"]+)\"/i', $input, $match);
+
+$required     = (strpos($input, 'aria-required="true"') !== false || (!empty($match[1]) && strpos($match[1], 'required') !== false));
+$typeOfSpacer = (strpos($label, 'spacer-lbl') !== false);
+
+?>
+
+<div class="control-group<?php echo $class; ?>"<?php echo $rel; ?>>
+	<?php if (empty($options['hiddenLabel'])): ?>
+		<div class="control-label">
+			<?php echo $label; ?>
+			<?php if (!$required && !$typeOfSpacer) : ?>
+				<span class="optional"><?php echo JText::_('COM_USERS_OPTIONAL'); ?></span>
+			<?php endif; ?>
+		</div>
+	<?php endif; ?>
+	<div class="controls">
+		<?php echo $input; ?>
+	</div>
+</div>
diff --git a/components/com_users/tmpl/login/default.php b/components/com_users/tmpl/login/default.php
index 7db00b2d018d5..41a44adce57d6 100644
--- a/components/com_users/tmpl/login/default.php
+++ b/components/com_users/tmpl/login/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/tmpl/login/default_login.php b/components/com_users/tmpl/login/default_login.php
index c63b7ea8d76c7..429cb749a8946 100644
--- a/components/com_users/tmpl/login/default_login.php
+++ b/components/com_users/tmpl/login/default_login.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -49,28 +49,10 @@
 	<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">
 
 		<fieldset>
-			<?php foreach ($this->form->getFieldset('credentials') as $field) : ?>
-				<?php if (!$field->hidden) : ?>
-					<div class="com-users-login__input control-group">
-						<div class="control-label">
-							<?php echo $field->label; ?>
-						</div>
-						<div class="controls">
-							<?php echo $field->input; ?>
-						</div>
-					</div>
-				<?php endif; ?>
-			<?php endforeach; ?>
+			<?php echo $this->form->renderFieldset('credentials', ['class' => 'com-users-login__input']); ?>
 
 			<?php if ($this->tfa) : ?>
-				<div class="com-users-login__secretkey control-group">
-					<div class="control-label">
-						<?php echo $this->form->getField('secretkey')->label; ?>
-					</div>
-					<div class="controls">
-						<?php echo $this->form->getField('secretkey')->input; ?>
-					</div>
-				</div>
+				<?php echo $this->form->renderField('secretkey', ['class' => 'com-users-login__secretkey']); ?>
 			<?php endif; ?>
 
 			<?php if (PluginHelper::isEnabled('system', 'remember')) : ?>
diff --git a/components/com_users/tmpl/login/default_logout.php b/components/com_users/tmpl/login/default_logout.php
index c07e5ce3615bc..a0a539a2c19d6 100644
--- a/components/com_users/tmpl/login/default_logout.php
+++ b/components/com_users/tmpl/login/default_logout.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/tmpl/profile/default.php b/components/com_users/tmpl/profile/default.php
index 67e6ca96fc5a0..41bfb1e8819fc 100644
--- a/components/com_users/tmpl/profile/default.php
+++ b/components/com_users/tmpl/profile/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/tmpl/profile/default_core.php b/components/com_users/tmpl/profile/default_core.php
index 082a5e857ed6a..396f317a26367 100644
--- a/components/com_users/tmpl/profile/default_core.php
+++ b/components/com_users/tmpl/profile/default_core.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -22,13 +22,13 @@
 			<?php echo Text::_('COM_USERS_PROFILE_NAME_LABEL'); ?>
 		</dt>
 		<dd>
-			<?php echo $this->data->name; ?>
+			<?php echo $this->escape($this->data->name); ?>
 		</dd>
 		<dt>
 			<?php echo Text::_('COM_USERS_PROFILE_USERNAME_LABEL'); ?>
 		</dt>
 		<dd>
-			<?php echo htmlspecialchars($this->data->username, ENT_COMPAT, 'UTF-8'); ?>
+			<?php echo $this->escape($this->data->username); ?>
 		</dd>
 		<dt>
 			<?php echo Text::_('COM_USERS_PROFILE_REGISTERED_DATE_LABEL'); ?>
diff --git a/components/com_users/tmpl/profile/default_custom.php b/components/com_users/tmpl/profile/default_custom.php
index 3d2eed3817ab5..5a75ec1082951 100644
--- a/components/com_users/tmpl/profile/default_custom.php
+++ b/components/com_users/tmpl/profile/default_custom.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/tmpl/profile/default_params.php b/components/com_users/tmpl/profile/default_params.php
index 4caef0dc1e8e5..d6302312929fb 100644
--- a/components/com_users/tmpl/profile/default_params.php
+++ b/components/com_users/tmpl/profile/default_params.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/tmpl/profile/edit.php b/components/com_users/tmpl/profile/edit.php
index 184634eb269d6..8696c698e6349 100644
--- a/components/com_users/tmpl/profile/edit.php
+++ b/components/com_users/tmpl/profile/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -33,7 +33,7 @@
 		</div>
 	<?php endif; ?>
 
-	<form id="member-profile" action="<?php echo Route::_('index.php?option=com_users&task=profile.save'); ?>" 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?option=com_users'); ?>" 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); ?>
@@ -124,14 +124,13 @@
 
 		<div class="com-users-profile__edit-submit control-group">
 			<div class="controls">
-				<button type="submit" class="btn btn-primary validate">
-					<span>
-						<?php echo Text::_('JSUBMIT'); ?>
-					</span>
+				<button type="submit" class="btn btn-primary validate" name="task" value="profile.save">
+					<?php echo Text::_('JSUBMIT'); ?>
+				</button>
+				<button type="submit" class="btn btn-danger" name="task" value="profile.cancel" formnovalidate>
+					<?php echo Text::_('JCANCEL'); ?>
 				</button>
-				<a class="btn btn-danger" href="<?php echo Route::_('index.php?option=com_users&view=profile'); ?>" title="<?php echo Text::_('JCANCEL'); ?>"><?php echo Text::_('JCANCEL'); ?></a>
 				<input type="hidden" name="option" value="com_users">
-				<input type="hidden" name="task" value="profile.save">
 			</div>
 		</div>
 		<?php echo HTMLHelper::_('form.token'); ?>
diff --git a/components/com_users/tmpl/registration/complete.php b/components/com_users/tmpl/registration/complete.php
index 3ebcd3d754307..e2ad354625ae7 100644
--- a/components/com_users/tmpl/registration/complete.php
+++ b/components/com_users/tmpl/registration/complete.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/tmpl/registration/default.php b/components/com_users/tmpl/registration/default.php
index d2fdc9704e13b..6052947f742c7 100644
--- a/components/com_users/tmpl/registration/default.php
+++ b/components/com_users/tmpl/registration/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -34,25 +34,7 @@
 					<?php if (isset($fieldset->label)) : ?>
 						<legend><?php echo Text::_($fieldset->label); ?></legend>
 					<?php endif; ?>
-					<?php // Iterate through the fields in the set and display them. ?>
-					<?php foreach ($fields as $field) : ?>
-						<?php // If the field is hidden, just display the input. ?>
-						<?php if ($field->hidden) : ?>
-							<?php echo $field->input; ?>
-						<?php else : ?>
-							<div class="control-group">
-								<div class="control-label">
-									<?php echo $field->label; ?>
-									<?php if (!$field->required && $field->type !== 'Spacer') : ?>
-										<span class="optional"><?php echo Text::_('COM_USERS_OPTIONAL'); ?></span>
-									<?php endif; ?>
-								</div>
-								<div class="controls">
-									<?php echo $field->input; ?>
-								</div>
-							</div>
-						<?php endif; ?>
-					<?php endforeach; ?>
+					<?php echo $this->form->renderFieldset($fieldset->name); ?>
 				</fieldset>
 			<?php endif; ?>
 		<?php endforeach; ?>
@@ -61,7 +43,7 @@
 				<button type="submit" class="com-users-registration__register btn btn-primary validate">
 					<?php echo Text::_('JREGISTER'); ?>
 				</button>
-				<a class="com-users-registration__cancel btn btn-danger" href="<?php echo Route::_(''); ?>" title="<?php echo Text::_('JCANCEL'); ?>">
+				<a class="com-users-registration__cancel btn btn-danger" href="<?php echo Route::_(''); ?>">
 					<?php echo Text::_('JCANCEL'); ?>
 				</a>
 				<input type="hidden" name="option" value="com_users">
diff --git a/components/com_users/tmpl/remind/default.php b/components/com_users/tmpl/remind/default.php
index 0952a06803a22..c9a64431eb349 100644
--- a/components/com_users/tmpl/remind/default.php
+++ b/components/com_users/tmpl/remind/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -28,19 +28,10 @@
 	<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">
 		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
 			<fieldset>
-				<p><?php echo Text::_($fieldset->label); ?></p>
-				<?php foreach ($this->form->getFieldset($fieldset->name) as $name => $field) : ?>
-					<?php if ($field->hidden === false) : ?>
-						<div class="control-group">
-							<div class="control-label">
-								<?php echo $field->label; ?>
-							</div>
-							<div class="controls">
-								<?php echo $field->input; ?>
-							</div>
-						</div>
-					<?php endif; ?>
-				<?php endforeach; ?>
+				<?php if (isset($fieldset->label)) : ?>
+					<p><?php echo Text::_($fieldset->label); ?></p>
+				<?php endif; ?>
+				<?php echo $this->form->renderFieldset($fieldset->name); ?>
 			</fieldset>
 		<?php endforeach; ?>
 		<div class="com-users-remind__submit control-group">
diff --git a/components/com_users/tmpl/reset/complete.php b/components/com_users/tmpl/reset/complete.php
index 978f5ad6d3372..859994d65078a 100644
--- a/components/com_users/tmpl/reset/complete.php
+++ b/components/com_users/tmpl/reset/complete.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -28,17 +28,10 @@
 	<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">
 		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
 			<fieldset>
-				<p><?php echo Text::_($fieldset->label); ?></p>
-				<?php foreach ($this->form->getFieldset($fieldset->name) as $name => $field) : ?>
-					<div class="control-group">
-						<div class="control-label">
-							<?php echo $field->label; ?>
-						</div>
-						<div class="controls">
-							<?php echo $field->input; ?>
-						</div>
-					</div>
-				<?php endforeach; ?>
+				<?php if (isset($fieldset->label)) : ?>
+					<p><?php echo Text::_($fieldset->label); ?></p>
+				<?php endif; ?>
+				<?php echo $this->form->renderFieldset($fieldset->name); ?>
 			</fieldset>
 		<?php endforeach; ?>
 		<div class="com-users-reset-complete__submit control-group">
diff --git a/components/com_users/tmpl/reset/confirm.php b/components/com_users/tmpl/reset/confirm.php
index 851aa1ef88be3..d062fa121b519 100644
--- a/components/com_users/tmpl/reset/confirm.php
+++ b/components/com_users/tmpl/reset/confirm.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -28,17 +28,10 @@
 	<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">
 		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
 			<fieldset>
-				<p><?php echo Text::_($fieldset->label); ?></p>
-				<?php foreach ($this->form->getFieldset($fieldset->name) as $name => $field) : ?>
-					<div class="control-group">
-						<div class="control-label">
-							<?php echo $field->label; ?>
-						</div>
-						<div class="controls">
-							<?php echo $field->input; ?>
-							</div>
-						</div>
-				<?php endforeach; ?>
+				<?php if (isset($fieldset->label)) : ?>
+					<p><?php echo Text::_($fieldset->label); ?></p>
+				<?php endif; ?>
+				<?php echo $this->form->renderFieldset($fieldset->name); ?>
 			</fieldset>
 		<?php endforeach; ?>
 		<div class="com-users-reset-confirm__submit control-group">
diff --git a/components/com_users/tmpl/reset/default.php b/components/com_users/tmpl/reset/default.php
index c77702264385a..2ff0eefa11fe0 100644
--- a/components/com_users/tmpl/reset/default.php
+++ b/components/com_users/tmpl/reset/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -28,19 +28,10 @@
 	<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">
 		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
 			<fieldset>
-				<p><?php echo Text::_($fieldset->label); ?></p>
-				<?php foreach ($this->form->getFieldset($fieldset->name) as $name => $field) : ?>
-					<?php if ($field->hidden === false) : ?>
-						<div class="control-group">
-							<div class="control-label">
-								<?php echo $field->label; ?>
-							</div>
-							<div class="controls">
-								<?php echo $field->input; ?>
-							</div>
-						</div>
-					<?php endif; ?>
-				<?php endforeach; ?>
+				<?php if (isset($fieldset->label)) : ?>
+					<p><?php echo Text::_($fieldset->label); ?></p>
+				<?php endif; ?>
+				<?php echo $this->form->renderFieldset($fieldset->name); ?>
 			</fieldset>
 		<?php endforeach; ?>
 		<div class="com-users-reset__submit control-group">
diff --git a/components/com_wrapper/Controller/DisplayController.php b/components/com_wrapper/Controller/DisplayController.php
index 3765ca7a2ea0e..9e92fcd681e00 100644
--- a/components/com_wrapper/Controller/DisplayController.php
+++ b/components/com_wrapper/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_wrapper
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_wrapper/View/Wrapper/HtmlView.php b/components/com_wrapper/View/Wrapper/HtmlView.php
index 841478fc5cf92..6659612df54f5 100644
--- a/components/com_wrapper/View/Wrapper/HtmlView.php
+++ b/components/com_wrapper/View/Wrapper/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_wrapper
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_wrapper/router.php b/components/com_wrapper/router.php
index 977b7d012cc76..1e24afc3ce636 100644
--- a/components/com_wrapper/router.php
+++ b/components/com_wrapper/router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_wrapper
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_wrapper/tmpl/wrapper/default.php b/components/com_wrapper/tmpl/wrapper/default.php
index 8162af63d7fd8..5cb3fe51800b4 100644
--- a/components/com_wrapper/tmpl/wrapper/default.php
+++ b/components/com_wrapper/tmpl/wrapper/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_wrapper
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/composer.json b/composer.json
index f318988479dd4..8ff0ba71f3c5a 100644
--- a/composer.json
+++ b/composer.json
@@ -45,6 +45,11 @@
             "Joomla\\CMS\\": "libraries/src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Joomla\\Tests\\": "tests"
+        }
+    },
     "require": {
         "php": ">=7.0",
         "joomla/application": "~2.0@dev",
@@ -65,27 +70,31 @@
         "joomla/oauth1": "~2.0@dev",
         "joomla/oauth2": "~2.0@dev",
         "joomla/registry": "~2.0@dev",
+        "joomla/router": "~2.0@dev",
         "joomla/session": "~2.0@dev",
         "joomla/string": "~2.0@dev",
         "joomla/uri": "~2.0@dev",
         "joomla/utilities": "~2.0@dev",
+        "algo26-matthias/idna-convert": "~1.1",
         "defuse/php-encryption": "~2.1",
         "doctrine/inflector": "1.2.0",
         "fig/link-util": "~1.0",
         "google/recaptcha": "~1.1",
-        "mso/idna-convert": "~1.1",
-        "paragonie/sodium_compat": "~1.4",
+        "paragonie/sodium_compat": "~1.6",
         "phpmailer/phpmailer": "~6.0",
         "psr/link": "~1.0",
         "symfony/console": "3.4.*",
         "symfony/debug": "3.4.*",
         "symfony/ldap": "3.4.*",
         "symfony/options-resolver": "3.4.*",
+		"symfony/polyfill-php71": "~1.10",
         "symfony/polyfill-php73": "^1.10",
         "symfony/web-link": "3.4.*",
         "symfony/yaml": "3.4.*",
         "wamania/php-stemmer": "^1.2",
         "maximebf/debugbar": "^1.15",
+        "tobscure/json-api": "^0.4.1",
+        "willdurand/negotiation": "^2.3",
         "ext-json": "*"
     },
     "require-dev": {
@@ -98,6 +107,6 @@
         "joomla-projects/joomla-browser": "~4.0@dev",
         "joomla-projects/robo-joomla": "dev-develop",
         "joomla/test-system": "dev-4.0-dev",
-        "joomla/test-unit": "dev-4.0-dev"
+        "joomla/test-api": "dev-4.0-dev"
     }
 }
diff --git a/composer.lock b/composer.lock
index e5bc155b2d244..9f7c0c545464b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,69 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "59485b6ff077529cb9c9ad7872b31ddb",
+    "content-hash": "f6f495c9fa4c37f3316e308d2dd0e9aa",
     "packages": [
+        {
+            "name": "algo26-matthias/idna-convert",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/algo26-matthias/idna-convert.git",
+                "reference": "a6dfb6f87611e3a89d2eec4924a0f51db755c573"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/algo26-matthias/idna-convert/zipball/a6dfb6f87611e3a89d2eec4924a0f51db755c573",
+                "reference": "a6dfb6f87611e3a89d2eec4924a0f51db755c573",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pcre": "*",
+                "php": ">=5.6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Mso\\IdnaConvert\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1+"
+            ],
+            "authors": [
+                {
+                    "name": "Matthias Sommerfeld",
+                    "email": "mso@phlylabs.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A library for encoding and decoding internationalized domain names",
+            "homepage": "http://idnaconv.net/",
+            "keywords": [
+                "idn",
+                "idna",
+                "php"
+            ],
+            "time": "2016-06-19T18:08:43+00:00"
+        },
         {
             "name": "composer/ca-bundle",
-            "version": "1.1.3",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "8afa52cd417f4ec417b4bfe86b68106538a87660"
+                "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/8afa52cd417f4ec417b4bfe86b68106538a87660",
-                "reference": "8afa52cd417f4ec417b4bfe86b68106538a87660",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
+                "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
                 "shasum": ""
             },
             "require": {
@@ -60,7 +109,7 @@
                 "ssl",
                 "tls"
             ],
-            "time": "2018-10-18T06:09:13+00:00"
+            "time": "2019-01-28T09:30:10+00:00"
         },
         {
             "name": "defuse/php-encryption",
@@ -299,12 +348,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/application.git",
-                "reference": "6a5915c319e0b58ff644b12ba023adc676133b1d"
+                "reference": "921b4805b3cdf29d1b82eec37ccd42b25f5732a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/application/zipball/6a5915c319e0b58ff644b12ba023adc676133b1d",
-                "reference": "6a5915c319e0b58ff644b12ba023adc676133b1d",
+                "url": "https://api.github.com/repos/joomla-framework/application/zipball/921b4805b3cdf29d1b82eec37ccd42b25f5732a8",
+                "reference": "921b4805b3cdf29d1b82eec37ccd42b25f5732a8",
                 "shasum": ""
             },
             "require": {
@@ -355,20 +404,20 @@
                 "framework",
                 "joomla"
             ],
-            "time": "2018-11-25T01:55:54+00:00"
+            "time": "2019-04-10T08:57:09+00:00"
         },
         {
             "name": "joomla/archive",
-            "version": "1.1.5",
+            "version": "1.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/archive.git",
-                "reference": "2b5d645804c6af7c363716ba1956929f8b9665d3"
+                "reference": "b1d496e8c7814f1e376cb14296c38d5ef4e08c78"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/archive/zipball/2b5d645804c6af7c363716ba1956929f8b9665d3",
-                "reference": "2b5d645804c6af7c363716ba1956929f8b9665d3",
+                "url": "https://api.github.com/repos/joomla-framework/archive/zipball/b1d496e8c7814f1e376cb14296c38d5ef4e08c78",
+                "reference": "b1d496e8c7814f1e376cb14296c38d5ef4e08c78",
                 "shasum": ""
             },
             "require": {
@@ -376,9 +425,9 @@
                 "php": "^5.3.10|~7.0"
             },
             "require-dev": {
+                "joomla/coding-standards": "~2.0@alpha",
                 "joomla/test": "~1.0",
-                "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0",
-                "squizlabs/php_codesniffer": "1.*"
+                "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0"
             },
             "suggest": {
                 "ext-bz2": "To extract bzip2 compressed packages",
@@ -398,7 +447,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "GPL-2.0+"
+                "GPL-2.0-or-later"
             ],
             "description": "Joomla Archive Package",
             "homepage": "https://github.com/joomla-framework/archive",
@@ -407,7 +456,7 @@
                 "framework",
                 "joomla"
             ],
-            "time": "2017-06-12T11:32:11+00:00"
+            "time": "2019-03-10T15:17:48+00:00"
         },
         {
             "name": "joomla/authentication",
@@ -468,26 +517,28 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/console.git",
-                "reference": "0005ce3616d0a8c2aae26dfbd95f7fcb82adb7d6"
+                "reference": "b8ab98ec0fab96002b22399dea8c2ff206a87380"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/console/zipball/0005ce3616d0a8c2aae26dfbd95f7fcb82adb7d6",
-                "reference": "0005ce3616d0a8c2aae26dfbd95f7fcb82adb7d6",
+                "url": "https://api.github.com/repos/joomla-framework/console/zipball/b8ab98ec0fab96002b22399dea8c2ff206a87380",
+                "reference": "b8ab98ec0fab96002b22399dea8c2ff206a87380",
                 "shasum": ""
             },
             "require": {
                 "joomla/application": "~2.0",
+                "joomla/event": "~2.0",
+                "joomla/string": "~2.0",
                 "php": "~7.0",
                 "symfony/console": "~3.4|~4.0"
             },
             "require-dev": {
                 "joomla/coding-standards": "~2.0@alpha",
-                "joomla/symfony-event-dispatcher-bridge": "~2.0",
-                "phpunit/phpunit": "~6.3"
+                "phpunit/phpunit": "~6.3",
+                "psr/container": "~1.0"
             },
             "suggest": {
-                "joomla/symfony-event-dispatcher-bridge": "To bridge symfony/event-dispatcher with joomla/event"
+                "psr/container-implementation": "To use the ContainerLoader"
             },
             "type": "joomla-package",
             "extra": {
@@ -511,7 +562,7 @@
                 "framework",
                 "joomla"
             ],
-            "time": "2018-10-16T23:36:27+00:00"
+            "time": "2019-02-09T20:37:08+00:00"
         },
         {
             "name": "joomla/controller",
@@ -670,12 +721,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/database.git",
-                "reference": "f77c67edb891d578564f376bf272e1768c463d62"
+                "reference": "ad00fde6f124da4c60cea866c4a03bcec40f8fa0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/database/zipball/f77c67edb891d578564f376bf272e1768c463d62",
-                "reference": "f77c67edb891d578564f376bf272e1768c463d62",
+                "url": "https://api.github.com/repos/joomla-framework/database/zipball/ad00fde6f124da4c60cea866c4a03bcec40f8fa0",
+                "reference": "ad00fde6f124da4c60cea866c4a03bcec40f8fa0",
                 "shasum": ""
             },
             "require": {
@@ -721,7 +772,7 @@
                 "framework",
                 "joomla"
             ],
-            "time": "2018-12-26T21:48:54+00:00"
+            "time": "2019-04-10T09:14:37+00:00"
         },
         {
             "name": "joomla/di",
@@ -781,12 +832,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/event.git",
-                "reference": "ba75ff84a25b2bf7d3b2b1805fcbce7a8bb45b85"
+                "reference": "c87014b8a7a1638203315be6540f22d470b1d70c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/event/zipball/ba75ff84a25b2bf7d3b2b1805fcbce7a8bb45b85",
-                "reference": "ba75ff84a25b2bf7d3b2b1805fcbce7a8bb45b85",
+                "url": "https://api.github.com/repos/joomla-framework/event/zipball/c87014b8a7a1638203315be6540f22d470b1d70c",
+                "reference": "c87014b8a7a1638203315be6540f22d470b1d70c",
                 "shasum": ""
             },
             "require": {
@@ -794,8 +845,12 @@
             },
             "require-dev": {
                 "joomla/coding-standards": "~2.0@alpha",
+                "joomla/console": "~2.0",
                 "phpunit/phpunit": "~6.3"
             },
+            "suggest": {
+                "joomla/console": "If you want to use the DebugEventDispatcherCommand class, please install joomla/console:~2.0"
+            },
             "type": "joomla-package",
             "extra": {
                 "branch-alias": {
@@ -818,20 +873,20 @@
                 "framework",
                 "joomla"
             ],
-            "time": "2018-10-03T01:22:12+00:00"
+            "time": "2019-03-24T01:58:46+00:00"
         },
         {
             "name": "joomla/filesystem",
-            "version": "1.4.0",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/filesystem.git",
-                "reference": "cc0deec0232af9b723aac50dee621583e05aeb53"
+                "reference": "d8757954138b245d5a0f1f1272051eb9d954f875"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/filesystem/zipball/cc0deec0232af9b723aac50dee621583e05aeb53",
-                "reference": "cc0deec0232af9b723aac50dee621583e05aeb53",
+                "url": "https://api.github.com/repos/joomla-framework/filesystem/zipball/d8757954138b245d5a0f1f1272051eb9d954f875",
+                "reference": "d8757954138b245d5a0f1f1272051eb9d954f875",
                 "shasum": ""
             },
             "require": {
@@ -869,7 +924,7 @@
                 "framework",
                 "joomla"
             ],
-            "time": "2018-07-01T00:03:44+00:00"
+            "time": "2019-03-10T15:19:21+00:00"
         },
         {
             "name": "joomla/filter",
@@ -1225,12 +1280,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/registry.git",
-                "reference": "f7386bfd8b00eb8770ef8c5311e9d26115423626"
+                "reference": "4bed0fa87f36ba8387db06cdddd16a1d248b19fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/registry/zipball/f7386bfd8b00eb8770ef8c5311e9d26115423626",
-                "reference": "f7386bfd8b00eb8770ef8c5311e9d26115423626",
+                "url": "https://api.github.com/repos/joomla-framework/registry/zipball/4bed0fa87f36ba8387db06cdddd16a1d248b19fc",
+                "reference": "4bed0fa87f36ba8387db06cdddd16a1d248b19fc",
                 "shasum": ""
             },
             "require": {
@@ -1267,7 +1322,58 @@
                 "joomla",
                 "registry"
             ],
-            "time": "2018-10-03T02:55:25+00:00"
+            "time": "2019-03-03T17:47:11+00:00"
+        },
+        {
+            "name": "joomla/router",
+            "version": "dev-2.0-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/joomla-framework/router.git",
+                "reference": "8fe6a3263324e3d4605e8cfaf0e738df41021bba"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/joomla-framework/router/zipball/8fe6a3263324e3d4605e8cfaf0e738df41021bba",
+                "reference": "8fe6a3263324e3d4605e8cfaf0e738df41021bba",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~7.0"
+            },
+            "require-dev": {
+                "jeremeamia/superclosure": "~1.0",
+                "joomla/coding-standards": "~2.0@alpha",
+                "joomla/console": "~2.0",
+                "phpunit/phpunit": "~6.3"
+            },
+            "suggest": {
+                "jeremeamia/superclosure": "If you use Closure controllers, and want to be able to cache / serialize the router, please install jeremeamia/superclosure:~1.0",
+                "joomla/console": "If you want to use the DebugRouterCommand class, please install joomla/console:~2.0"
+            },
+            "type": "joomla-package",
+            "extra": {
+                "branch-alias": {
+                    "dev-2.0-dev": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Joomla\\Router\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "description": "Joomla Router Package",
+            "homepage": "https://github.com/joomla-framework/router",
+            "keywords": [
+                "framework",
+                "joomla",
+                "router"
+            ],
+            "time": "2019-03-24T00:20:52+00:00"
         },
         {
             "name": "joomla/session",
@@ -1275,12 +1381,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/session.git",
-                "reference": "b219e59c0e70c1fccb75aa0b378bed9855fbe751"
+                "reference": "b411e1bf8c1632cd6cc66b16c06a1e321470a7be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/session/zipball/b219e59c0e70c1fccb75aa0b378bed9855fbe751",
-                "reference": "b219e59c0e70c1fccb75aa0b378bed9855fbe751",
+                "url": "https://api.github.com/repos/joomla-framework/session/zipball/b411e1bf8c1632cd6cc66b16c06a1e321470a7be",
+                "reference": "b411e1bf8c1632cd6cc66b16c06a1e321470a7be",
                 "shasum": ""
             },
             "require": {
@@ -1326,7 +1432,7 @@
                 "joomla",
                 "session"
             ],
-            "time": "2018-10-03T01:22:22+00:00"
+            "time": "2019-04-08T10:55:30+00:00"
         },
         {
             "name": "joomla/string",
@@ -1334,12 +1440,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/string.git",
-                "reference": "d63a76e209373c9047de713c71dc549c56b17557"
+                "reference": "964e0d4f9b4253b56f21d23a5f4787a6be37c71d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/string/zipball/d63a76e209373c9047de713c71dc549c56b17557",
-                "reference": "d63a76e209373c9047de713c71dc549c56b17557",
+                "url": "https://api.github.com/repos/joomla-framework/string/zipball/964e0d4f9b4253b56f21d23a5f4787a6be37c71d",
+                "reference": "964e0d4f9b4253b56f21d23a5f4787a6be37c71d",
                 "shasum": ""
             },
             "require": {
@@ -1394,7 +1500,7 @@
                 "joomla",
                 "string"
             ],
-            "time": "2018-10-03T01:21:53+00:00"
+            "time": "2019-03-18T01:24:51+00:00"
         },
         {
             "name": "joomla/uri",
@@ -1549,55 +1655,6 @@
             ],
             "time": "2017-12-15T11:13:46+00:00"
         },
-        {
-            "name": "mso/idna-convert",
-            "version": "v1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phlylabs/idna-convert.git",
-                "reference": "a6dfb6f87611e3a89d2eec4924a0f51db755c573"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phlylabs/idna-convert/zipball/a6dfb6f87611e3a89d2eec4924a0f51db755c573",
-                "reference": "a6dfb6f87611e3a89d2eec4924a0f51db755c573",
-                "shasum": ""
-            },
-            "require": {
-                "ext-pcre": "*",
-                "php": ">=5.6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Mso\\IdnaConvert\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-2.1+"
-            ],
-            "authors": [
-                {
-                    "name": "Matthias Sommerfeld",
-                    "email": "mso@phlylabs.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A library for encoding and decoding internationalized domain names",
-            "homepage": "http://idnaconv.net/",
-            "keywords": [
-                "idn",
-                "idna",
-                "php"
-            ],
-            "time": "2016-06-19T18:08:43+00:00"
-        },
         {
             "name": "paragonie/random_compat",
             "version": "v9.99.99",
@@ -1645,21 +1702,21 @@
         },
         {
             "name": "paragonie/sodium_compat",
-            "version": "v1.8.0",
+            "version": "v1.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/sodium_compat.git",
-                "reference": "5e280b50cdaf8da4cc4810e0847a9618be29703d"
+                "reference": "87125d5b265f98c4d1b8d83a1f0726607c229421"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/5e280b50cdaf8da4cc4810e0847a9618be29703d",
-                "reference": "5e280b50cdaf8da4cc4810e0847a9618be29703d",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/87125d5b265f98c4d1b8d83a1f0726607c229421",
+                "reference": "87125d5b265f98c4d1b8d83a1f0726607c229421",
                 "shasum": ""
             },
             "require": {
                 "paragonie/random_compat": ">=1",
-                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7"
+                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
             },
             "require-dev": {
                 "phpunit/phpunit": "^3|^4|^5"
@@ -1723,20 +1780,20 @@
                 "secret-key cryptography",
                 "side-channel resistant"
             ],
-            "time": "2018-11-29T22:33:39+00:00"
+            "time": "2019-03-20T17:19:05+00:00"
         },
         {
             "name": "phpmailer/phpmailer",
-            "version": "v6.0.6",
+            "version": "v6.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "8190d73eb5def11a43cfb020b7f36db65330698c"
+                "reference": "0c41a36d4508d470e376498c1c0c527aa36a2d59"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/8190d73eb5def11a43cfb020b7f36db65330698c",
-                "reference": "8190d73eb5def11a43cfb020b7f36db65330698c",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/0c41a36d4508d470e376498c1c0c527aa36a2d59",
+                "reference": "0c41a36d4508d470e376498c1c0c527aa36a2d59",
                 "shasum": ""
             },
             "require": {
@@ -1789,7 +1846,7 @@
                 }
             ],
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
-            "time": "2018-11-16T00:41:32+00:00"
+            "time": "2019-02-01T15:04:28+00:00"
         },
         {
             "name": "psr/container",
@@ -2037,16 +2094,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v3.4.20",
+            "version": "v3.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb"
+                "reference": "98ae3cdc4bec48fe7ee24afc81dbb4a242186c9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb",
-                "reference": "8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb",
+                "url": "https://api.github.com/repos/symfony/console/zipball/98ae3cdc4bec48fe7ee24afc81dbb4a242186c9e",
+                "reference": "98ae3cdc4bec48fe7ee24afc81dbb4a242186c9e",
                 "shasum": ""
             },
             "require": {
@@ -2058,6 +2115,9 @@
                 "symfony/dependency-injection": "<3.4",
                 "symfony/process": "<3.3"
             },
+            "provide": {
+                "psr/log-implementation": "1.0"
+            },
             "require-dev": {
                 "psr/log": "~1.0",
                 "symfony/config": "~3.3|~4.0",
@@ -2067,7 +2127,7 @@
                 "symfony/process": "~3.3|~4.0"
             },
             "suggest": {
-                "psr/log-implementation": "For using the console logger",
+                "psr/log": "For using the console logger",
                 "symfony/event-dispatcher": "",
                 "symfony/lock": "",
                 "symfony/process": ""
@@ -2102,20 +2162,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-26T12:48:07+00:00"
+            "time": "2019-03-31T11:33:18+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v3.4.20",
+            "version": "v3.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "a2233f555ddf55e5600f386fba7781cea1cb82d3"
+                "reference": "adbdd5d66342fb0a0bce7422ba68181842b6610d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/a2233f555ddf55e5600f386fba7781cea1cb82d3",
-                "reference": "a2233f555ddf55e5600f386fba7781cea1cb82d3",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/adbdd5d66342fb0a0bce7422ba68181842b6610d",
+                "reference": "adbdd5d66342fb0a0bce7422ba68181842b6610d",
                 "shasum": ""
             },
             "require": {
@@ -2158,20 +2218,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-27T12:43:10+00:00"
+            "time": "2019-03-10T17:07:42+00:00"
         },
         {
             "name": "symfony/ldap",
-            "version": "v3.4.20",
+            "version": "v3.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/ldap.git",
-                "reference": "f34dd7f8d87d9eaec12663252ff95a380bf2040e"
+                "reference": "731488ee91e300a26907c820496f6ea092168ca1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/ldap/zipball/f34dd7f8d87d9eaec12663252ff95a380bf2040e",
-                "reference": "f34dd7f8d87d9eaec12663252ff95a380bf2040e",
+                "url": "https://api.github.com/repos/symfony/ldap/zipball/731488ee91e300a26907c820496f6ea092168ca1",
+                "reference": "731488ee91e300a26907c820496f6ea092168ca1",
                 "shasum": ""
             },
             "require": {
@@ -2214,20 +2274,20 @@
                 "active directory",
                 "ldap"
             ],
-            "time": "2018-11-20T16:10:26+00:00"
+            "time": "2019-01-16T09:39:14+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v3.4.20",
+            "version": "v3.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "2cf5aa084338c1f67166013aebe87e2026bbe953"
+                "reference": "926e3b797e6bb66c0e4d7da7eff3a174f7378bcf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/2cf5aa084338c1f67166013aebe87e2026bbe953",
-                "reference": "2cf5aa084338c1f67166013aebe87e2026bbe953",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/926e3b797e6bb66c0e4d7da7eff3a174f7378bcf",
+                "reference": "926e3b797e6bb66c0e4d7da7eff3a174f7378bcf",
                 "shasum": ""
             },
             "require": {
@@ -2268,20 +2328,20 @@
                 "configuration",
                 "options"
             ],
-            "time": "2018-11-11T19:48:54+00:00"
+            "time": "2019-02-23T15:06:07+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+                "reference": "82ebae02209c21113908c229e9883c419720738a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
+                "reference": "82ebae02209c21113908c229e9883c419720738a",
                 "shasum": ""
             },
             "require": {
@@ -2293,7 +2353,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
             "autoload": {
@@ -2315,7 +2375,7 @@
                 },
                 {
                     "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
+                    "email": "backendtea@gmail.com"
                 }
             ],
             "description": "Symfony polyfill for ctype functions",
@@ -2326,20 +2386,20 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
+                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
-                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
+                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
                 "shasum": ""
             },
             "require": {
@@ -2351,7 +2411,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
             "autoload": {
@@ -2385,20 +2445,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-09-21T13:07:52+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
         },
         {
             "name": "symfony/polyfill-php56",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php56.git",
-                "reference": "ff208829fe1aa48ab9af356992bb7199fed551af"
+                "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/ff208829fe1aa48ab9af356992bb7199fed551af",
-                "reference": "ff208829fe1aa48ab9af356992bb7199fed551af",
+                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/f4dddbc5c3471e1b700a147a20ae17cdb72dbe42",
+                "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42",
                 "shasum": ""
             },
             "require": {
@@ -2408,7 +2468,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
             "autoload": {
@@ -2441,20 +2501,75 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-09-21T06:26:08+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php71",
+            "version": "v1.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php71.git",
+                "reference": "8fc094a6b4f646b3ecd2400069420ef82f23a93e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php71/zipball/8fc094a6b4f646b3ecd2400069420ef82f23a93e",
+                "reference": "8fc094a6b4f646b3ecd2400069420ef82f23a93e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.11-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php71\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.1+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2019-02-06T07:57:58+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "47ad352296d61aae366f075b8609f4dcc28853ef"
+                "reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/47ad352296d61aae366f075b8609f4dcc28853ef",
-                "reference": "47ad352296d61aae366f075b8609f4dcc28853ef",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/d1fb4abcc0c47be136208ad9d68bf59f1ee17abd",
+                "reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd",
                 "shasum": ""
             },
             "require": {
@@ -2463,7 +2578,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
             "autoload": {
@@ -2472,6 +2587,9 @@
                 },
                 "files": [
                     "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2496,20 +2614,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-09-25T06:33:47+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
         },
         {
             "name": "symfony/polyfill-util",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-util.git",
-                "reference": "3b58903eae668d348a7126f999b0da0f2f93611c"
+                "reference": "b46c6cae28a3106735323f00a0c38eccf2328897"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/3b58903eae668d348a7126f999b0da0f2f93611c",
-                "reference": "3b58903eae668d348a7126f999b0da0f2f93611c",
+                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/b46c6cae28a3106735323f00a0c38eccf2328897",
+                "reference": "b46c6cae28a3106735323f00a0c38eccf2328897",
                 "shasum": ""
             },
             "require": {
@@ -2518,7 +2636,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
             "autoload": {
@@ -2548,20 +2666,20 @@
                 "polyfill",
                 "shim"
             ],
-            "time": "2018-09-30T16:36:12+00:00"
+            "time": "2019-02-08T14:16:39+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v3.4.20",
+            "version": "v3.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "6867713afe6c50ade2f34ed6435563b065a52145"
+                "reference": "d34d10236300876d14291e9df85c6ef3d3bb9066"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6867713afe6c50ade2f34ed6435563b065a52145",
-                "reference": "6867713afe6c50ade2f34ed6435563b065a52145",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d34d10236300876d14291e9df85c6ef3d3bb9066",
+                "reference": "d34d10236300876d14291e9df85c6ef3d3bb9066",
                 "shasum": ""
             },
             "require": {
@@ -2617,20 +2735,20 @@
                 "debug",
                 "dump"
             ],
-            "time": "2018-11-20T16:10:26+00:00"
+            "time": "2019-02-23T15:06:07+00:00"
         },
         {
             "name": "symfony/web-link",
-            "version": "v3.4.20",
+            "version": "v3.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/web-link.git",
-                "reference": "e8193160a9d56983871cd52a8882ace0945de328"
+                "reference": "fbe342e109c2ca60c39c6595a8e98aed1138937d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/web-link/zipball/e8193160a9d56983871cd52a8882ace0945de328",
-                "reference": "e8193160a9d56983871cd52a8882ace0945de328",
+                "url": "https://api.github.com/repos/symfony/web-link/zipball/fbe342e109c2ca60c39c6595a8e98aed1138937d",
+                "reference": "fbe342e109c2ca60c39c6595a8e98aed1138937d",
                 "shasum": ""
             },
             "require": {
@@ -2688,20 +2806,20 @@
                 "psr13",
                 "push"
             ],
-            "time": "2018-11-11T19:48:54+00:00"
+            "time": "2019-01-16T09:39:14+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.4.20",
+            "version": "v3.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "291e13d808bec481eab83f301f7bff3e699ef603"
+                "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/291e13d808bec481eab83f301f7bff3e699ef603",
-                "reference": "291e13d808bec481eab83f301f7bff3e699ef603",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/212a27b731e5bfb735679d1ffaac82bd6a1dc996",
+                "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996",
                 "shasum": ""
             },
             "require": {
@@ -2747,7 +2865,57 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-11T19:48:54+00:00"
+            "time": "2019-03-25T07:48:46+00:00"
+        },
+        {
+            "name": "tobscure/json-api",
+            "version": "v0.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tobscure/json-api.git",
+                "reference": "d4ba8437977c33a5189d95d9ffa751997f13b104"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tobscure/json-api/zipball/d4ba8437977c33a5189d95d9ffa751997f13b104",
+                "reference": "d4ba8437977c33a5189d95d9ffa751997f13b104",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8 || ^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Tobscure\\JsonApi\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Toby Zerner",
+                    "email": "toby.zerner@gmail.com"
+                }
+            ],
+            "description": "JSON-API responses in PHP",
+            "keywords": [
+                "api",
+                "json",
+                "jsonapi",
+                "standard"
+            ],
+            "time": "2017-03-05T21:16:24+00:00"
         },
         {
             "name": "wamania/php-stemmer",
@@ -2793,6 +2961,58 @@
             ],
             "time": "2017-01-27T17:16:44+00:00"
         },
+        {
+            "name": "willdurand/negotiation",
+            "version": "v2.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/willdurand/Negotiation.git",
+                "reference": "03436ededa67c6e83b9b12defac15384cb399dc9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/03436ededa67c6e83b9b12defac15384cb399dc9",
+                "reference": "03436ededa67c6e83b9b12defac15384cb399dc9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Negotiation\\": "src/Negotiation"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "William Durand",
+                    "email": "will+git@drnd.me"
+                }
+            ],
+            "description": "Content Negotiation tools for PHP provided as a standalone library.",
+            "homepage": "http://williamdurand.fr/Negotiation/",
+            "keywords": [
+                "accept",
+                "content",
+                "format",
+                "header",
+                "negotiation"
+            ],
+            "time": "2017-05-14T17:21:12+00:00"
+        },
         {
             "name": "zendframework/zend-diactoros",
             "version": "1.8.6",
@@ -2861,16 +3081,16 @@
     "packages-dev": [
         {
             "name": "behat/gherkin",
-            "version": "v4.5.1",
+            "version": "v4.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Behat/Gherkin.git",
-                "reference": "74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a"
+                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a",
-                "reference": "74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a",
+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/ab0a02ea14893860bca00f225f5621d351a3ad07",
+                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07",
                 "shasum": ""
             },
             "require": {
@@ -2878,8 +3098,8 @@
             },
             "require-dev": {
                 "phpunit/phpunit": "~4.5|~5",
-                "symfony/phpunit-bridge": "~2.7|~3",
-                "symfony/yaml": "~2.3|~3"
+                "symfony/phpunit-bridge": "~2.7|~3|~4",
+                "symfony/yaml": "~2.3|~3|~4"
             },
             "suggest": {
                 "symfony/yaml": "If you want to parse features, represented in YAML files"
@@ -2916,20 +3136,20 @@
                 "gherkin",
                 "parser"
             ],
-            "time": "2017-08-30T11:04:43+00:00"
+            "time": "2019-01-16T14:22:17+00:00"
         },
         {
             "name": "codeception/codeception",
-            "version": "2.5.1",
+            "version": "2.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "e0a658c64e98811a6fd4f6aa7c3222e0609066a9"
+                "reference": "547a64cb31edcf1902b296c511f5ca74101bcb4c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/e0a658c64e98811a6fd4f6aa7c3222e0609066a9",
-                "reference": "e0a658c64e98811a6fd4f6aa7c3222e0609066a9",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/547a64cb31edcf1902b296c511f5ca74101bcb4c",
+                "reference": "547a64cb31edcf1902b296c511f5ca74101bcb4c",
                 "shasum": ""
             },
             "require": {
@@ -2961,7 +3181,7 @@
                 "predis/predis": "^1.0",
                 "squizlabs/php_codesniffer": "~2.0",
                 "symfony/process": ">=2.7 <5.0",
-                "vlucas/phpdotenv": "^2.4.0"
+                "vlucas/phpdotenv": "^3.0"
             },
             "suggest": {
                 "aws/aws-sdk-php": "For using AWS Auth in REST module and Queue module",
@@ -3008,20 +3228,20 @@
                 "functional testing",
                 "unit testing"
             ],
-            "time": "2018-10-29T21:23:19+00:00"
+            "time": "2019-03-23T17:57:45+00:00"
         },
         {
             "name": "codeception/phpunit-wrapper",
-            "version": "6.1.1",
+            "version": "6.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/phpunit-wrapper.git",
-                "reference": "a0db6773ae02daf0357ecc17218a8448e7629a53"
+                "reference": "d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/a0db6773ae02daf0357ecc17218a8448e7629a53",
-                "reference": "a0db6773ae02daf0357ecc17218a8448e7629a53",
+                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c",
+                "reference": "d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c",
                 "shasum": ""
             },
             "require": {
@@ -3035,7 +3255,7 @@
             },
             "require-dev": {
                 "codeception/specify": "*",
-                "vlucas/phpdotenv": "^2.4"
+                "vlucas/phpdotenv": "^3.0"
             },
             "type": "library",
             "autoload": {
@@ -3054,24 +3274,24 @@
                 }
             ],
             "description": "PHPUnit classes used by Codeception",
-            "time": "2018-12-07T10:40:20+00:00"
+            "time": "2019-02-26T20:47:39+00:00"
         },
         {
             "name": "codeception/stub",
-            "version": "2.0.4",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Stub.git",
-                "reference": "f50bc271f392a2836ff80690ce0c058efe1ae03e"
+                "reference": "853657f988942f7afb69becf3fd0059f192c705a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Stub/zipball/f50bc271f392a2836ff80690ce0c058efe1ae03e",
-                "reference": "f50bc271f392a2836ff80690ce0c058efe1ae03e",
+                "url": "https://api.github.com/repos/Codeception/Stub/zipball/853657f988942f7afb69becf3fd0059f192c705a",
+                "reference": "853657f988942f7afb69becf3fd0059f192c705a",
                 "shasum": ""
             },
             "require": {
-                "phpunit/phpunit": ">=4.8 <8.0"
+                "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3"
             },
             "type": "library",
             "autoload": {
@@ -3084,20 +3304,20 @@
                 "MIT"
             ],
             "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
-            "time": "2018-07-26T11:55:37+00:00"
+            "time": "2019-03-02T15:35:10+00:00"
         },
         {
             "name": "composer/semver",
-            "version": "1.4.2",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573"
+                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573",
-                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573",
+                "url": "https://api.github.com/repos/composer/semver/zipball/46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
+                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
                 "shasum": ""
             },
             "require": {
@@ -3146,20 +3366,20 @@
                 "validation",
                 "versioning"
             ],
-            "time": "2016-08-30T16:08:34+00:00"
+            "time": "2019-03-19T17:25:45+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "1.3.1",
+            "version": "1.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "dc523135366eb68f22268d069ea7749486458562"
+                "reference": "d17708133b6c276d6e42ef887a877866b909d892"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/dc523135366eb68f22268d069ea7749486458562",
-                "reference": "dc523135366eb68f22268d069ea7749486458562",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/d17708133b6c276d6e42ef887a877866b909d892",
+                "reference": "d17708133b6c276d6e42ef887a877866b909d892",
                 "shasum": ""
             },
             "require": {
@@ -3190,25 +3410,25 @@
                 "Xdebug",
                 "performance"
             ],
-            "time": "2018-11-29T10:59:02+00:00"
+            "time": "2019-01-28T20:25:53+00:00"
         },
         {
             "name": "consolidation/annotated-command",
-            "version": "2.10.2",
+            "version": "2.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/annotated-command.git",
-                "reference": "5cbb8c320e0d3d2e6905374d56dc3610b7443f7b"
+                "reference": "512a2e54c98f3af377589de76c43b24652bcb789"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/5cbb8c320e0d3d2e6905374d56dc3610b7443f7b",
-                "reference": "5cbb8c320e0d3d2e6905374d56dc3610b7443f7b",
+                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/512a2e54c98f3af377589de76c43b24652bcb789",
+                "reference": "512a2e54c98f3af377589de76c43b24652bcb789",
                 "shasum": ""
             },
             "require": {
                 "consolidation/output-formatters": "^3.4",
-                "php": ">=5.4.0",
+                "php": ">=5.4.5",
                 "psr/log": "^1",
                 "symfony/console": "^2.8|^3|^4",
                 "symfony/event-dispatcher": "^2.5|^3|^4",
@@ -3286,20 +3506,20 @@
                 }
             ],
             "description": "Initialize Symfony Console commands from annotated command class methods.",
-            "time": "2018-12-21T03:50:15+00:00"
+            "time": "2019-03-08T16:55:03+00:00"
         },
         {
             "name": "consolidation/config",
-            "version": "1.1.1",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/config.git",
-                "reference": "925231dfff32f05b787e1fddb265e789b939cf4c"
+                "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/config/zipball/925231dfff32f05b787e1fddb265e789b939cf4c",
-                "reference": "925231dfff32f05b787e1fddb265e789b939cf4c",
+                "url": "https://api.github.com/repos/consolidation/config/zipball/cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
+                "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
                 "shasum": ""
             },
             "require": {
@@ -3308,9 +3528,9 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "g1a/composer-test-scenarios": "^1",
+                "g1a/composer-test-scenarios": "^3",
+                "php-coveralls/php-coveralls": "^1",
                 "phpunit/phpunit": "^5",
-                "satooshi/php-coveralls": "^1.0",
                 "squizlabs/php_codesniffer": "2.*",
                 "symfony/console": "^2.5|^3|^4",
                 "symfony/yaml": "^2.8.11|^3|^4"
@@ -3320,6 +3540,33 @@
             },
             "type": "library",
             "extra": {
+                "scenarios": {
+                    "symfony4": {
+                        "require-dev": {
+                            "symfony/console": "^4.0"
+                        },
+                        "config": {
+                            "platform": {
+                                "php": "7.1.3"
+                            }
+                        }
+                    },
+                    "symfony2": {
+                        "require-dev": {
+                            "symfony/console": "^2.8",
+                            "symfony/event-dispatcher": "^2.8",
+                            "phpunit/phpunit": "^4.8.36"
+                        },
+                        "remove": [
+                            "php-coveralls/php-coveralls"
+                        ],
+                        "config": {
+                            "platform": {
+                                "php": "5.4.8"
+                            }
+                        }
+                    }
+                },
                 "branch-alias": {
                     "dev-master": "1.x-dev"
                 }
@@ -3340,35 +3587,76 @@
                 }
             ],
             "description": "Provide configuration services for a commandline tool.",
-            "time": "2018-10-24T17:55:35+00:00"
+            "time": "2019-03-03T19:37:04+00:00"
         },
         {
             "name": "consolidation/log",
-            "version": "1.0.6",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/log.git",
-                "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395"
+                "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/log/zipball/dfd8189a771fe047bf3cd669111b2de5f1c79395",
-                "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395",
+                "url": "https://api.github.com/repos/consolidation/log/zipball/b2e887325ee90abc96b0a8b7b474cd9e7c896e3a",
+                "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.0",
-                "psr/log": "~1.0",
+                "php": ">=5.4.5",
+                "psr/log": "^1.0",
                 "symfony/console": "^2.8|^3|^4"
             },
             "require-dev": {
-                "g1a/composer-test-scenarios": "^1",
-                "phpunit/phpunit": "4.*",
-                "satooshi/php-coveralls": "^2",
-                "squizlabs/php_codesniffer": "2.*"
+                "g1a/composer-test-scenarios": "^3",
+                "php-coveralls/php-coveralls": "^1",
+                "phpunit/phpunit": "^6",
+                "squizlabs/php_codesniffer": "^2"
             },
             "type": "library",
             "extra": {
+                "scenarios": {
+                    "symfony4": {
+                        "require": {
+                            "symfony/console": "^4.0"
+                        },
+                        "config": {
+                            "platform": {
+                                "php": "7.1.3"
+                            }
+                        }
+                    },
+                    "symfony2": {
+                        "require": {
+                            "symfony/console": "^2.8"
+                        },
+                        "require-dev": {
+                            "phpunit/phpunit": "^4.8.36"
+                        },
+                        "remove": [
+                            "php-coveralls/php-coveralls"
+                        ],
+                        "config": {
+                            "platform": {
+                                "php": "5.4.8"
+                            }
+                        }
+                    },
+                    "phpunit4": {
+                        "require-dev": {
+                            "phpunit/phpunit": "^4.8.36"
+                        },
+                        "remove": [
+                            "php-coveralls/php-coveralls"
+                        ],
+                        "config": {
+                            "platform": {
+                                "php": "5.4.8"
+                            }
+                        }
+                    }
+                },
                 "branch-alias": {
                     "dev-master": "1.x-dev"
                 }
@@ -3389,20 +3677,20 @@
                 }
             ],
             "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.",
-            "time": "2018-05-25T18:14:39+00:00"
+            "time": "2019-01-01T17:30:51+00:00"
         },
         {
             "name": "consolidation/output-formatters",
-            "version": "3.4.0",
+            "version": "3.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/output-formatters.git",
-                "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19"
+                "reference": "0881112642ad9059071f13f397f571035b527cb9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/a942680232094c4a5b21c0b7e54c20cce623ae19",
-                "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19",
+                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/0881112642ad9059071f13f397f571035b527cb9",
+                "reference": "0881112642ad9059071f13f397f571035b527cb9",
                 "shasum": ""
             },
             "require": {
@@ -3412,11 +3700,10 @@
                 "symfony/finder": "^2.5|^3|^4"
             },
             "require-dev": {
-                "g1a/composer-test-scenarios": "^2",
+                "g1a/composer-test-scenarios": "^3",
+                "php-coveralls/php-coveralls": "^1",
                 "phpunit/phpunit": "^5.7.27",
-                "satooshi/php-coveralls": "^2",
                 "squizlabs/php_codesniffer": "^2.7",
-                "symfony/console": "3.2.3",
                 "symfony/var-dumper": "^2.8|^3|^4",
                 "victorjonsson/markdowndocs": "^1.3"
             },
@@ -3425,6 +3712,52 @@
             },
             "type": "library",
             "extra": {
+                "scenarios": {
+                    "symfony4": {
+                        "require": {
+                            "symfony/console": "^4.0"
+                        },
+                        "require-dev": {
+                            "phpunit/phpunit": "^6"
+                        },
+                        "config": {
+                            "platform": {
+                                "php": "7.1.3"
+                            }
+                        }
+                    },
+                    "symfony3": {
+                        "require": {
+                            "symfony/console": "^3.4",
+                            "symfony/finder": "^3.4",
+                            "symfony/var-dumper": "^3.4"
+                        },
+                        "config": {
+                            "platform": {
+                                "php": "5.6.32"
+                            }
+                        }
+                    },
+                    "symfony2": {
+                        "require": {
+                            "symfony/console": "^2.8"
+                        },
+                        "require-dev": {
+                            "phpunit/phpunit": "^4.8.36"
+                        },
+                        "remove": [
+                            "php-coveralls/php-coveralls"
+                        ],
+                        "config": {
+                            "platform": {
+                                "php": "5.4.8"
+                            }
+                        },
+                        "scenario-options": {
+                            "create-lockfile": "false"
+                        }
+                    }
+                },
                 "branch-alias": {
                     "dev-master": "3.x-dev"
                 }
@@ -3445,25 +3778,25 @@
                 }
             ],
             "description": "Format text by applying transformations provided by plug-in formatters.",
-            "time": "2018-10-19T22:35:38+00:00"
+            "time": "2019-03-14T03:45:44+00:00"
         },
         {
             "name": "consolidation/robo",
-            "version": "1.3.4",
+            "version": "1.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/Robo.git",
-                "reference": "8cdaf834d378d7700cf0c7e8b2b57a00025d8dd3"
+                "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/Robo/zipball/8cdaf834d378d7700cf0c7e8b2b57a00025d8dd3",
-                "reference": "8cdaf834d378d7700cf0c7e8b2b57a00025d8dd3",
+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345",
+                "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345",
                 "shasum": ""
             },
             "require": {
                 "consolidation/annotated-command": "^2.10.2",
-                "consolidation/config": "^1.0.10",
+                "consolidation/config": "^1.2",
                 "consolidation/log": "~1",
                 "consolidation/output-formatters": "^3.1.13",
                 "consolidation/self-update": "^1",
@@ -3489,7 +3822,7 @@
                 "natxet/cssmin": "3.0.4",
                 "nikic/php-parser": "^3.1.5",
                 "patchwork/jsqueeze": "~2",
-                "pear/archive_tar": "^1.4.2",
+                "pear/archive_tar": "^1.4.4",
                 "php-coveralls/php-coveralls": "^1",
                 "phpunit/php-code-coverage": "~2|~4",
                 "squizlabs/php_codesniffer": "^2.8"
@@ -3534,7 +3867,7 @@
                     }
                 },
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
@@ -3553,7 +3886,7 @@
                 }
             ],
             "description": "Modern task runner",
-            "time": "2018-12-21T04:14:26+00:00"
+            "time": "2019-03-19T18:07:19+00:00"
         },
         {
             "name": "consolidation/self-update",
@@ -3933,16 +4266,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.13.1",
+            "version": "v2.14.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "54814c62d5beef3ba55297b9b3186ed8b8a1b161"
+                "reference": "ff401e58261ffc5934a58f795b3f95b355e276cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/54814c62d5beef3ba55297b9b3186ed8b8a1b161",
-                "reference": "54814c62d5beef3ba55297b9b3186ed8b8a1b161",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ff401e58261ffc5934a58f795b3f95b355e276cb",
+                "reference": "ff401e58261ffc5934a58f795b3f95b355e276cb",
                 "shasum": ""
             },
             "require": {
@@ -3951,7 +4284,7 @@
                 "doctrine/annotations": "^1.2",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": "^5.6 || >=7.0 <7.3",
+                "php": "^5.6 || ^7.0",
                 "php-cs-fixer/diff": "^1.3",
                 "symfony/console": "^3.4.17 || ^4.1.6",
                 "symfony/event-dispatcher": "^3.0 || ^4.0",
@@ -3963,13 +4296,10 @@
                 "symfony/process": "^3.0 || ^4.0",
                 "symfony/stopwatch": "^3.0 || ^4.0"
             },
-            "conflict": {
-                "hhvm": "*"
-            },
             "require-dev": {
                 "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
                 "justinrainbow/json-schema": "^5.0",
-                "keradus/cli-executor": "^1.1",
+                "keradus/cli-executor": "^1.2",
                 "mikey179/vfsstream": "^1.6",
                 "php-coveralls/php-coveralls": "^2.1",
                 "php-cs-fixer/accessible-object": "^1.0",
@@ -4020,7 +4350,7 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "time": "2018-10-21T00:32:10+00:00"
+            "time": "2019-02-17T17:44:13+00:00"
         },
         {
             "name": "grasmash/expander",
@@ -4306,12 +4636,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-projects/joomla-browser.git",
-                "reference": "e7c6c924c2e7cea8a09ff15558bbc606b0d90fbc"
+                "reference": "535968155369a61e995ec56808931e74594b049b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-projects/joomla-browser/zipball/e7c6c924c2e7cea8a09ff15558bbc606b0d90fbc",
-                "reference": "e7c6c924c2e7cea8a09ff15558bbc606b0d90fbc",
+                "url": "https://api.github.com/repos/joomla-projects/joomla-browser/zipball/535968155369a61e995ec56808931e74594b049b",
+                "reference": "535968155369a61e995ec56808931e74594b049b",
                 "shasum": ""
             },
             "require": {
@@ -4337,7 +4667,7 @@
                     "email": "puneet.kala@community.joomla.org"
                 },
                 {
-                    "name": "Javier Gómez",
+                    "name": "Javier Gomez",
                     "email": "javier.gomez@community.joomla.org"
                 }
             ],
@@ -4349,7 +4679,7 @@
                 "acceptance testing",
                 "joomla"
             ],
-            "time": "2018-11-16T10:47:43+00:00"
+            "time": "2019-02-19T17:21:09+00:00"
         },
         {
             "name": "joomla-projects/robo-joomla",
@@ -4425,7 +4755,7 @@
                     "email": "puneet.kala@community.joomla.org"
                 },
                 {
-                    "name": "Javier Gómez",
+                    "name": "Javier Gomez",
                     "email": "javier.gomez@community.joomla.org"
                 }
             ],
@@ -4487,24 +4817,21 @@
             "time": "2018-10-16T23:34:41+00:00"
         },
         {
-            "name": "joomla/test-system",
+            "name": "joomla/test-api",
             "version": "dev-4.0-dev",
             "source": {
                 "type": "git",
-                "url": "https://github.com/joomla/test-system.git",
-                "reference": "a91be5b96b460c5812298f82547e635f4d9a26fb"
+                "url": "https://github.com/joomla/test-api.git",
+                "reference": "a14f21d7643ff592d9c5115ace518a84797c46c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla/test-system/zipball/a91be5b96b460c5812298f82547e635f4d9a26fb",
-                "reference": "a91be5b96b460c5812298f82547e635f4d9a26fb",
+                "url": "https://api.github.com/repos/joomla/test-api/zipball/a14f21d7643ff592d9c5115ace518a84797c46c4",
+                "reference": "a14f21d7643ff592d9c5115ace518a84797c46c4",
                 "shasum": ""
             },
             "require": {
                 "codeception/codeception": "~2.3",
-                "consolidation/robo": "^1.0.0",
-                "joomla-projects/joomla-browser": "v4.0.0.x-dev",
-                "joomla-projects/selenium-server-standalone": "~v3",
                 "php": ">=7.0.0"
             },
             "type": "project",
@@ -4512,45 +4839,47 @@
             "license": [
                 "GPL-2.0+"
             ],
-            "description": "Joomla CMS system tests using Codeception",
+            "description": "Joomla CMS API tests",
             "homepage": "https://github.com/joomla/joomla-cms",
             "keywords": [
                 "cms",
                 "joomla"
             ],
-            "time": "2018-11-16T11:13:39+00:00"
+            "time": "2019-03-05T12:15:00+00:00"
         },
         {
-            "name": "joomla/test-unit",
+            "name": "joomla/test-system",
             "version": "dev-4.0-dev",
             "source": {
                 "type": "git",
-                "url": "https://github.com/joomla/test-unit.git",
-                "reference": "08a1c3668e1f45d90ab801925f43745a7746bb15"
+                "url": "https://github.com/joomla/test-system.git",
+                "reference": "64eb122aa29c3abb7d7c79932cd783fa6c354dd6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla/test-unit/zipball/08a1c3668e1f45d90ab801925f43745a7746bb15",
-                "reference": "08a1c3668e1f45d90ab801925f43745a7746bb15",
+                "url": "https://api.github.com/repos/joomla/test-system/zipball/64eb122aa29c3abb7d7c79932cd783fa6c354dd6",
+                "reference": "64eb122aa29c3abb7d7c79932cd783fa6c354dd6",
                 "shasum": ""
             },
             "require": {
-                "phpunit/phpunit": "^6"
+                "codeception/codeception": "~2.3",
+                "consolidation/robo": "^1.0.0",
+                "joomla-projects/joomla-browser": "v4.0.0.x-dev",
+                "joomla-projects/selenium-server-standalone": "~v3",
+                "php": ">=7.0.0"
             },
             "type": "project",
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "GPL-2.0+"
             ],
-            "description": "Joomla CMS Unit Tests",
-            "homepage": "https://github.com/joomla/test-unit",
+            "description": "Joomla CMS system tests using Codeception",
+            "homepage": "https://github.com/joomla/joomla-cms",
             "keywords": [
                 "cms",
-                "joomla",
-                "tests",
-                "unit-tests"
+                "joomla"
             ],
-            "time": "2018-06-20T10:55:00+00:00"
+            "time": "2019-02-27T10:38:03+00:00"
         },
         {
             "name": "league/container",
@@ -5334,16 +5663,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "6.5.13",
+            "version": "6.5.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "0973426fb012359b2f18d3bd1e90ef1172839693"
+                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0973426fb012359b2f18d3bd1e90ef1172839693",
-                "reference": "0973426fb012359b2f18d3bd1e90ef1172839693",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bac23fe7ff13dbdb461481f706f0e9fe746334b7",
+                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7",
                 "shasum": ""
             },
             "require": {
@@ -5414,7 +5743,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2018-09-08T15:10:43+00:00"
+            "time": "2019-02-01T05:22:47+00:00"
         },
         {
             "name": "phpunit/phpunit-dom-assertions",
@@ -5534,6 +5863,7 @@
                 "mock",
                 "xunit"
             ],
+            "abandoned": true,
             "time": "2018-08-09T05:50:03+00:00"
         },
         {
@@ -6212,16 +6542,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v3.4.20",
+            "version": "v3.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "49465af22d94c8d427c51facbf8137eb285b9726"
+                "reference": "c0fadd368c1031109e996316e53ffeb886d37ea1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/49465af22d94c8d427c51facbf8137eb285b9726",
-                "reference": "49465af22d94c8d427c51facbf8137eb285b9726",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/c0fadd368c1031109e996316e53ffeb886d37ea1",
+                "reference": "c0fadd368c1031109e996316e53ffeb886d37ea1",
                 "shasum": ""
             },
             "require": {
@@ -6265,20 +6595,20 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-26T10:17:44+00:00"
+            "time": "2019-02-23T15:06:07+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v3.4.20",
+            "version": "v3.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "345b9a48595d1ab9630db791dbc3e721bf0233e8"
+                "reference": "8ca29297c29b64fb3a1a135e71cb25f67f9fdccf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/345b9a48595d1ab9630db791dbc3e721bf0233e8",
-                "reference": "345b9a48595d1ab9630db791dbc3e721bf0233e8",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/8ca29297c29b64fb3a1a135e71cb25f67f9fdccf",
+                "reference": "8ca29297c29b64fb3a1a135e71cb25f67f9fdccf",
                 "shasum": ""
             },
             "require": {
@@ -6318,20 +6648,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-11T19:48:54+00:00"
+            "time": "2019-01-16T09:39:14+00:00"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v3.4.20",
+            "version": "v3.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "b6e94248eb4f8602a5825301b0bea1eb8cc82cfa"
+                "reference": "d40023c057393fb25f7ca80af2a56ed948c45a09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b6e94248eb4f8602a5825301b0bea1eb8cc82cfa",
-                "reference": "b6e94248eb4f8602a5825301b0bea1eb8cc82cfa",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/d40023c057393fb25f7ca80af2a56ed948c45a09",
+                "reference": "d40023c057393fb25f7ca80af2a56ed948c45a09",
                 "shasum": ""
             },
             "require": {
@@ -6375,20 +6705,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-26T10:17:44+00:00"
+            "time": "2019-02-23T15:06:07+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.4.20",
+            "version": "v3.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "cc35e84adbb15c26ae6868e1efbf705a917be6b5"
+                "reference": "a088aafcefb4eef2520a290ed82e4374092a6dff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/cc35e84adbb15c26ae6868e1efbf705a917be6b5",
-                "reference": "cc35e84adbb15c26ae6868e1efbf705a917be6b5",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a088aafcefb4eef2520a290ed82e4374092a6dff",
+                "reference": "a088aafcefb4eef2520a290ed82e4374092a6dff",
                 "shasum": ""
             },
             "require": {
@@ -6438,20 +6768,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-30T18:07:24+00:00"
+            "time": "2019-04-02T08:51:52+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v3.4.20",
+            "version": "v3.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "b49b1ca166bd109900e6a1683d9bb1115727ef2d"
+                "reference": "acf99758b1df8e9295e6b85aa69f294565c9fedb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/b49b1ca166bd109900e6a1683d9bb1115727ef2d",
-                "reference": "b49b1ca166bd109900e6a1683d9bb1115727ef2d",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/acf99758b1df8e9295e6b85aa69f294565c9fedb",
+                "reference": "acf99758b1df8e9295e6b85aa69f294565c9fedb",
                 "shasum": ""
             },
             "require": {
@@ -6488,20 +6818,20 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-11T19:48:54+00:00"
+            "time": "2019-02-04T21:34:32+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.4.20",
+            "version": "v3.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "6cf2be5cbd0e87aa35c01f80ae0bf40b6798e442"
+                "reference": "fcdde4aa38f48190ce70d782c166f23930084f9b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/6cf2be5cbd0e87aa35c01f80ae0bf40b6798e442",
-                "reference": "6cf2be5cbd0e87aa35c01f80ae0bf40b6798e442",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/fcdde4aa38f48190ce70d782c166f23930084f9b",
+                "reference": "fcdde4aa38f48190ce70d782c166f23930084f9b",
                 "shasum": ""
             },
             "require": {
@@ -6537,20 +6867,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-11T19:48:54+00:00"
+            "time": "2019-02-22T14:44:53+00:00"
         },
         {
             "name": "symfony/polyfill-php70",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224"
+                "reference": "bc4858fb611bda58719124ca079baff854149c89"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/6b88000cdd431cd2e940caa2cb569201f3f84224",
-                "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/bc4858fb611bda58719124ca079baff854149c89",
+                "reference": "bc4858fb611bda58719124ca079baff854149c89",
                 "shasum": ""
             },
             "require": {
@@ -6560,7 +6890,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
             "autoload": {
@@ -6596,20 +6926,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-09-21T06:26:08+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631"
+                "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
-                "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/ab50dcf166d5f577978419edd37aa2bb8eabce0c",
+                "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c",
                 "shasum": ""
             },
             "require": {
@@ -6618,7 +6948,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
             "autoload": {
@@ -6651,20 +6981,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-09-21T13:07:52+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v3.4.20",
+            "version": "v3.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "abb46b909dd6ba0b50e10d4c10ffe6ee96dd70f2"
+                "reference": "009f8dda80930e89e8344a4e310b08f9ff07dd2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/abb46b909dd6ba0b50e10d4c10ffe6ee96dd70f2",
-                "reference": "abb46b909dd6ba0b50e10d4c10ffe6ee96dd70f2",
+                "url": "https://api.github.com/repos/symfony/process/zipball/009f8dda80930e89e8344a4e310b08f9ff07dd2e",
+                "reference": "009f8dda80930e89e8344a4e310b08f9ff07dd2e",
                 "shasum": ""
             },
             "require": {
@@ -6700,20 +7030,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-20T16:10:26+00:00"
+            "time": "2019-01-16T13:27:11+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v3.4.20",
+            "version": "v3.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "0f43969ab2718de55c1c1158dce046668079788d"
+                "reference": "2a651c2645c10bbedd21170771f122d935e0dd58"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/0f43969ab2718de55c1c1158dce046668079788d",
-                "reference": "0f43969ab2718de55c1c1158dce046668079788d",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/2a651c2645c10bbedd21170771f122d935e0dd58",
+                "reference": "2a651c2645c10bbedd21170771f122d935e0dd58",
                 "shasum": ""
             },
             "require": {
@@ -6749,20 +7079,20 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-11T19:48:54+00:00"
+            "time": "2019-01-16T09:39:14+00:00"
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.1.0",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
+                "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
-                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/1c42705be2b6c1de5904f8afacef5895cab44bf8",
+                "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8",
                 "shasum": ""
             },
             "require": {
@@ -6789,7 +7119,7 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2017-04-07T12:08:54+00:00"
+            "time": "2019-04-04T09:56:43+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -6861,6 +7191,7 @@
         "joomla/oauth1": 20,
         "joomla/oauth2": 20,
         "joomla/registry": 20,
+        "joomla/router": 20,
         "joomla/session": 20,
         "joomla/string": 20,
         "joomla/uri": 20,
@@ -6869,7 +7200,7 @@
         "joomla-projects/joomla-browser": 20,
         "joomla-projects/robo-joomla": 20,
         "joomla/test-system": 20,
-        "joomla/test-unit": 20
+        "joomla/test-api": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
diff --git a/crowdin.yml b/crowdin.yml
index 5152a03af5b15..6c25d965e30ee 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -43,8 +43,8 @@ files:
     translation: /installation/language/%locale%/%locale%.xml
     update_option: update_as_unapproved
     content_segmentation: 0
-  - source: /build/media/system/js/fields/calendar-locales/en.js
-    translation: /build/media/system/js/fields/calendar-locales/%locale%.js
+  - source: /build/media_source/system/js/fields/calendar-locales/en.js
+    translation: /build/media_source/system/js/fields/calendar-locales/%locale%.js
     update_option: update_as_unapproved
   - source: /administrator/manifests/packages/pkg_en-GB.xml
     dest: /pkg_en-GB.xml
diff --git a/htaccess.txt b/htaccess.txt
index 3c1fd8cd4630c..4f0f0e9b83a92 100644
--- a/htaccess.txt
+++ b/htaccess.txt
@@ -1,6 +1,6 @@
 ##
 # @package    Joomla
-# @copyright  Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+# @copyright  Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 # @license    GNU General Public License version 2 or later; see LICENSE.txt
 ##
 
@@ -90,3 +90,35 @@ Options -Indexes
         # RedirectTemp cannot be used instead
     </IfModule>
 </IfModule>
+
+## These directives are only enabled if the mod_headers module is enabled
+## This section will check if a .gz file exists and if so will stream it
+##     directly or fallback to gzip any asset on the fly
+<IfModule mod_headers.c>
+    # Serve gzip compressed CSS files if they exist
+    # and the client accepts gzip.
+    RewriteCond "%{HTTP:Accept-encoding}" "gzip"
+    RewriteCond "%{REQUEST_FILENAME}\.gz" -s
+    RewriteRule "^(.*)\.css" "$1\.css\.gz" [QSA]
+
+    # Serve gzip compressed JS files if they exist
+    # and the client accepts gzip.
+    RewriteCond "%{HTTP:Accept-encoding}" "gzip"
+    RewriteCond "%{REQUEST_FILENAME}\.gz" -s
+    RewriteRule "^(.*)\.js" "$1\.js\.gz" [QSA]
+
+
+    # Serve correct content types, and prevent mod_deflate double gzip.
+    RewriteRule "\.css\.gz$" "-" [T=text/css,E=no-gzip:1]
+    RewriteRule "\.js\.gz$" "-" [T=text/javascript,E=no-gzip:1]
+
+
+    <FilesMatch "(\.js\.gz|\.css\.gz)$">
+      # Serve correct encoding type.
+      Header append Content-Encoding gzip
+
+      # Force proxies to cache gzipped &
+      # non-gzipped css/js files separately.
+      Header append Vary Accept-Encoding
+    </FilesMatch>
+</IfModule>
diff --git a/includes/app.php b/includes/app.php
index d6933a504ec49..d6e8d28fbc957 100644
--- a/includes/app.php
+++ b/includes/app.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Site
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/includes/defines.php b/includes/defines.php
index f6a059f059dec..be6d30504c643 100644
--- a/includes/defines.php
+++ b/includes/defines.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Site
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -22,3 +22,4 @@
 define('JPATH_THEMES',        JPATH_BASE . DIRECTORY_SEPARATOR . 'templates');
 define('JPATH_CACHE',         JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'cache');
 define('JPATH_MANIFESTS',     JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'manifests');
+define('JPATH_API',           JPATH_ROOT . DIRECTORY_SEPARATOR . 'api');
diff --git a/includes/framework.php b/includes/framework.php
index 1df743e2a7bfc..8d74bca9bcfa7 100644
--- a/includes/framework.php
+++ b/includes/framework.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Site
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/index.php b/index.php
index 4ead123d9e6e0..bc74cec53696a 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Site
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/INSTALL b/installation/INSTALL
index 864f19f4899bb..5af78d1d2e097 100644
--- a/installation/INSTALL
+++ b/installation/INSTALL
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/configuration.php-dist b/installation/configuration.php-dist
index 11eabaa8d09c1..f9f2a57483503 100644
--- a/installation/configuration.php-dist
+++ b/installation/configuration.php-dist
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  *
  * -------------------------------------------------------------------------
@@ -116,6 +116,7 @@ class JConfig
 	/* Debug Settings */
 	public $debug = '0';
 	public $debug_lang = '0';
+	public $debug_lang_const = '1';
 
 	/* Meta Settings */
 	public $MetaDesc = 'Joomla! - the dynamic portal engine and content management system';
diff --git a/installation/includes/app.php b/installation/includes/app.php
index 9f6846c7ea644..1fafefea83120 100644
--- a/installation/includes/app.php
+++ b/installation/includes/app.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/includes/defines.php b/installation/includes/defines.php
index 27f5f60cd542f..7d5f6caa33e6b 100644
--- a/installation/includes/defines.php
+++ b/installation/includes/defines.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -24,3 +24,5 @@
 define('JPATH_THEMES',        JPATH_BASE);
 define('JPATH_CACHE',         JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'cache');
 define('JPATH_MANIFESTS',     JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'manifests');
+define('JPATH_API',           JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'api');
+
diff --git a/installation/includes/framework.php b/installation/includes/framework.php
index 35e6d31b781f3..cec560d586465 100644
--- a/installation/includes/framework.php
+++ b/installation/includes/framework.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/index.php b/installation/index.php
index 0991b469fab97..5bc9ea9275cd1 100644
--- a/installation/index.php
+++ b/installation/index.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/language/en-GB/en-GB.ini b/installation/language/en-GB/en-GB.ini
index 81440c51e97d0..7e24992cdb66f 100644
--- a/installation/language/en-GB/en-GB.ini
+++ b/installation/language/en-GB/en-GB.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -168,10 +168,9 @@ INSTL_DEFAULTLANGUAGE_TRY_LATER="You will be able to install it later using the
 INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="English (UK)"
 
 ;Database Model
-INSTL_DATABASE_COULD_NOT_CONNECT="Could not connect to the database. Connector returned number: %s"
+INSTL_DATABASE_COULD_NOT_CONNECT="Could not connect to the database. Connector returned error message: %s"
 INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="The installer could not connect to the specified database and was unable to create the database. Please verify your settings and if necessary manually create your database."
 INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Could not refresh manifest cache for extension: %s"
-INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Some errors occurred in backing up the database."
 INSTL_DATABASE_ERROR_CREATE="An error occurred while trying to create the database %s.<br>The user may not have enough privileges to create a database. The required database may need to be created separately before you can install Joomla"
 INSTL_DATABASE_ERROR_DELETE="Some errors occurred deleting the database."
diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml
index b221c511eff7a..a6385ab5158cc 100644
--- a/installation/language/en-GB/en-GB.xml
+++ b/installation/language/en-GB/en-GB.xml
@@ -4,9 +4,9 @@
 	client="installation">
 	<name>English (United Kingdom)</name>
 	<version>4.0.0</version>
-	<creationDate>December 2018</creationDate>
+	<creationDate>March 2019</creationDate>
 	<author>Joomla! Project</author>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<files>
 		<filename>en-GB.ini</filename>
diff --git a/installation/language/en-US/en-US.ini b/installation/language/en-US/en-US.ini
index 913c2b4e38ac2..df7fd3399010a 100644
--- a/installation/language/en-US/en-US.ini
+++ b/installation/language/en-US/en-US.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -165,10 +165,9 @@ INSTL_DEFAULTLANGUAGE_TRY_LATER="You will be able to install it later using the
 INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="English (UK)"
 
 ;Database Model
-INSTL_DATABASE_COULD_NOT_CONNECT="Could not connect to the database. Connector returned number: %s"
+INSTL_DATABASE_COULD_NOT_CONNECT="Could not connect to the database. Connector returned error message: %s"
 INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="The installer could not connect to the specified database and was unable to create the database. Please verify your settings and if necessary manually create your database."
 INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Could not refresh manifest cache for extension: %s"
-INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Some errors occurred in backing up the database."
 INSTL_DATABASE_ERROR_CREATE="An error occurred while trying to create the database %s.<br>The user may not have enough privileges to create a database. The required database may need to be created separately before you can install Joomla"
 INSTL_DATABASE_ERROR_DELETE="Some errors occurred deleting the database."
diff --git a/installation/language/en-US/en-US.xml b/installation/language/en-US/en-US.xml
index 03f3f3f16ea82..9af7396c6f2e0 100644
--- a/installation/language/en-US/en-US.xml
+++ b/installation/language/en-US/en-US.xml
@@ -6,7 +6,7 @@
 	<version>3.7.0</version>
 	<creationDate>October 2016</creationDate>
 	<author>Joomla! Project</author>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<files>
 		<filename>en-US.ini</filename>
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index 4fb6731f58be9..620f4aa912b84 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -31,7 +31,7 @@ CREATE TABLE IF NOT EXISTS `#__assets` (
 --
 
 INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`) VALUES
-(1, 0, 0, 121, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
+(1, 0, 0, 125, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.api":{"6":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
 (2, 1, 1, 2, 1, 'com_admin', 'com_admin', '{}'),
 (3, 1, 3, 6, 1, 'com_banners', 'com_banners', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
 (4, 1, 7, 8, 1, 'com_cache', 'com_cache', '{"core.admin":{"7":1},"core.manage":{"7":1}}'),
@@ -91,7 +91,11 @@ INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `titl
 (61, 56, 29, 30, 3, 'com_content.transition.1', 'Publish', '{}'),
 (62, 56, 31, 32, 3, 'com_content.transition.2', 'Unpublish', '{}'),
 (63, 56, 33, 34, 3, 'com_content.transition.3', 'Archive', '{}'),
-(64, 56, 35, 36, 3, 'com_content.transition.4', 'Trash', '{}');
+(64, 56, 35, 36, 3, 'com_content.transition.4', 'Trash', '{}'),
+(65, 1, 105, 106, 1, 'com_privacy', 'com_privacy', '{}'),
+(66, 1, 107, 108, 1, 'com_actionlogs', 'com_actionlogs', '{}'),
+(67, 18, 74, 75, 2, 'com_modules.module.88', 'Latest Actions', '{}'),
+(68, 18, 76, 77, 2, 'com_modules.module.89', 'Privacy Dashboard', '{}');
 
 -- --------------------------------------------------------
 
@@ -353,6 +357,7 @@ CREATE TABLE IF NOT EXISTS `#__content` (
   `featured` tinyint(3) unsigned NOT NULL DEFAULT 0 COMMENT 'Set if article is featured.',
   `language` char(7) NOT NULL COMMENT 'The language code for the article.',
   `xreference` varchar(50) NOT NULL DEFAULT '' COMMENT 'A reference to enable linkages to external data sets.',
+  `note` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   KEY `idx_access` (`access`),
   KEY `idx_checkout` (`checked_out`),
@@ -415,7 +420,7 @@ CREATE TABLE IF NOT EXISTS `#__content_types` (
 --
 
 INSERT INTO `#__content_types` (`type_id`, `type_title`, `type_alias`, `table`, `rules`, `field_mappings`, `router`, `content_history_options`) VALUES
-(1, 'Article', 'com_content.article', '{"special":{"dbtable":"#__content","key":"id","type":"Content","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"introtext", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"attribs", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"asset_id"}, "special":{"fulltext":"fulltext"}}', 'ContentHelperRoute::getArticleRoute', '{"formFile":"administrator\\/components\\/com_content\\/forms\\/article.xml", "hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'),
+(1, 'Article', 'com_content.article', '{"special":{"dbtable":"#__content","key":"id","type":"Content","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"introtext", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"attribs", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"asset_id", "note":"note"}, "special":{"fulltext":"fulltext"}}', 'ContentHelperRoute::getArticleRoute', '{"formFile":"administrator\\/components\\/com_content\\/forms\\/article.xml", "hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'),
 (2, 'Contact', 'com_contact.contact', '{"special":{"dbtable":"#__contact_details","key":"id","type":"Contact","prefix":"ContactTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"address", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"image", "core_urls":"webpage", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special":{"con_position":"con_position","suburb":"suburb","state":"state","country":"country","postcode":"postcode","telephone":"telephone","fax":"fax","misc":"misc","email_to":"email_to","default_con":"default_con","user_id":"user_id","mobile":"mobile","sortname1":"sortname1","sortname2":"sortname2","sortname3":"sortname3"}}', 'ContactHelperRoute::getContactRoute', '{"formFile":"administrator\\/components\\/com_contact\\/forms\\/contact.xml","hideFields":["default_con","checked_out","checked_out_time","version","xreference"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"], "displayLookup":[ {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ] }'),
 (3, 'Newsfeed', 'com_newsfeeds.newsfeed', '{"special":{"dbtable":"#__newsfeeds","key":"id","type":"Newsfeed","prefix":"NewsfeedsTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special":{"numarticles":"numarticles","cache_time":"cache_time","rtl":"rtl"}}', 'NewsfeedsHelperRoute::getNewsfeedRoute', '{"formFile":"administrator\\/components\\/com_newsfeeds\\/forms\\/newsfeed.xml","hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'),
 (4, 'User', 'com_users.user', '{"special":{"dbtable":"#__users","key":"id","type":"User","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"null","core_alias":"username","core_created_time":"registerdate","core_modified_time":"lastvisitDate","core_body":"null", "core_hits":"null","core_publish_up":"null","core_publish_down":"null","access":"null", "core_params":"params", "core_featured":"null", "core_metadata":"null", "core_language":"null", "core_images":"null", "core_urls":"null", "core_version":"null", "core_ordering":"null", "core_metakey":"null", "core_metadesc":"null", "core_catid":"null", "core_xreference":"null", "asset_id":"null"}, "special":{}}', '', ''),
@@ -489,6 +494,7 @@ CREATE TABLE IF NOT EXISTS `#__extensions` (
   `name` varchar(100) NOT NULL,
   `type` varchar(20) NOT NULL,
   `element` varchar(100) NOT NULL,
+  `changelogurl` text,
   `folder` varchar(100) NOT NULL,
   `client_id` tinyint(3) NOT NULL,
   `enabled` tinyint(3) NOT NULL DEFAULT 0,
@@ -531,7 +537,7 @@ INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `elem
 (18, 0, 'com_plugins', 'component', 'com_plugins', '', 1, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (19, 0, 'com_search', 'component', 'com_search', '', 1, 1, 1, 0, '', '{"enabled":"0","search_phrases":"1","search_areas":"1","show_date":"1","opensearch_name":"","opensearch_description":""}', 0, '0000-00-00 00:00:00', 0, 0),
 (20, 0, 'com_templates', 'component', 'com_templates', '', 1, 1, 1, 1, '', '{"template_positions_display":"0","upload_limit":"10","image_formats":"gif,bmp,jpg,jpeg,png","source_formats":"txt,less,ini,xml,js,php,css,scss,sass,json","font_formats":"woff,ttf,otf","compressed_formats":"zip"}', 0, '0000-00-00 00:00:00', 0, 0),
-(22, 0, 'com_content', 'component', 'com_content', '', 1, 1, 0, 1, '', '{"article_layout":"_:default","show_title":"1","link_titles":"1","show_intro":"1","show_category":"1","link_category":"1","show_parent_category":"0","link_parent_category":"0","show_author":"1","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"1","show_item_navigation":"1","show_vote":"0","show_readmore":"1","show_readmore_title":"1","readmore_limit":"100","show_icons":"1","show_print_icon":"1","show_email_icon":"0","show_hits":"1","show_noauth":"0","show_publishing_options":"1","show_article_options":"1","save_history":"1","history_limit":10,"show_urls_images_frontend":"0","show_urls_images_backend":"1","targeta":0,"targetb":0,"targetc":0,"float_intro":"left","float_fulltext":"left","category_layout":"_:blog","show_category_title":"0","show_description":"0","show_description_image":"0","maxLevel":"1","show_empty_categories":"0","show_no_articles":"1","show_subcat_desc":"1","show_cat_num_articles":"0","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"1","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"0","show_subcategory_content":"0","show_pagination_limit":"1","filter_field":"hide","show_headings":"1","list_show_date":"0","date_format":"","list_show_hits":"1","list_show_author":"1","orderby_pri":"order","orderby_sec":"rdate","order_date":"published","show_pagination":"2","show_pagination_results":"1","show_feed_link":"1","feed_summary":"0"}', 0, '0000-00-00 00:00:00', 0, 0),
+(22, 0, 'com_content', 'component', 'com_content', '', 1, 1, 0, 1, '', '{"article_layout":"_:default","show_title":"1","link_titles":"1","show_intro":"1","show_category":"1","link_category":"1","show_parent_category":"0","link_parent_category":"0","show_author":"1","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"1","show_item_navigation":"1","show_vote":"0","show_readmore":"1","show_readmore_title":"1","readmore_limit":"100","show_icons":"1","show_print_icon":"1","show_email_icon":"0","show_hits":"1","show_noauth":"0","show_publishing_options":"1","show_article_options":"1","save_history":"1","history_limit":10,"show_urls_images_frontend":"0","show_urls_images_backend":"1","targeta":0,"targetb":0,"targetc":0,"float_intro":"left","float_fulltext":"left","category_layout":"_:blog","show_category_title":"0","show_description":"0","show_description_image":"0","maxLevel":"1","show_empty_categories":"0","show_no_articles":"1","show_subcat_desc":"1","show_cat_num_articles":"0","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"1","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","show_subcategory_content":"0","show_pagination_limit":"1","filter_field":"hide","show_headings":"1","list_show_date":"0","date_format":"","list_show_hits":"1","list_show_author":"1","orderby_pri":"order","orderby_sec":"rdate","order_date":"published","show_pagination":"2","show_pagination_results":"1","show_feed_link":"1","feed_summary":"0"}', 0, '0000-00-00 00:00:00', 0, 0),
 (23, 0, 'com_config', 'component', 'com_config', '', 1, 1, 0, 1, '', '{"filters":{"1":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"6":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"7":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"2":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"3":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"4":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"5":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"10":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"12":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"8":{"filter_type":"NONE","filter_tags":"","filter_attributes":""}}}', 0, '0000-00-00 00:00:00', 0, 0),
 (24, 0, 'com_redirect', 'component', 'com_redirect', '', 1, 1, 0, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (25, 0, 'com_users', 'component', 'com_users', '', 1, 1, 0, 1, '', '{"allowUserRegistration":"0","new_usertype":"2","guest_usergroup":"9","sendpassword":"0","useractivation":"2","mail_to_admin":"1","captcha":"","frontend_userparams":"1","site_language":"0","change_login_name":"0","reset_count":"10","reset_time":"1","minimum_length":"4","minimum_integers":"0","minimum_symbols":"0","minimum_uppercase":"0","save_history":"1","history_limit":5,"mailSubjectPrefix":"","mailBodySuffix":""}', 0, '0000-00-00 00:00:00', 0, 0),
@@ -543,8 +549,10 @@ INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `elem
 (32, 0, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (33, 0, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (34, 0, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(35, 0, 'com_workflow', 'component', 'com_workflow', '', 1, 1, 0, 1, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
-(36, 0, 'com_csp', 'component', 'com_csp', '', 1, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(35, 0, 'com_privacy', 'component', 'com_privacy', '', 1, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(36, 0, 'com_actionlogs', 'component', 'com_actionlogs', '', 1, 1, 1, 1, '', '{"ip_logging":0,"csv_delimiter":",","loggable_extensions":["com_banners","com_cache","com_categories","com_config","com_contact","com_content","com_installer","com_media","com_menus","com_messages","com_modules","com_newsfeeds","com_plugins","com_redirect","com_tags","com_templates","com_users"]}', 0, '0000-00-00 00:00:00', 0, 0),
+(37, 0, 'com_workflow', 'component', 'com_workflow', '', 1, 1, 0, 1, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(38, 0, 'com_csp', 'component', 'com_csp', '', 1, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (103, 0, 'Joomla! Platform', 'library', 'joomla', '', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (106, 0, 'PHPass', 'library', 'phpass', '', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (200, 0, 'mod_articles_archive', 'module', 'mod_articles_archive', '', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
@@ -587,6 +595,8 @@ INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `elem
 (316, 0, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', 0, '0000-00-00 00:00:00', 0, 0),
 (317, 0, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '', '{"maximum":"5","matchtype":"any","owncache":"1"}', 0, '0000-00-00 00:00:00', 0, 0),
 (318, 0, 'mod_sampledata', 'module', 'mod_sampledata', '', 1, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(319, 0, 'mod_latestactions', 'module', 'mod_latestactions', '', 1, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(320, 0, 'mod_privacy_dashboard', 'module', 'mod_privacy_dashboard', '', 1, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
 (401, 0, 'plg_authentication_joomla', 'plugin', 'joomla', 'authentication', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (402, 0, 'plg_authentication_ldap', 'plugin', 'ldap', 'authentication', 0, 0, 1, 0, '', '{"host":"","port":"389","use_ldapV3":"0","negotiate_tls":"0","no_referrals":"0","auth_method":"bind","base_dn":"","search_string":"","users_dn":"","username":"admin","password":"bobby7","ldap_fullname":"fullName","ldap_email":"mail","ldap_uid":"uid"}', 0, '0000-00-00 00:00:00', 3, 0),
 (403, 0, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 1, 0),
@@ -663,24 +673,45 @@ INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `elem
 (478, 0, 'plg_editors-xtd_fields', 'plugin', 'fields', 'editors-xtd', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (479, 0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (480, 0, 'plg_system_sessiongc', 'plugin', 'sessiongc', 'system', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(481, 0, 'plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
-(482, 0, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
-(483, 0, 'plg_filesystem_local', 'plugin', 'local', 'filesystem', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
-(484, 0, 'plg_media-action_crop', 'plugin', 'crop', 'media-action', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
-(485, 0, 'plg_media-action_resize', 'plugin', 'resize', 'media-action', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
-(486, 0, 'plg_media-action_rotate', 'plugin', 'rotate', 'media-action', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
-(487, 0, 'plg_installer_webinstaller', 'plugin', 'webinstaller', 'installer', 0, 1, 1, 0, '', '{"tab_position":"1"}', 0, '0000-00-00 00:00:00', 0, 0),
-(488, 0, 'plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
-(489, 0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(490, 0, 'plg_extension_namespacemap', 'plugin', 'namespacemap', 'extension', 0, 1, 1, 1, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
-(491, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 4, 0),
-(492, 0, 'plg_quickicon_overridecheck', 'plugin', 'overridecheck', 'quickicon', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(481, 0, 'plg_fields_repeatable', 'plugin', 'repeatable', 'fields', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(482, 0, 'plg_content_confirmconsent', 'plugin', 'confirmconsent', 'content', 0, 0, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(483, 0, 'plg_system_actionlogs', 'plugin', 'actionlogs', 'system', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(484, 0, 'plg_actionlog_joomla', 'plugin', 'joomla', 'actionlog', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(485, 0, 'plg_system_privacyconsent', 'plugin', 'privacyconsent', 'system', 0, 0, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(486, 0, 'plg_system_logrotation', 'plugin', 'logrotation', 'system', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(487, 0, 'plg_privacy_user', 'plugin', 'user', 'privacy', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(488, 0, 'plg_quickicon_privacycheck', 'plugin', 'privacycheck', 'quickicon', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(489, 0, 'plg_user_terms', 'plugin', 'terms', 'user', 0, 0, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(490, 0, 'plg_privacy_contact', 'plugin', 'contact', 'privacy', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(491, 0, 'plg_privacy_content', 'plugin', 'content', 'privacy', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(492, 0, 'plg_privacy_message', 'plugin', 'message', 'privacy', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(493, 0, 'plg_privacy_actionlogs', 'plugin', 'actionlogs', 'privacy', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(494, 0, 'plg_captcha_recaptcha_invisible', 'plugin', 'recaptcha_invisible', 'captcha', 0, 0, 1, 0, '', '{"public_key":"","private_key":"","theme":"clean"}', 0, '0000-00-00 00:00:00', 0, 0),
+(495, 0, 'plg_privacy_consents', 'plugin', 'consents', 'privacy', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(496, 0, 'plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(497, 0, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(498, 0, 'plg_installer_webinstaller', 'plugin', 'webinstaller', 'installer', 0, 1, 1, 0, '', '{"tab_position":"1"}', 0, '0000-00-00 00:00:00', 0, 0),
+(499, 0, 'plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(500, 0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(501, 0, 'plg_extension_namespacemap', 'plugin', 'namespacemap', 'extension', 0, 1, 1, 1, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(502, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 4, 0),
+(503, 0, 'plg_quickicon_overridecheck', 'plugin', 'overridecheck', 'quickicon', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(504, 0, 'plg_extension_finder', 'plugin', 'finder', 'extension', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(505, 0, 'plg_system_skipto', 'plugin', 'skipto', 'system', 0, 1, 1, 0, '', '{}',  0, '0000-00-00 00:00:00', 0, 0),
 (509, 0, 'atum', 'template', 'atum', '', 1, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (510, 0, 'cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '', '{"logoFile":"","fluidContainer":"0","sidebarLeftWidth":"3","sidebarRightWidth":"3"}', 0, '0000-00-00 00:00:00', 0, 0),
 (600, 802, 'English (en-GB)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (601, 802, 'English (en-GB)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (700, 0, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(802, 0, 'English (en-GB) Language Pack', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0);
+(802, 0, 'English (en-GB) Language Pack', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0),
+-- Temporarily giving some plugins IDs of 900 until we remove all and just use auto-increment.
+(900, 0, 'plg_api-authentication_basic', 'plugin', 'basic', 'api-authentication', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(901, 0, 'plg_webservices_content', 'plugin', 'content', 'webservices', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(902, 0, 'plg_filesystem_local', 'plugin', 'local', 'filesystem', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(903, 0, 'plg_media-action_crop', 'plugin', 'crop', 'media-action', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(904, 0, 'plg_media-action_resize', 'plugin', 'resize', 'media-action', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
+(905, 0, 'plg_media-action_rotate', 'plugin', 'rotate', 'media-action', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0);
+
 -- --------------------------------------------------------
 
 --
@@ -877,26 +908,33 @@ CREATE TABLE IF NOT EXISTS `#__finder_logging` (
 --
 
 CREATE TABLE IF NOT EXISTS `#__finder_taxonomy` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `parent_id` int(10) unsigned NOT NULL DEFAULT 0,
-  `title` varchar(255) NOT NULL,
-  `state` tinyint(1) unsigned NOT NULL DEFAULT 1,
-  `access` tinyint(1) unsigned NOT NULL DEFAULT 0,
-  `ordering` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `parent_id` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+  `lft` INT(11) NOT NULL DEFAULT '0',
+  `rgt` INT(11) NOT NULL DEFAULT '0',
+  `level` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+  `path` VARCHAR(400) NOT NULL DEFAULT '',
+  `title` VARCHAR(255) NOT NULL DEFAULT '',
+  `alias` VARCHAR(400) NOT NULL DEFAULT '',
+  `state` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
+  `access` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
+  `language` CHAR(7) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
-  KEY `parent_id` (`parent_id`),
-  KEY `state` (`state`),
-  KEY `ordering` (`ordering`),
-  KEY `access` (`access`),
-  KEY `idx_parent_published` (`parent_id`,`state`,`access`)
+  INDEX `idx_state` (`state`),
+  INDEX `idx_access` (`access`),
+  INDEX `idx_path` (`path`(100)),
+  INDEX `idx_left_right` (`lft`, `rgt`),
+  INDEX `idx_alias` (`alias`(100)),
+  INDEX `idx_language` (`language`),
+  INDEX `idx_parent_published` (`parent_id`, `state`, `access`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
 
 --
 -- Dumping data for table `#__finder_taxonomy`
 --
 
-INSERT INTO `#__finder_taxonomy` (`id`, `parent_id`, `title`, `state`, `access`, `ordering`) VALUES
-(1, 0, 'ROOT', 0, 0, 0);
+INSERT INTO `#__finder_taxonomy` (`id`, `parent_id`, `lft`, `rgt`, `level`, `path`, `title`, `alias`, `state`, `access`, `language`) VALUES
+(1, 0, 0, 1, 0, '', 'ROOT', 'root', 1, 1, '*');
 
 -- --------------------------------------------------------
 
@@ -932,7 +970,8 @@ CREATE TABLE IF NOT EXISTS `#__finder_terms` (
   UNIQUE KEY `idx_term` (`term`,`language`),
   KEY `idx_term_phrase` (`term`,`phrase`),
   KEY `idx_stem_phrase` (`stem`,`phrase`),
-  KEY `idx_soundex_phrase` (`soundex`,`phrase`)
+  KEY `idx_soundex_phrase` (`soundex`,`phrase`),
+	KEY `language` (`language`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
 
 -- --------------------------------------------------------
@@ -942,127 +981,192 @@ CREATE TABLE IF NOT EXISTS `#__finder_terms` (
 --
 
 CREATE TABLE IF NOT EXISTS `#__finder_terms_common` (
-  `term` varchar(75) NOT NULL,
+  `term` varchar(75) NOT NULL DEFAULT '',
   `language` char(7) NOT NULL DEFAULT '',
-  KEY `idx_word_lang` (`term`,`language`),
+  `custom` int(11) NOT NULL DEFAULT '0',
+  UNIQUE KEY `idx_word_lang` (`term`,`language`),
   KEY `idx_lang` (`language`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_bin;
 
 --
 -- Dumping data for table `#__finder_terms_common`
 --
 
-INSERT INTO `#__finder_terms_common` (`term`, `language`) VALUES
-('a', 'en-GB'),
-('about', 'en-GB'),
-('after', 'en-GB'),
-('ago', 'en-GB'),
-('all', 'en-GB'),
-('am', 'en-GB'),
-('an', 'en-GB'),
-('and', 'en-GB'),
-('any', 'en-GB'),
-('are', 'en-GB'),
-('aren''t', 'en-GB'),
-('as', 'en-GB'),
-('at', 'en-GB'),
-('be', 'en-GB'),
-('but', 'en-GB'),
-('by', 'en-GB'),
-('for', 'en-GB'),
-('from', 'en-GB'),
-('get', 'en-GB'),
-('go', 'en-GB'),
-('how', 'en-GB'),
-('if', 'en-GB'),
-('in', 'en-GB'),
-('into', 'en-GB'),
-('is', 'en-GB'),
-('isn''t', 'en-GB'),
-('it', 'en-GB'),
-('its', 'en-GB'),
-('me', 'en-GB'),
-('more', 'en-GB'),
-('most', 'en-GB'),
-('must', 'en-GB'),
-('my', 'en-GB'),
-('new', 'en-GB'),
-('no', 'en-GB'),
-('none', 'en-GB'),
-('not', 'en-GB'),
-('nothing', 'en-GB'),
-('of', 'en-GB'),
-('off', 'en-GB'),
-('often', 'en-GB'),
-('old', 'en-GB'),
-('on', 'en-GB'),
-('onc', 'en-GB'),
-('once', 'en-GB'),
-('only', 'en-GB'),
-('or', 'en-GB'),
-('other', 'en-GB'),
-('our', 'en-GB'),
-('ours', 'en-GB'),
-('out', 'en-GB'),
-('over', 'en-GB'),
-('page', 'en-GB'),
-('she', 'en-GB'),
-('should', 'en-GB'),
-('small', 'en-GB'),
-('so', 'en-GB'),
-('some', 'en-GB'),
-('than', 'en-GB'),
-('thank', 'en-GB'),
-('that', 'en-GB'),
-('the', 'en-GB'),
-('their', 'en-GB'),
-('theirs', 'en-GB'),
-('them', 'en-GB'),
-('then', 'en-GB'),
-('there', 'en-GB'),
-('these', 'en-GB'),
-('they', 'en-GB'),
-('this', 'en-GB'),
-('those', 'en-GB'),
-('thus', 'en-GB'),
-('time', 'en-GB'),
-('times', 'en-GB'),
-('to', 'en-GB'),
-('too', 'en-GB'),
-('true', 'en-GB'),
-('under', 'en-GB'),
-('until', 'en-GB'),
-('up', 'en-GB'),
-('upon', 'en-GB'),
-('use', 'en-GB'),
-('user', 'en-GB'),
-('users', 'en-GB'),
-('version', 'en-GB'),
-('very', 'en-GB'),
-('via', 'en-GB'),
-('want', 'en-GB'),
-('was', 'en-GB'),
-('way', 'en-GB'),
-('were', 'en-GB'),
-('what', 'en-GB'),
-('when', 'en-GB'),
-('where', 'en-GB'),
-('which', 'en-GB'),
-('who', 'en-GB'),
-('whom', 'en-GB'),
-('whose', 'en-GB'),
-('why', 'en-GB'),
-('wide', 'en-GB'),
-('will', 'en-GB'),
-('with', 'en-GB'),
-('within', 'en-GB'),
-('without', 'en-GB'),
-('would', 'en-GB'),
-('yes', 'en-GB'),
-('yet', 'en-GB'),
-('you', 'en-GB'),
-('your', 'en-GB'),
-('yours', 'en-GB');
+INSERT INTO `#__finder_terms_common` (`term`, `language`, `custom`) VALUES
+('i', 'en', 0),
+('me', 'en', 0),
+('my', 'en', 0),
+('myself', 'en', 0),
+('we', 'en', 0),
+('our', 'en', 0),
+('ours', 'en', 0),
+('ourselves', 'en', 0),
+('you', 'en', 0),
+('your', 'en', 0),
+('yours', 'en', 0),
+('yourself', 'en', 0),
+('yourselves', 'en', 0),
+('he', 'en', 0),
+('him', 'en', 0),
+('his', 'en', 0),
+('himself', 'en', 0),
+('she', 'en', 0),
+('her', 'en', 0),
+('hers', 'en', 0),
+('herself', 'en', 0),
+('it', 'en', 0),
+('its', 'en', 0),
+('itself', 'en', 0),
+('they', 'en', 0),
+('them', 'en', 0),
+('their', 'en', 0),
+('theirs', 'en', 0),
+('themselves', 'en', 0),
+('what', 'en', 0),
+('which', 'en', 0),
+('who', 'en', 0),
+('whom', 'en', 0),
+('this', 'en', 0),
+('that', 'en', 0),
+('these', 'en', 0),
+('those', 'en', 0),
+('am', 'en', 0),
+('is', 'en', 0),
+('are', 'en', 0),
+('was', 'en', 0),
+('were', 'en', 0),
+('be', 'en', 0),
+('been', 'en', 0),
+('being', 'en', 0),
+('have', 'en', 0),
+('has', 'en', 0),
+('had', 'en', 0),
+('having', 'en', 0),
+('do', 'en', 0),
+('does', 'en', 0),
+('did', 'en', 0),
+('doing', 'en', 0),
+('would', 'en', 0),
+('should', 'en', 0),
+('could', 'en', 0),
+('ought', 'en', 0),
+('i\'m', 'en', 0),
+('you\'re', 'en', 0),
+('he\'s', 'en', 0),
+('she\'s', 'en', 0),
+('it\'s', 'en', 0),
+('we\'re', 'en', 0),
+('they\'re', 'en', 0),
+('i\'ve', 'en', 0),
+('you\'ve', 'en', 0),
+('we\'ve', 'en', 0),
+('they\'ve', 'en', 0),
+('i\'d', 'en', 0),
+('you\'d', 'en', 0),
+('he\'d', 'en', 0),
+('she\'d', 'en', 0),
+('we\'d', 'en', 0),
+('they\'d', 'en', 0),
+('i\'ll', 'en', 0),
+('you\'ll', 'en', 0),
+('he\'ll', 'en', 0),
+('she\'ll', 'en', 0),
+('we\'ll', 'en', 0),
+('they\'ll', 'en', 0),
+('isn\'t', 'en', 0),
+('aren\'t', 'en', 0),
+('wasn\'t', 'en', 0),
+('weren\'t', 'en', 0),
+('hasn\'t', 'en', 0),
+('haven\'t', 'en', 0),
+('hadn\'t', 'en', 0),
+('doesn\'t', 'en', 0),
+('don\'t', 'en', 0),
+('didn\'t', 'en', 0),
+('won\'t', 'en', 0),
+('wouldn\'t', 'en', 0),
+('shan\'t', 'en', 0),
+('shouldn\'t', 'en', 0),
+('can\'t', 'en', 0),
+('cannot', 'en', 0),
+('couldn\'t', 'en', 0),
+('mustn\'t', 'en', 0),
+('let\'s', 'en', 0),
+('that\'s', 'en', 0),
+('who\'s', 'en', 0),
+('what\'s', 'en', 0),
+('here\'s', 'en', 0),
+('there\'s', 'en', 0),
+('when\'s', 'en', 0),
+('where\'s', 'en', 0),
+('why\'s', 'en', 0),
+('how\'s', 'en', 0),
+('a', 'en', 0),
+('an', 'en', 0),
+('the', 'en', 0),
+('and', 'en', 0),
+('but', 'en', 0),
+('if', 'en', 0),
+('or', 'en', 0),
+('because', 'en', 0),
+('as', 'en', 0),
+('until', 'en', 0),
+('while', 'en', 0),
+('of', 'en', 0),
+('at', 'en', 0),
+('by', 'en', 0),
+('for', 'en', 0),
+('with', 'en', 0),
+('about', 'en', 0),
+('against', 'en', 0),
+('between', 'en', 0),
+('into', 'en', 0),
+('through', 'en', 0),
+('during', 'en', 0),
+('before', 'en', 0),
+('after', 'en', 0),
+('above', 'en', 0),
+('below', 'en', 0),
+('to', 'en', 0),
+('from', 'en', 0),
+('up', 'en', 0),
+('down', 'en', 0),
+('in', 'en', 0),
+('out', 'en', 0),
+('on', 'en', 0),
+('off', 'en', 0),
+('over', 'en', 0),
+('under', 'en', 0),
+('again', 'en', 0),
+('further', 'en', 0),
+('then', 'en', 0),
+('once', 'en', 0),
+('here', 'en', 0),
+('there', 'en', 0),
+('when', 'en', 0),
+('where', 'en', 0),
+('why', 'en', 0),
+('how', 'en', 0),
+('all', 'en', 0),
+('any', 'en', 0),
+('both', 'en', 0),
+('each', 'en', 0),
+('few', 'en', 0),
+('more', 'en', 0),
+('most', 'en', 0),
+('other', 'en', 0),
+('some', 'en', 0),
+('such', 'en', 0),
+('no', 'en', 0),
+('nor', 'en', 0),
+('not', 'en', 0),
+('only', 'en', 0),
+('own', 'en', 0),
+('same', 'en', 0),
+('so', 'en', 0),
+('than', 'en', 0),
+('too', 'en', 0),
+('very', 'en', 0);
 
 -- --------------------------------------------------------
 
@@ -1219,8 +1323,8 @@ INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link
 (20, 'main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 1, 1, 1, 29, 0, '0000-00-00 00:00:00', 0, 1, 'class:tags', 0, '', 35, 36, 0, '', 1),
 (21, 'main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 1, 1, 1, 32, 0, '0000-00-00 00:00:00', 0, 1, 'class:postinstall', 0, '', 37, 38, 0, '*', 1),
 (22, 'main', 'com_associations', 'Multilingual Associations', '', 'Multilingual Associations', 'index.php?option=com_associations', 'component', 1, 1, 1, 34, 0, '0000-00-00 00:00:00', 0, 0, 'class:associations', 0, '', 39, 40, 0, '*', 1),
-(23, 'main', 'com_csp', 'Content-Security-Policy', '', 'Content-Security-Policy', 'index.php?option=com_csp', 'component', 1, 1, 1, 35, 0, '0000-00-00 00:00:00', 0, 0, 'class:associations', 0, '', 41, 42, 0, '*', 1),
-(101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 41, 42, 1, '*', 0);
+(23, 'main', 'com_csp', 'Content-Security-Policy', '', 'Content-Security-Policy', 'index.php?option=com_csp', 'component', 1, 1, 1, 38, 0, '0000-00-00 00:00:00', 0, 0, 'class:associations', 0, '', 41, 42, 0, '*', 1),
+(101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_links":"0","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 41, 42, 1, '*', 0);
 
 -- --------------------------------------------------------
 
@@ -1294,9 +1398,9 @@ CREATE TABLE IF NOT EXISTS `#__modules` (
   `ordering` int(11) NOT NULL DEFAULT 0,
   `position` varchar(50) NOT NULL DEFAULT '',
   `checked_out` int(10) unsigned NOT NULL DEFAULT 0,
-  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `publish_up` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `publish_down` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `checked_out_time` datetime,
+  `publish_up` datetime,
+  `publish_down` datetime,
   `published` tinyint(1) NOT NULL DEFAULT 0,
   `module` varchar(50) DEFAULT NULL,
   `access` int(10) unsigned NOT NULL DEFAULT 0,
@@ -1315,21 +1419,23 @@ CREATE TABLE IF NOT EXISTS `#__modules` (
 --
 
 INSERT INTO `#__modules` (`id`, `asset_id`, `title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES
-(1, 39, 'Main Menu', '', '', 1, 'sidebar-right', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","startLevel":"0","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'),
-(2, 40, 'Login', '', '', 1, 'login', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_login', 1, 1, '', 1, '*'),
-(3, 41, 'Popular Articles', '', '', 3, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_popular', 3, 1, '{"count":"5","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0", "bootstrap_size": "6"}', 1, '*'),
-(4, 42, 'Recently Added Articles', '', '', 4, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_latest', 3, 1, '{"count":"5","ordering":"c_dsc","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0", "bootstrap_size": "6"}', 1, '*'),
-(8, 43, 'Toolbar', '', '', 1, 'toolbar', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_toolbar', 3, 1, '', 1, '*'),
-(9, 44, 'Quick Icons', '', '', 1, 'icon', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_quickicon', 3, 1, '', 1, '*'),
-(10, 45, 'Logged-in Users', '', '', 2, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_logged', 3, 1, '{"count":"5","name":"1","layout":"_:default","moduleclass_sfx":"","cache":"0", "bootstrap_size": "6"}', 1, '*'),
-(12, 46, 'Admin Menu', '', '', 1, 'menu', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 3, 1, '{"layout":"","moduleclass_sfx":"","shownew":"1","showhelp":"1","cache":"0"}', 1, '*'),
-(14, 48, 'User Status', '', '', 2, 'status', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_status', 3, 1, '', 1, '*'),
-(15, 49, 'Title', '', '', 1, 'title', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_title', 3, 1, '', 1, '*'),
-(16, 50, 'Login Form', '', '', 7, 'sidebar-right', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_login', 1, 1, '{"greeting":"1","name":"0"}', 0, '*'),
-(17, 51, 'Breadcrumbs', '', '', 1, 'breadcrumbs', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_breadcrumbs', 1, 1, '{"moduleclass_sfx":"","showHome":"1","homeText":"","showComponent":"1","separator":"","cache":"0","cache_time":"0","cachemode":"itemid"}', 0, '*'),
-(79, 52, 'Multilanguage status', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 'mod_multilangstatus', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
-(86, 53, 'Joomla Version', '', '', 1, 'status', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_version', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
-(87, 55, 'Sample Data', '', '', 0, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_sampledata', 6, 1, '{"bootstrap_size": "6"}', 1, '*');
+(1, 39, 'Main Menu', '', '', 1, 'sidebar-right', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","startLevel":"0","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'),
+(2, 40, 'Login', '', '', 1, 'login', 0, NULL, NULL, NULL, 1, 'mod_login', 1, 1, '', 1, '*'),
+(3, 41, 'Popular Articles', '', '', 3, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_popular', 3, 1, '{"count":"5","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0", "bootstrap_size": "6"}', 1, '*'),
+(4, 42, 'Recently Added Articles', '', '', 4, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_latest', 3, 1, '{"count":"5","ordering":"c_dsc","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0", "bootstrap_size": "6"}', 1, '*'),
+(8, 43, 'Toolbar', '', '', 1, 'toolbar', 0, NULL, NULL, NULL, 1, 'mod_toolbar', 3, 1, '', 1, '*'),
+(9, 44, 'Quick Icons', '', '', 1, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 3, 1, '', 1, '*'),
+(10, 45, 'Logged-in Users', '', '', 2, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_logged', 3, 1, '{"count":"5","name":"1","layout":"_:default","moduleclass_sfx":"","cache":"0", "bootstrap_size": "6"}', 1, '*'),
+(12, 46, 'Admin Menu', '', '', 1, 'menu', 0, NULL, NULL, NULL, 1, 'mod_menu', 3, 1, '{"layout":"","moduleclass_sfx":"","shownew":"1","showhelp":"1","cache":"0"}', 1, '*'),
+(14, 48, 'User Status', '', '', 2, 'status', 0, NULL, NULL, NULL, 1, 'mod_status', 3, 1, '', 1, '*'),
+(15, 49, 'Title', '', '', 1, 'title', 0, NULL, NULL, NULL, 1, 'mod_title', 3, 1, '', 1, '*'),
+(16, 50, 'Login Form', '', '', 7, 'sidebar-right', 0, NULL, NULL, NULL, 1, 'mod_login', 1, 1, '{"greeting":"1","name":"0"}', 0, '*'),
+(17, 51, 'Breadcrumbs', '', '', 1, 'breadcrumbs', 0, NULL, NULL, NULL, 1, 'mod_breadcrumbs', 1, 1, '{"moduleclass_sfx":"","showHome":"1","homeText":"","showComponent":"1","separator":"","cache":"0","cache_time":"0","cachemode":"itemid"}', 0, '*'),
+(79, 52, 'Multilanguage status', '', '', 1, '', 0, NULL, NULL, NULL, 0, 'mod_multilangstatus', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
+(86, 53, 'Joomla Version', '', '', 1, 'status', 0, NULL, NULL, NULL, 1, 'mod_version', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
+(87, 55, 'Sample Data', '', '', 0, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_sampledata', 6, 1, '{"bootstrap_size": "6"}', 1, '*'),
+(88, 58, 'Latest Actions', '', '', 0, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_latestactions', 6, 1, '{}', 1, '*'),
+(89, 59, 'Privacy Dashboard', '', '', 0, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_privacy_dashboard', 6, 1, '{}', 1, '*');
 
 -- --------------------------------------------------------
 
@@ -1364,7 +1470,9 @@ INSERT INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES
 (17, 0),
 (79, 0),
 (86, 0),
-(87, 0);
+(87, 0),
+(88, 0),
+(89, 0);
 
 -- --------------------------------------------------------
 
@@ -1460,7 +1568,45 @@ INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description
 (700, 'COM_CPANEL_WELCOME_BEGINNERS_TITLE', 'COM_CPANEL_WELCOME_BEGINNERS_MESSAGE', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.2.0', 1),
 (700, 'COM_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1),
 (700, 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION', 'plg_system_updatenotification', 1, 'action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_condition', '3.6.3', 1),
-(700, 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_TITLE', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_BODY', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_ACTION', 'plg_system_httpheaders', 1, 'action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_condition', '4.0.0', 1);
+(700, 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_TITLE', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_BODY', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_ACTION', 'plg_system_httpheaders', 1, 'action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_condition', '4.0.0', 1),
+(700, 'COM_ACTIONLOGS_POSTINSTALL_TITLE', 'COM_ACTIONLOGS_POSTINSTALL_BODY', '', 'com_actionlogs', 1, 'message', '', '', '', '', '3.9.0', 1),
+(700, 'COM_PRIVACY_POSTINSTALL_TITLE', 'COM_PRIVACY_POSTINSTALL_BODY', '', 'com_privacy', 1, 'message', '', '', '', '', '3.9.0', 1);
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `#__privacy_requests`
+--
+
+CREATE TABLE IF NOT EXISTS `#__privacy_requests` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `email` varchar(100) NOT NULL DEFAULT '',
+  `requested_at` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `status` tinyint(4) NOT NULL DEFAULT '0',
+  `request_type` varchar(25) NOT NULL DEFAULT '',
+  `confirm_token` varchar(100) NOT NULL DEFAULT '',
+  `confirm_token_created_at` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `#__privacy_consents`
+--
+
+CREATE TABLE IF NOT EXISTS `#__privacy_consents` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `state` INT(10) NOT NULL DEFAULT '1',
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `subject` varchar(255) NOT NULL DEFAULT '',
+  `body` text NOT NULL,
+  `remind` tinyint(4) NOT NULL DEFAULT '0',
+  `token` varchar(100) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`),
+  KEY `idx_user_id` (`user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
 -- --------------------------------------------------------
 
 --
@@ -1502,10 +1648,10 @@ CREATE TABLE IF NOT EXISTS `#__schemas` (
 --
 
 CREATE TABLE IF NOT EXISTS `#__session` (
-  `session_id` varchar(191) NOT NULL DEFAULT '',
+  `session_id` varbinary(192) NOT NULL,
   `client_id` tinyint(3) unsigned DEFAULT NULL,
-  `guest` tinyint(4) unsigned DEFAULT 1,
-  `time` varchar(14) DEFAULT '',
+  `guest` tinyint(3) unsigned DEFAULT 1,
+  `time` int(11) NOT NULL DEFAULT 0,
   `data` mediumtext,
   `userid` int(11) DEFAULT 0,
   `username` varchar(150) DEFAULT '',
@@ -1728,6 +1874,7 @@ CREATE TABLE IF NOT EXISTS `#__updates` (
   `data` text NOT NULL,
   `detailsurl` text NOT NULL,
   `infourl` text NOT NULL,
+  `changelogurl` text,
   `extra_query` varchar(1000) DEFAULT '',
   PRIMARY KEY (`update_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci COMMENT='Available Updates';
@@ -1914,6 +2061,103 @@ CREATE TABLE IF NOT EXISTS `#__user_usergroup_map` (
   PRIMARY KEY (`user_id`,`group_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
+--
+-- Table structure for table `#__action_logs`
+--
+
+CREATE TABLE IF NOT EXISTS `#__action_logs` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `message_language_key` varchar(255) NOT NULL DEFAULT '',
+  `message` text NOT NULL,
+  `log_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `extension` varchar(50) NOT NULL DEFAULT '',
+  `user_id` int(11) NOT NULL DEFAULT 0,
+  `item_id` int(11) NOT NULL DEFAULT 0,
+  `ip_address` VARCHAR(40) NOT NULL DEFAULT '0.0.0.0',
+  PRIMARY KEY (`id`),
+  KEY `idx_user_id` (`user_id`),
+  KEY `idx_user_id_logdate` (`user_id`, `log_date`),
+  KEY `idx_user_id_extension` (`user_id`, `extension`),
+  KEY `idx_extension_item_id` (`extension`, `item_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+--
+-- Table structure for table `#__action_logs_extensions`
+--
+
+CREATE TABLE IF NOT EXISTS `#__action_logs_extensions` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `extension` varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+INSERT INTO `#__action_logs_extensions` (`id`, `extension`) VALUES
+(1, 'com_banners'),
+(2, 'com_cache'),
+(3, 'com_categories'),
+(4, 'com_config'),
+(5, 'com_contact'),
+(6, 'com_content'),
+(7, 'com_installer'),
+(8, 'com_media'),
+(9, 'com_menus'),
+(10, 'com_messages'),
+(11, 'com_modules'),
+(12, 'com_newsfeeds'),
+(13, 'com_plugins'),
+(14, 'com_redirect'),
+(15, 'com_tags'),
+(16, 'com_templates'),
+(17, 'com_users');
+
+--
+-- Table structure for table `#__action_log_config`
+--
+
+CREATE TABLE IF NOT EXISTS `#__action_log_config` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `type_title` varchar(255) NOT NULL DEFAULT '',
+  `type_alias` varchar(255) NOT NULL DEFAULT '',
+  `id_holder` varchar(255),
+  `title_holder` varchar(255),
+  `table_name` varchar(255),
+  `text_prefix` varchar(255),
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+INSERT INTO `#__action_log_config` (`id`, `type_title`, `type_alias`, `id_holder`, `title_holder`, `table_name`, `text_prefix`) VALUES
+(1, 'article', 'com_content.article', 'id' ,'title' , '#__content', 'PLG_ACTIONLOG_JOOMLA'),
+(2, 'article', 'com_content.form', 'id', 'title' , '#__content', 'PLG_ACTIONLOG_JOOMLA'),
+(3, 'banner', 'com_banners.banner', 'id' ,'name' , '#__banners', 'PLG_ACTIONLOG_JOOMLA'),
+(4, 'user_note', 'com_users.note', 'id', 'subject' ,'#__user_notes', 'PLG_ACTIONLOG_JOOMLA'),
+(5, 'media', 'com_media.file', '' , 'name' , '',  'PLG_ACTIONLOG_JOOMLA'),
+(6, 'category', 'com_categories.category', 'id' , 'title' , '#__categories', 'PLG_ACTIONLOG_JOOMLA'),
+(7, 'menu', 'com_menus.menu', 'id' ,'title' , '#__menu_types', 'PLG_ACTIONLOG_JOOMLA'),
+(8, 'menu_item', 'com_menus.item', 'id' , 'title' , '#__menu', 'PLG_ACTIONLOG_JOOMLA'),
+(9, 'newsfeed', 'com_newsfeeds.newsfeed', 'id' ,'name' , '#__newsfeeds', 'PLG_ACTIONLOG_JOOMLA'),
+(10, 'link', 'com_redirect.link', 'id', 'old_url' , '#__redirect_links', 'PLG_ACTIONLOG_JOOMLA'),
+(11, 'tag', 'com_tags.tag', 'id', 'title' , '#__tags', 'PLG_ACTIONLOG_JOOMLA'),
+(12, 'style', 'com_templates.style', 'id' , 'title' , '#__template_styles', 'PLG_ACTIONLOG_JOOMLA'),
+(13, 'plugin', 'com_plugins.plugin', 'extension_id' , 'name' , '#__extensions', 'PLG_ACTIONLOG_JOOMLA'),
+(14, 'component_config', 'com_config.component', 'extension_id' , 'name', '', 'PLG_ACTIONLOG_JOOMLA'),
+(15, 'contact', 'com_contact.contact', 'id', 'name', '#__contact_details', 'PLG_ACTIONLOG_JOOMLA'),
+(16, 'module', 'com_modules.module', 'id' ,'title', '#__modules', 'PLG_ACTIONLOG_JOOMLA'),
+(17, 'access_level', 'com_users.level', 'id' , 'title', '#__viewlevels', 'PLG_ACTIONLOG_JOOMLA'),
+(18, 'banner_client', 'com_banners.client', 'id', 'name', '#__banner_clients', 'PLG_ACTIONLOG_JOOMLA'),
+(19, 'application_config', 'com_config.application', '', 'name', '', 'PLG_ACTIONLOG_JOOMLA');
+
+--
+-- Table structure for table `#__action_logs_users`
+--
+
+CREATE TABLE IF NOT EXISTS `#__action_logs_users` (
+  `user_id` int(11) UNSIGNED NOT NULL,
+  `notify` tinyint(1) UNSIGNED NOT NULL,
+  `extensions` text NOT NULL,
+  PRIMARY KEY (`user_id`),
+  KEY `idx_notify` (`notify`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
 --
 -- Table structure for table `#__utf8_conversion`
 --
@@ -2031,8 +2275,8 @@ CREATE TABLE IF NOT EXISTS `#__workflow_stages` (
 --
 
 INSERT INTO `#__workflow_stages` (`id`, `asset_id`, `ordering`, `workflow_id`, `published`, `title`, `description`, `condition`, `default`) VALUES
-(1, 57, 1, 1, 1, 'JUNPUBLISHED', '', '0', 0),
-(2, 58, 2, 1, 1, 'JPUBLISHED', '', '1', 1),
+(1, 57, 1, 1, 1, 'JUNPUBLISHED', '', '0', 1),
+(2, 58, 2, 1, 1, 'JPUBLISHED', '', '1', 0),
 (3, 59, 3, 1, 1, 'JTRASHED', '', '-2', 0),
 (4, 60, 4, 1, 1, 'JARCHIVED', '', '2', 0);
 
diff --git a/installation/sql/mysql/sample_testing.sql b/installation/sql/mysql/sample_testing.sql
index 7eb924ef1e638..128255818419b 100644
--- a/installation/sql/mysql/sample_testing.sql
+++ b/installation/sql/mysql/sample_testing.sql
@@ -21,7 +21,7 @@ TRUNCATE `#__viewlevels`;
 --
 
 INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`) VALUES
-(1, 0, 1, 479, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
+(1, 0, 1, 483, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
 (2, 1, 2, 3, 1, 'com_admin', 'com_admin', '{}'),
 (3, 1, 4, 11, 1, 'com_banners', 'com_banners', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
 (4, 1, 12, 13, 1, 'com_cache', 'com_cache', '{"core.admin":{"7":1},"core.manage":{"7":1}}'),
@@ -206,7 +206,9 @@ INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `titl
 (210, 18, 359, 360, 2, 'com_modules.module.64', 'Language Switcher', '{"core.delete":[],"core.edit":[],"core.edit.state":[],"module.edit.frontend":[]}'),
 (211, 18, 361, 362, 2, 'com_modules.module.84', 'Smart Search Module', '{"core.delete":[],"core.edit":[],"core.edit.state":[],"module.edit.frontend":[]}'),
 (212, 18, 363, 364, 2, 'com_modules.module.119', 'Banner', '{"core.delete":[],"core.edit":[],"core.edit.state":[],"module.edit.frontend":[]}'),
-(213, 18, 365, 366, 2, 'com_modules.module.120', 'Footer', '{"core.delete":[],"core.edit":[],"core.edit.state":[],"module.edit.frontend":[]}');
+(213, 18, 365, 366, 2, 'com_modules.module.120', 'Footer', '{"core.delete":[],"core.edit":[],"core.edit.state":[],"module.edit.frontend":[]}'),
+(214, 1, 367, 368, 1, 'com_privacy', 'com_privacy', '{"core.admin":{"7":1}}'),
+(215, 1, 369, 370, 1, 'com_actionlogs', 'com_actionlogs', '{"core.admin":{"7":1}}');
 
 --
 -- Dumping data for table `#__banners`
@@ -445,11 +447,11 @@ INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link
 (207, 'top', 'Joomla.org', 'joomlaorg', '', 'joomlaorg', 'https://www.joomla.org/', 'url', 1, 1, 1, 0, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"menu-anchor_title":"","menu-anchor_css":"","menu_image":""}', 93, 94, 0, '*', 0),
 (229, 'frontendviews', 'Single Contact', 'single-contact', '', 'single-contact', 'index.php?option=com_contact&view=contact&id=1', 'component', 1, 1, 1, 8, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_category_crumb":"","presentation_style":"","show_contact_category":"","show_contact_list":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_links":"","linka_name":"","linkb_name":"","linkc_name":"","linkd_name":"","linke_name":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 157, 158, 0, '*', 0),
 (233, 'mainmenu', 'Login', 'login', '', 'login', 'index.php?option=com_users&view=login', 'component', 1, 1, 1, 25, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 13, 14, 0, '*', 0),
-(234, 'parks', 'Park Blog', 'park-blog', '', 'park-blog', 'index.php?option=com_content&view=category&layout=blog&id=27', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 114, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"1","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"1","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 99, 100, 0, 'en-GB', 0),
+(234, 'parks', 'Park Blog', 'park-blog', '', 'park-blog', 'index.php?option=com_content&view=category&layout=blog&id=27', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 114, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"1","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 99, 100, 0, 'en-GB', 0),
 (238, 'mainmenu', 'Sample Sites', 'sample-sites', '', 'sample-sites', 'index.php?option=com_content&view=article&id=38', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"0","link_category":"","show_parent_category":"0","link_parent_category":"","show_author":"0","link_author":"","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"0","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"0","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 121, 126, 0, '*', 0),
 (242, 'parks', 'Write a Blog Post', 'write-a-blog-post', '', 'write-a-blog-post', 'index.php?option=com_content&view=form&layout=edit', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 3, '', 114, '{"menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 101, 102, 0, 'en-GB', 0),
 (243, 'parks', 'Parks Home', 'parks-home', '', 'parks-home', 'index.php?option=com_content&view=article&id=6', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 114, '{"show_noauth":"","show_title":"0","link_titles":"","show_intro":"","show_category":"0","link_category":"0","show_parent_category":"","link_parent_category":"","show_author":"0","link_author":"","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"0","show_icons":"","show_print_icon":"0","show_email_icon":"0","show_hits":"0","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 97, 98, 0, 'en-GB', 0),
-(244, 'parks', 'Image Gallery', 'image-gallery', '', 'image-gallery', 'index.php?option=com_content&view=categories&id=28', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 114, '{"show_base_description":"1","categories_description":"","maxLevelcat":"","show_empty_categories_cat":"","show_subcat_desc_cat":"","show_cat_num_articles_cat":"","drill_down_layout":"1","show_category_title":"","show_description":"1","show_description_image":"1","maxLevel":"-1","show_empty_categories":"","show_subcat_desc":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_pagination_results":"","show_pagination_limit":"","filter_field":"","show_headings":"","list_show_date":"","date_format":"","list_show_hits":"","list_show_author":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 103, 108, 0, 'en-GB', 0),
+(244, 'parks', 'Image Gallery', 'image-gallery', '', 'image-gallery', 'index.php?option=com_content&view=categories&id=28', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 114, '{"show_base_description":"1","categories_description":"","maxLevelcat":"","show_empty_categories_cat":"","show_subcat_desc_cat":"","show_cat_num_articles_cat":"","drill_down_layout":"1","show_category_title":"","show_description":"1","show_description_image":"1","maxLevel":"-1","show_empty_categories":"","show_subcat_desc":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_pagination_results":"","show_pagination_limit":"","filter_field":"","show_headings":"","list_show_date":"","date_format":"","list_show_hits":"","list_show_author":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 103, 108, 0, 'en-GB', 0),
 (251, 'frontendviews', 'Contact Categories', 'contact-categories', '', 'contact-categories', 'index.php?option=com_contact&view=categories&id=16', 'component', 1, 1, 1, 8, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_base_description":"","categories_description":"","maxLevel":"-1","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","display_num":"","show_headings":"","filter_field":"","show_pagination":"","show_noauth":"","presentation_style":"sliders","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_links":"1","linka_name":"","linkb_name":"","linkc_name":"","linkd_name":"","linke_name":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 153, 154, 0, '*', 0),
 (252, 'frontendviews', 'News Feed Categories', 'new-feed-categories', '', 'new-feed-categories', 'index.php?option=com_newsfeeds&view=categories&id=0', 'component', 1, 1, 1, 17, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_base_description":"1","categories_description":"Because this links to the root category the \\"uncategorised\\" category is displayed. ","maxLevel":"-1","show_empty_categories":"1","show_description":"1","show_description_image":"1","show_cat_num_articles":"1","display_num":"","show_headings":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_feed_image":"","show_feed_description":"","show_item_description":"","feed_character_count":"0","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 163, 164, 0, '*', 0),
 (253, 'frontendviews', 'News Feed Category', 'news-feed-category', '', 'news-feed-category', 'index.php?option=com_newsfeeds&view=category&id=17', 'component', 1, 1, 1, 17, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"-1","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","display_num":"","show_headings":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_feed_image":"","show_feed_description":"","show_item_description":"","feed_character_count":"0","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 167, 168, 0, '*', 0),
@@ -457,22 +459,22 @@ INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link
 (255, 'frontendviews', 'Search', 'search', '', 'search', 'index.php?option=com_search&view=search', 'component', 1, 1, 1, 19, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"search_areas":"1","show_date":"1","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 185, 186, 0, '*', 0),
 (256, 'frontendviews', 'Archived Articles', 'archived-articles', '', 'archived-articles', 'index.php?option=com_content&view=archive', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"orderby_sec":"","order_date":"","display_num":"","filter_field":"","show_category":"1","link_category":"1","show_title":"1","link_titles":"1","show_intro":"1","show_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_hits":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 147, 148, 0, '*', 0),
 (257, 'frontendviews', 'Single Article', 'single-article', '', 'single-article', 'index.php?option=com_content&view=article&id=6', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 137, 138, 0, '*', 0),
-(259, 'frontendviews', 'Article Category Blog', 'article-category-blog', '', 'article-category-blog', 'index.php?option=com_content&view=category&layout=blog&id=27', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"0","show_description_image":"0","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 141, 142, 0, '*', 0),
+(259, 'frontendviews', 'Article Category Blog', 'article-category-blog', '', 'article-category-blog', 'index.php?option=com_content&view=category&layout=blog&id=27', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"0","show_description_image":"0","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 141, 142, 0, '*', 0),
 (260, 'frontendviews', 'Article Category List', 'article-category-list', '', 'article-category-list', 'index.php?option=com_content&view=category&id=19', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_category_title":"","show_description":"","show_description_image":"","maxLevel":"","show_empty_categories":"","show_no_articles":"","show_subcat_desc":"","show_cat_num_articles":"","page_subheading":"","show_pagination_limit":"","filter_field":"","show_headings":"","list_show_date":"","date_format":"","list_show_hits":"","list_show_author":"","orderby_pri":"","orderby_sec":"alpha","order_date":"","show_pagination":"","show_pagination_results":"","display_num":"10","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 143, 144, 0, '*', 0),
-(262, 'frontendviews', 'Featured Articles', 'featured-articles', '', 'featured-articles', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 145, 146, 0, '*', 0),
+(262, 'frontendviews', 'Featured Articles', 'featured-articles', '', 'featured-articles', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 145, 146, 0, '*', 0),
 (263, 'frontendviews', 'Submit Article', 'submit-article', '', 'submit-article', 'index.php?option=com_content&view=form&layout=edit', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 3, '', 0, '{"menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 149, 150, 0, '*', 0),
 (266, 'frontendviews', 'Content Component', 'content-component', '', 'content-component', 'index.php?option=com_content&view=article&id=10', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"article-allow_ratings":"","article-allow_comments":"","show_category":"","link_category":"","show_title":"","link_titles":"","show_intro":"","show_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 135, 136, 0, '*', 0),
 (267, 'frontendviews', 'News Feeds Component', 'news-feeds-component', '', 'news-feeds-component', 'index.php?option=com_content&view=article&id=60', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"Newsfeeds Categories View ","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 161, 162, 0, '*', 0),
 (270, 'frontendviews', 'Contact Component', 'contact-component', '', 'contact-component', 'index.php?option=com_content&view=article&id=9', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 151, 152, 0, '*', 0),
 (271, 'frontendviews', 'Users Component', 'users-component', '', 'users-component', 'index.php?option=com_content&view=article&id=52', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 169, 170, 0, '*', 0),
-(272, 'frontendviews', 'Article Categories', 'article-categories', '', 'article-categories', 'index.php?option=com_content&view=categories&id=14', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_base_description":"","categories_description":"","maxLevel":"-1","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","display_num":"","category_layout":"","show_headings":"","show_date":"","date_format":"","filter_field":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 139, 140, 0, '*', 0),
+(272, 'frontendviews', 'Article Categories', 'article-categories', '', 'article-categories', 'index.php?option=com_content&view=categories&id=14', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_base_description":"","categories_description":"","maxLevel":"-1","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","display_num":"","category_layout":"","show_headings":"","show_date":"","date_format":"","filter_field":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 139, 140, 0, '*', 0),
 (275, 'frontendviews', 'Contact Single Category', 'contact-single-category', '', 'contact-single-category', 'index.php?option=com_contact&view=category&catid=26&id=36', 'component', 1, 1, 1, 8, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"-1","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","display_num":"20","show_headings":"","filter_field":"","show_pagination":"","show_noauth":"","presentation_style":"sliders","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_links":"1","linka_name":"","linkb_name":"","linkc_name":"","linkd_name":"","linke_name":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 155, 156, 0, '*', 0),
 (276, 'frontendviews', 'Search Components', 'search-component', '', 'search-component', 'index.php?option=com_content&view=article&id=39', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 183, 184, 0, '*', 0),
-(277, 'aboutjoomla', 'Using Extensions', 'extensions', '', 'using-joomla/extensions', 'index.php?option=com_content&view=categories&id=20', 'component', 1, 280, 2, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_base_description":"1","categories_description":"","maxLevelcat":"1","show_empty_categories_cat":"1","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"0","drill_down_layout":"0","show_category_title":"","show_description":"1","show_description_image":"1","maxLevel":"1","show_empty_categories":"1","show_subcat_desc":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_pagination_results":"","show_pagination_limit":"","filter_field":"","show_headings":"","list_show_date":"","date_format":"","list_show_hits":"","list_show_author":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 48, 87, 0, '*', 0),
+(277, 'aboutjoomla', 'Using Extensions', 'extensions', '', 'using-joomla/extensions', 'index.php?option=com_content&view=categories&id=20', 'component', 1, 280, 2, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_base_description":"1","categories_description":"","maxLevelcat":"1","show_empty_categories_cat":"1","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"0","drill_down_layout":"0","show_category_title":"","show_description":"1","show_description_image":"1","maxLevel":"1","show_empty_categories":"1","show_subcat_desc":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_pagination_results":"","show_pagination_limit":"","filter_field":"","show_headings":"","list_show_date":"","date_format":"","list_show_hits":"","list_show_author":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 48, 87, 0, '*', 0),
 (280, 'aboutjoomla', 'Using Joomla!', 'using-joomla', '', 'using-joomla', 'index.php?option=com_content&view=article&id=53', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_title":"1","link_titles":"0","show_intro":"1","show_category":"0","link_category":"","show_parent_category":"0","link_parent_category":"","show_author":"0","link_author":"","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"0","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"0","show_noauth":"0","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 47, 88, 0, '*', 0),
 (282, 'aboutjoomla', 'Templates', 'templates', '', 'using-joomla/extensions/templates', 'index.php?option=com_content&view=category&id=23', 'component', 1, 277, 3, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_category_title":"","show_description":"1","show_description_image":"","maxLevel":"2","show_empty_categories":"1","show_no_articles":"0","show_subcat_desc":"1","show_cat_num_articles":"","page_subheading":"","show_pagination_limit":"0","filter_field":"hide","show_headings":"0","list_show_date":"0","date_format":"","list_show_hits":"0","list_show_author":"0","show_pagination":"0","show_pagination_results":"","show_title":"1","link_titles":"1","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"Templates","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 49, 68, 0, '*', 0),
-(283, 'aboutjoomla', 'Languages', 'languages', '', 'using-joomla/extensions/languages', 'index.php?option=com_content&view=category&layout=blog&id=24', 'component', 1, 277, 3, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"1","show_category_title":"1","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 69, 70, 0, '*', 0),
-(284, 'aboutjoomla', 'Plugins', 'plugins', '', 'using-joomla/extensions/plugins', 'index.php?option=com_content&view=category&layout=blog&id=25', 'component', 1, 277, 3, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_category_title":"1","show_cat_num_articles":"","num_leading_articles":"0","num_intro_articles":"7","num_columns":"1","num_links":"0","multi_column_order":"","orderby_pri":"","orderby_sec":"order","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"0","link_category":"0","show_parent_category":"0","link_parent_category":"0","show_author":"0","link_author":"","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"","show_readmore":"","show_icons":"0","show_print_icon":"0","show_email_icon":"0","show_hits":"0","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 71, 86, 0, '*', 0),
+(283, 'aboutjoomla', 'Languages', 'languages', '', 'using-joomla/extensions/languages', 'index.php?option=com_content&view=category&layout=blog&id=24', 'component', 1, 277, 3, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"1","show_category_title":"1","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 69, 70, 0, '*', 0),
+(284, 'aboutjoomla', 'Plugins', 'plugins', '', 'using-joomla/extensions/plugins', 'index.php?option=com_content&view=category&layout=blog&id=25', 'component', 1, 277, 3, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_category_title":"1","show_cat_num_articles":"","num_leading_articles":"0","num_intro_articles":"7","num_links":"0","orderby_pri":"","orderby_sec":"order","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"0","link_category":"0","show_parent_category":"0","link_parent_category":"0","show_author":"0","link_author":"","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"","show_readmore":"","show_icons":"0","show_print_icon":"0","show_email_icon":"0","show_hits":"0","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 71, 86, 0, '*', 0),
 (285, 'aboutjoomla', 'Typography Atomic', 'typography-atomic', '', 'using-joomla/extensions/templates/atomic/typography-atomic', 'index.php?option=com_content&view=article&id=49', 'component', 1, 422, 5, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 3, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 63, 64, 0, '*', 0),
 (300, 'modules', 'Latest Users', 'latest-users', '', 'latest-users', 'index.php?option=com_content&view=article&id=66', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 213, 214, 0, '*', 0),
 (301, 'modules', 'Who''s Online', 'whos-online', '', 'whos-online', 'index.php?option=com_content&view=article&id=56', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 215, 216, 0, '*', 0),
@@ -487,7 +489,7 @@ INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link
 (311, 'modules', 'Syndicate', 'syndicate', '', 'syndicate', 'index.php?option=com_content&view=article&id=45', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 229, 230, 0, '*', 0),
 (312, 'modules', 'Login', 'login-module', '', 'login-module', 'index.php?option=com_content&view=article&id=28', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","urls_position":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 211, 212, 0, '*', 0),
 (313, 'modules', 'Wrapper', 'wrapper-module', '', 'wrapper-module', 'index.php?option=com_content&view=article&id=59', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","urls_position":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 237, 238, 0, '*', 0),
-(316, 'aboutjoomla', 'Home Page Atomic', 'home-page-atomic', '', 'using-joomla/extensions/templates/atomic/home-page-atomic', 'index.php?option=com_content&view=featured', 'component', 1, 422, 5, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 3, '{"maxLevel":"","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 65, 66, 0, '*', 0),
+(316, 'aboutjoomla', 'Home Page Atomic', 'home-page-atomic', '', 'using-joomla/extensions/templates/atomic/home-page-atomic', 'index.php?option=com_content&view=featured', 'component', 1, 422, 5, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 3, '{"maxLevel":"","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"3","num_links":"0","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 65, 66, 0, '*', 0),
 (317, 'aboutjoomla', 'System', 'system', '', 'using-joomla/extensions/plugins/system', 'index.php?option=com_content&view=article&id=46', 'component', 1, 284, 4, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 84, 85, 0, '*', 0),
 (318, 'aboutjoomla', 'Authentication', 'authentication', '', 'using-joomla/extensions/plugins/authentication', 'index.php?option=com_content&view=article&id=5', 'component', 1, 284, 4, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 72, 73, 0, '*', 0),
 (319, 'aboutjoomla', 'Content', 'content', '', 'using-joomla/extensions/plugins/content', 'index.php?option=com_content&view=article&id=62', 'component', 1, 284, 4, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 74, 75, 0, '*', 0),
@@ -498,8 +500,8 @@ INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link
 (324, 'modules', 'Footer', 'footer', '', 'footer', 'index.php?option=com_content&view=article&id=19', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 225, 226, 0, '*', 0),
 (325, 'modules', 'Archive', 'archive', '', 'archive', 'index.php?option=com_content&view=article&id=2', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 201, 202, 0, '*', 0),
 (326, 'modules', 'Related Items', 'related-items', '', 'related-items', 'index.php?option=com_content&view=article&id=37', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 203, 204, 0, '*', 0),
-(399, 'parks', 'Animals', 'animals', '', 'image-gallery/animals', 'index.php?option=com_content&view=category&layout=blog&id=72', 'component', 1, 244, 2, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 114, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"0","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"0","num_intro_articles":"6","num_columns":"2","num_links":"4","multi_column_order":"1","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"0","show_category":"1","link_category":"1","show_parent_category":"","link_parent_category":"","show_author":"0","link_author":"","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"1","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 104, 105, 0, 'en-GB', 0),
-(400, 'parks', 'Scenery', 'scenery', '', 'image-gallery/scenery', 'index.php?option=com_content&view=category&layout=blog&id=73', 'component', 1, 244, 2, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 114, '{"maxLevel":"","show_empty_categories":"","show_description":"0","show_description_image":"0","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"0","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"1","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"0","show_category":"1","link_category":"","show_parent_category":"0","link_parent_category":"0","show_author":"0","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"1","show_readmore":"1","show_icons":"0","show_print_icon":"0","show_email_icon":"0","show_hits":"0","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 106, 107, 0, 'en-GB', 0),
+(399, 'parks', 'Animals', 'animals', '', 'image-gallery/animals', 'index.php?option=com_content&view=category&layout=blog&id=72', 'component', 1, 244, 2, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 114, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"0","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"0","num_intro_articles":"6","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"0","show_category":"1","link_category":"1","show_parent_category":"","link_parent_category":"","show_author":"0","link_author":"","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"1","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 104, 105, 0, 'en-GB', 0),
+(400, 'parks', 'Scenery', 'scenery', '', 'image-gallery/scenery', 'index.php?option=com_content&view=category&layout=blog&id=73', 'component', 1, 244, 2, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 114, '{"maxLevel":"","show_empty_categories":"","show_description":"0","show_description_image":"0","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"0","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"0","show_category":"1","link_category":"","show_parent_category":"0","link_parent_category":"0","show_author":"0","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"1","show_readmore":"1","show_icons":"0","show_print_icon":"0","show_email_icon":"0","show_hits":"0","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 106, 107, 0, 'en-GB', 0),
 (402, 'frontendviews', 'Login Form', 'login-form', '', 'login-form', 'index.php?option=com_users&view=login', 'component', 1, 1, 1, 25, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"login_redirect_url":"","logindescription_show":"1","login_description":"","login_image":"","logout_redirect_url":"","logoutdescription_show":"1","logout_description":"","logout_image":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 171, 172, 0, '*', 0),
 (403, 'frontendviews', 'User Profile', 'user-profile', '', 'user-profile', 'index.php?option=com_users&view=profile', 'component', 1, 1, 1, 25, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 173, 174, 0, '*', 0),
 (404, 'frontendviews', 'Edit User Profile', 'edit-user-profile', '', 'edit-user-profile', 'index.php?option=com_users&view=profile&layout=edit', 'component', 1, 1, 1, 25, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 175, 176, 0, '*', 0),
@@ -511,14 +513,14 @@ INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link
 (412, 'modules', 'User Modules', 'user-modules', '', 'user-modules', 'index.php?option=com_content&view=category&id=65', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"0","show_category_title":"1","page_subheading":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_cat_num_articles":"","display_num":"0","show_headings":"0","list_show_title":"1","list_show_date":"","date_format":"","list_show_hits":"0","list_show_author":"0","filter_field":"hide","orderby_pri":"","orderby_sec":"order","order_date":"","show_pagination":"","show_pagination_limit":"0","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"1","link_category":"1","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 209, 210, 0, '*', 0),
 (416, 'modules', 'Breadcrumbs', 'breadcrumbs', '', 'breadcrumbs', 'index.php?option=com_content&view=article&id=61', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 191, 192, 0, '*', 0),
 (418, 'modules', 'Custom', 'custom', '', 'custom', 'index.php?option=com_content&view=article&id=12', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 227, 228, 0, '*', 0),
-(419, 'aboutjoomla', 'Beez 2', 'beez-2', '', 'using-joomla/extensions/templates/beez-2', 'index.php?option=com_content&view=category&layout=blog&id=69', 'component', 1, 282, 4, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 50, 55, 0, '*', 0),
-(422, 'aboutjoomla', 'Atomic', 'atomic', '', 'using-joomla/extensions/templates/atomic', 'index.php?option=com_content&view=category&layout=blog&id=68', 'component', 1, 282, 4, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"2","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 62, 67, 0, '*', 0),
+(419, 'aboutjoomla', 'Beez 2', 'beez-2', '', 'using-joomla/extensions/templates/beez-2', 'index.php?option=com_content&view=category&layout=blog&id=69', 'component', 1, 282, 4, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 50, 55, 0, '*', 0),
+(422, 'aboutjoomla', 'Atomic', 'atomic', '', 'using-joomla/extensions/templates/atomic', 'index.php?option=com_content&view=category&layout=blog&id=68', 'component', 1, 282, 4, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"2","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 62, 67, 0, '*', 0),
 (423, 'aboutjoomla', 'Typography Beez 2', 'typography-beez-2', '', 'using-joomla/extensions/templates/beez-2/typography-beez-2', 'index.php?option=com_content&view=article&id=49', 'component', 1, 419, 5, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 4, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 51, 52, 0, '*', 0),
-(424, 'aboutjoomla', 'Home Page Beez 2', 'home-page-beez-2', '', 'using-joomla/extensions/templates/beez-2/home-page-beez-2', 'index.php?option=com_content&view=featured', 'component', 1, 419, 5, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 4, '{"maxLevel":"","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 53, 54, 0, '*', 0),
+(424, 'aboutjoomla', 'Home Page Beez 2', 'home-page-beez-2', '', 'using-joomla/extensions/templates/beez-2/home-page-beez-2', 'index.php?option=com_content&view=featured', 'component', 1, 419, 5, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 4, '{"maxLevel":"","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"3","num_links":"0","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 53, 54, 0, '*', 0),
 (427, 'fruitshop', 'Fruit Encyclopedia', 'fruit-encyclopedia', '', 'fruit-encyclopedia', 'index.php?option=com_contact&view=categories&id=37', 'component', 1, 1, 1, 8, 0, '0000-00-00 00:00:00', 0, 1, '', 7, '{"show_base_description":"1","categories_description":"","maxLevelcat":"","show_empty_categories_cat":"","show_subcat_desc_cat":"","show_cat_items_cat":"","show_category_title":"","show_description":"1","show_description_image":"1","maxLevel":"-1","show_empty_categories":"1","show_subcat_desc":"","show_cat_items":"","show_pagination_limit":"","show_headings":"0","show_position_headings":"","show_email_headings":"0","show_telephone_headings":"0","show_mobile_headings":"0","show_fax_headings":"0","show_suburb_headings":"0","show_state_headings":"","show_country_headings":"","show_pagination":"","show_pagination_results":"","presentation_style":"","show_contact_category":"","show_contact_list":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_links":"1","linka_name":"","linkb_name":"","linkc_name":"","linkd_name":"","linke_name":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":"","show_feed_link":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":" categories-listalphabet","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 111, 112, 0, '*', 0),
 (429, 'fruitshop', 'Welcome', 'welcome', 'Fruit store front page', 'welcome', 'index.php?option=com_content&view=article&id=20', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 7, '{"show_title":"0","link_titles":"0","show_intro":"1","show_category":"0","link_category":"0","show_parent_category":"","link_parent_category":"","show_author":"0","link_author":"","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"0","show_vote":"","show_icons":"0","show_print_icon":"0","show_email_icon":"0","show_hits":"0","show_noauth":"","urls_position":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 109, 110, 0, '*', 0),
 (430, 'fruitshop', 'Contact Us', 'contact-us', '', 'contact-us', 'index.php?option=com_contact&view=category&catid=47&id=36', 'component', 1, 1, 1, 8, 0, '0000-00-00 00:00:00', 0, 1, '', 7, '{"show_category_title":"","show_description":"","show_description_image":"","maxLevel":"-1","show_empty_categories":"","show_subcat_desc":"","show_cat_items":"","show_pagination_limit":"","show_headings":"0","show_position_headings":"","show_email_headings":"","show_telephone_headings":"","show_mobile_headings":"","show_fax_headings":"","show_suburb_headings":"","show_state_headings":"","show_country_headings":"","show_pagination":"","show_pagination_results":"","initial_sort":"","presentation_style":"","show_contact_category":"","show_contact_list":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_links":"1","linka_name":"","linkb_name":"","linkc_name":"","linkd_name":"","linke_name":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":"","show_feed_link":"1","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 115, 116, 0, '*', 0),
-(431, 'fruitshop', 'Growers', 'growers', '', 'growers', 'index.php?option=com_content&view=category&layout=blog&id=30', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 7, '{"layout_type":"blog","show_category_title":"1","show_description":"1","show_description_image":"","maxLevel":"0","show_empty_categories":"","show_no_articles":"","show_subcat_desc":"","show_cat_num_articles":"","page_subheading":"","num_leading_articles":"5","num_intro_articles":"0","num_columns":"1","num_links":"4","multi_column_order":"","show_subcategory_content":"","orderby_pri":"","orderby_sec":"alpha","order_date":"","show_pagination":"","show_pagination_results":"","show_title":"1","link_titles":"1","show_intro":"1","show_category":"0","link_category":"","show_parent_category":"0","link_parent_category":"0","show_author":"0","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"0","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"0","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 113, 114, 0, '*', 0),
+(431, 'fruitshop', 'Growers', 'growers', '', 'growers', 'index.php?option=com_content&view=category&layout=blog&id=30', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 7, '{"layout_type":"blog","show_category_title":"1","show_description":"1","show_description_image":"","maxLevel":"0","show_empty_categories":"","show_no_articles":"","show_subcat_desc":"","show_cat_num_articles":"","page_subheading":"","num_leading_articles":"5","num_intro_articles":"0","num_links":"4","show_subcategory_content":"","orderby_pri":"","orderby_sec":"alpha","order_date":"","show_pagination":"","show_pagination_results":"","show_title":"1","link_titles":"1","show_intro":"1","show_category":"0","link_category":"","show_parent_category":"0","link_parent_category":"0","show_author":"0","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"0","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"0","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 113, 114, 0, '*', 0),
 (432, 'fruitshop', 'Login ', 'shop-login', '', 'shop-login', 'index.php?option=com_users&view=login', 'component', 1, 1, 1, 25, 0, '0000-00-00 00:00:00', 0, 1, '', 7, '{"login_redirect_url":"","logindescription_show":"1","login_description":"","login_image":"","logout_redirect_url":"","logoutdescription_show":"1","logout_description":"","logout_image":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 117, 118, 0, '*', 0),
 (433, 'fruitshop', 'Directions', 'directions', '', 'directions', 'index.php?option=com_content&view=article&id=13', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 7, '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","urls_position":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 119, 120, 0, '*', 0),
 (435, 'mainmenu', 'Home', 'homepage', '', 'homepage', 'index.php?option=com_content&view=article&id=24', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_title":"1","link_titles":"","show_intro":"","show_category":"0","link_category":"0","show_parent_category":"0","link_parent_category":"0","show_author":"0","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"0","show_vote":"","show_icons":"0","show_print_icon":"0","show_email_icon":"0","show_hits":"0","show_noauth":"","urls_position":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 11, 12, 1, '*', 0),
@@ -531,9 +533,9 @@ INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link
 (448, 'mainmenu', 'Site Administrator', 'site-administrator', '', 'site-administrator', 'administrator', 'url', 1, 1, 1, 0, 0, '0000-00-00 00:00:00', 1, 1, '', 0, '{"menu-anchor_title":"","menu-anchor_css":"","menu_image":""}', 127, 128, 0, '*', 0),
 (449, 'usermenu', 'Submit an Article', 'submit-an-article', '', 'submit-an-article', 'index.php?option=com_content&view=form&layout=edit', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 3, '', 0, '{"menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 129, 130, 0, '*', 0),
 (452, 'frontendviews', 'Featured Contacts', 'featured-contacts', '', 'featured-contacts', 'index.php?option=com_contact&view=featured&id=16', 'component', 1, 1, 1, 8, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"-1","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","display_num":"","show_headings":"","filter_field":"","show_pagination":"","show_noauth":"","presentation_style":"sliders","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_links":"1","linka_name":"","linkb_name":"","linkc_name":"","linkd_name":"","linke_name":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 159, 160, 0, '*', 0),
-(456, 'aboutjoomla', 'Beez5', 'beez5', '', 'using-joomla/extensions/templates/beez5', 'index.php?option=com_content&view=category&layout=blog&id=70', 'component', 1, 282, 4, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 56, 61, 0, '*', 0),
+(456, 'aboutjoomla', 'Beez5', 'beez5', '', 'using-joomla/extensions/templates/beez5', 'index.php?option=com_content&view=category&layout=blog&id=70', 'component', 1, 282, 4, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 56, 61, 0, '*', 0),
 (457, 'aboutjoomla', 'Typography Beez5', 'typography-beez-5', '', 'using-joomla/extensions/templates/beez5/typography-beez-5', 'index.php?option=com_content&view=article&id=49', 'component', 1, 456, 5, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 57, 58, 0, '*', 0),
-(458, 'aboutjoomla', 'Home Page Beez5', 'home-page-beez5', '', 'using-joomla/extensions/templates/beez5/home-page-beez5', 'index.php?option=com_content&view=featured', 'component', 1, 456, 5, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 59, 60, 0, '*', 0),
+(458, 'aboutjoomla', 'Home Page Beez5', 'home-page-beez5', '', 'using-joomla/extensions/templates/beez5/home-page-beez5', 'index.php?option=com_content&view=featured', 'component', 1, 456, 5, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"3","num_links":"0","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 59, 60, 0, '*', 0),
 (459, 'modules', 'Article Category', 'article-category', '', 'article-category', 'index.php?option=com_content&view=article&id=4', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 207, 208, 0, '*', 0),
 (462, 'fruitshop', 'Add a recipe', 'add-a-recipe', '', 'add-a-recipe', 'index.php?option=com_content&view=form&layout=edit', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 4, '', 7, '{"enable_category":"0","catid":"14","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 131, 132, 0, '*', 0),
 (463, 'fruitshop', 'Recipes', 'recipes', '', 'recipes', 'index.php?option=com_content&view=category&id=76', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 7, '{"show_category_title":"1","show_description":"1","show_description_image":"","maxLevel":"0","show_empty_categories":"0","show_no_articles":"","show_subcat_desc":"","show_cat_num_articles":"","page_subheading":"","show_pagination_limit":"","filter_field":"","show_headings":"","list_show_date":"","date_format":"","list_show_hits":"","list_show_author":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_pagination_results":"","display_num":"10","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 133, 134, 0, '*', 0),
@@ -569,86 +571,88 @@ INSERT INTO `#__menu_types` (`id`, `asset_id`, `menutype`, `title`, `description
 --
 
 INSERT INTO `#__modules` (`id`, `title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES
-(1, 'Main Menu', '', '', 1, 'sidebar-right', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(3, 'Popular Articles', '', '', 2, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_popular', 3, 1, '{"count":"5","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
-(4, 'Recently Added Articles', '', '', 1, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_latest', 3, 1, '{"count":"5","ordering":"c_dsc","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
-(8, 'Toolbar', '', '', 1, 'toolbar', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_toolbar', 3, 1, '', 1, '*'),
-(9, 'Quick Icons', '', '', 1, 'icon', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_quickicon', 3, 1, '', 1, '*'),
-(10, 'Logged-in Users', '', '', 4, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_logged', 3, 1, '{"count":"5","name":"1","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
-(12, 'Admin Menu', '', '', 1, 'menu', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 3, 1, '{"layout":"","moduleclass_sfx":"","shownew":"1","showhelp":"1","cache":"0"}', 1, '*'),
-(14, 'User Status', '', '', 2, 'status', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_status', 3, 1, '', 1, '*'),
-(15, 'Title', '', '', 1, 'title', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_title', 3, 1, '', 1, '*'),
-(16, 'Login Form', '', '', 2, 'sidebar-right', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_login', 1, 1, '{"pretext":"","posttext":"","login":"","logout":"","greeting":"1","profilelink":"0","name":"0","usetext":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"card-title","style":"Cassiopeia-cardGrey"}', 0, '*'),
-(17, 'Breadcrumbs', '', '', 1, 'breadcrumbs', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_breadcrumbs', 1, 1, '{"moduleclass_sfx":"","showHome":"1","homeText":"","showComponent":"1","separator":"","cache":"0","cache_time":"0","cachemode":"itemid"}', 0, '*'),
-(18, 'Book Store', '', '', 1, 'position-10', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"3","catid":[""],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Books!","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
-(19, 'User Menu', '', '', 3, 'sidebar-right', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 2, 1, '{"menutype":"usermenu","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'),
-(20, 'Top', '', '', 1, 'menu', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"top","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":" navbar-nav mr-auto","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(22, 'Australian Parks ', '', '', 2, 'position-5', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"parks","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, 'en-GB'),
-(23, 'A Deep Menu', '', '', 4, 'sidebar-right', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"aboutjoomla","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(25, 'Site Map', '', '', 1, 'sitemapload', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 0, '{"menutype":"mainmenu","startLevel":"2","endLevel":"3","showAllChildren":"1","tag_id":"","class_sfx":"sitemap","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'),
-(26, 'This Site', '', '', 5, 'sidebar-right', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","base":"","startLevel":"1","endLevel":"1","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(27, 'Archived Articles', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_articles_archive', 1, 1, '{"count":"10","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(28, 'Latest News', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_articles_latest', 1, 1, '{"catid":["19"],"count":"5","show_featured":"","ordering":"c_dsc","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(29, 'Articles Most Read', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_articles_popular', 1, 1, '{"catid":["26","29"],"count":"5","show_front":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(30, 'Feed Display', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_feed', 1, 1, '{"rssurl":"http:\\/\\/feeds.joomla.org\\/JoomlaMagazine","rssdesc":"1","rssimage":"1","rssitems":"3","rssitemdesc":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
-(31, 'News Flash', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_articles_news', 1, 1, '{"catid":["19"],"image":"0","item_title":"0","link_titles":"","item_heading":"h4","showLastSeparator":"1","readmore":"1","count":"1","ordering":"a.publish_up","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'),
-(33, 'Random Image', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_random_image', 1, 1, '{"type":"jpg","folder":"images\\/sampledata\\/parks\\/animals","link":"","width":"180","height":"","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 0, '*'),
-(34, 'Articles Related Items', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_related_items', 1, 1, '{"showDate":"0","layout":"_:default","moduleclass_sfx":"","owncache":"1"}', 0, '*'),
-(36, 'Statistics', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_stats', 1, 1, '{"serverinfo":"1","siteinfo":"1","counter":"1","increase":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(37, 'Syndicate Feeds', '', '', 1, 'syndicateload', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_syndicate', 1, 1, '{"text":"Feed Entries","format":"rss","layout":"","moduleclass_sfx":"","cache":"0"}', 0, '*'),
-(38, 'Users Latest', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_users_latest', 1, 1, '{"shownumber":"5","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"static"}', 0, '*'),
-(39, 'Who\'s Online', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_whosonline', 1, 1, '{"showmode":"2","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 0, '*'),
-(40, 'Wrapper', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_wrapper', 1, 1, '{"url":"https:\\/\\/www.youtube.com\\/embed\\/vb2eObvmvdI","add":"1","scrolling":"auto","width":"100%","height":"390","height_auto":"1","target":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(41, 'Footer', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_footer', 1, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(45, 'Menu Example', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'),
-(47, 'Latest Park Blogs', '', '', 6, 'sidebar-right', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_articles_latest', 1, 1, '{"catid":["27"],"count":"5","ordering":"c_dsc","user_id":"0","show_front":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, 'en-GB'),
-(48, 'Custom', '', '<p>This is a custom module. That means you can enter whatever content you want.</p>', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 1, '{"prepare_content":"1","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(52, 'Breadcrumbs', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_breadcrumbs', 1, 1, '{"showHere":"1","showHome":"1","homeText":"Home","showLast":"1","separator":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"0","cachemode":"itemid"}', 0, '*'),
-(56, 'Banners', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_banners', 1, 1, '{"target":"1","count":"1","cid":"1","catid":["15"],"tag_search":"0","ordering":"random","header_text":"","footer_text":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
-(57, 'Fruit Shop', '', '', 3, 'position-5', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"fruitshop","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'),
-(58, 'Special!', '', '<h1>This week we have a special, half price on delicious oranges!</h1><div>Only for our special customers!</div><div>Use the code: Joomla! when ordering</div><p><em>This module can only be seen by people in the customers group or higher.</em></p>', 1, 'position-12', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 4, 1, '{"prepare_content":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(61, 'Articles Categories', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_articles_categories', 1, 1, '{"parent":"29","show_description":"0","show_children":"0","count":"0","maxlevel":"0","layout":"_:default","item_heading":"4","moduleclass_sfx":"","owncache":"1","cache_time":"900"}', 0, '*'),
-(63, 'Search', '', '', 1, 'search', 0, '2017-03-22 16:31:37', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_search', 1, 1, '{"label":"","text":"","button":"0","imagebutton":"1","button_text":"","opensearch":"1","opensearch_title":"","set_itemid":"0","layout":"_:default","moduleclass_sfx":" hidden-md-down","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(64, 'Language Switcher', '', '', 1, 'sidebar-left', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 'mod_languages', 1, 1, '{"header_text":"","footer_text":"","dropdown":"0","dropdownimage":"1","lineheight":"0","image":"1","show_active":"1","full_name":"1","inline":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(65, 'About Fruit Shop', '', '<p>The Fruit Shop site shows a number of Joomla! features.</p><p>The template uses classes in cascading style sheets to change the layout of items, such as creating the horizontal alphabetical list in the Fruit Encyclopedia.</p><p> </p>', 1, 'position-4', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 1, '{"prepare_content":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(67, 'Extensions', '', '', 2, 'sidebar-right', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 'mod_menu', 1, 1, '{"menutype":"aboutjoomla","startLevel":"1","endLevel":"6","showAllChildren":"1","tag_id":"","class_sfx":"-menu","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'),
-(68, 'About Parks', '', '<p>The Parks sample site is designed as a simple site that can be routinely updated from the front end of Joomla!.</p><p>As a site, it is largely focused on a blog which can be updated using the front end article submission.</p><p>New weblinks can also be added through the front end.</p><p>A simple image gallery uses com_content with thumbnails displayed in a blog layout and full size images shown in article layout.</p><p>The Parks site features the language switch module. All of the content and modules are tagged as English (en-GB). If a second language pack is added with sample data this can be filtered using the language switch.</p><p>Parks uses HTML5 which is a major web standard (along with XHTML which is used in other areas of sample data).</p>', 2, 'position-4', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 1, '{"prepare_content":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(69, 'Articles Category', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_articles_category', 1, 1, '{"mode":"normal","show_on_article_page":"1","show_front":"show","count":"0","category_filtering_type":"1","catid":["72"],"show_child_category_articles":"0","levels":"1","author_filtering_type":"1","created_by":[""],"author_alias_filtering_type":"1","created_by_alias":[""],"excluded_articles":"","date_filtering":"off","date_field":"a.created","start_date_range":"","end_date_range":"","relative_date":"30","article_ordering":"a.title","article_ordering_direction":"ASC","article_grouping":"none","article_grouping_direction":"ksort","month_year_format":"F Y","item_heading":"4","link_titles":"1","show_date":"0","show_date_field":"created","show_date_format":"Y-m-d H:i:s","show_category":"0","show_hits":"0","show_author":"0","show_introtext":"0","introtext_limit":"100","show_readmore":"0","show_readmore_title":"1","readmore_limit":"15","layout":"_:default","moduleclass_sfx":"","owncache":"1","cache_time":"900"}', 0, '*'),
-(77, 'Shop', '', '', 1, 'position-11', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"2","catid":["15"],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Shop!","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
-(78, 'Contribute', '', '', 1, 'position-9', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"1","catid":["15"],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Contribute! ","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
-(79, 'Multilanguage status', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 'mod_multilangstatus', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
-(84, 'Smart Search Module', '', '', 2, 'sidebar-left', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_finder', 1, 1, '{"searchfilter":"","show_autosuggest":"1","show_advanced":"0","show_label":"0","alt_label":"","show_button":"1","opensearch":"1","opensearch_title":"","set_itemid":"0","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(86, 'Joomla Version', '', '', 1, 'status', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_version', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
-(87, 'All Front End  Views', '', '', 2, 'sidebar-right', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"frontendviews","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(88, 'All Modules', '', '', 1, 'sidebar-left', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"modules","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(89, 'Fruit Shop', '', '', 1, 'sidebar-right', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"fruitshop","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(90, 'Custom Module', '', '<p>Example custom module for the testing data.</p>', 5, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 1, '{"prepare_content":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
-(91, 'Admin Feed Module', '', '', 6, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 'mod_feed', 1, 1, '{"rssurl":"http:\\/\\/feeds.joomla.org\\/JoomlaAnnouncements","rssdesc":"1","rssimage":"1","rssitems":"3","rssitemdesc":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
-(92, 'Statistics', '', '', 3, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_stats_admin', 1, 1, '{"serverinfo":"1","siteinfo":"1","counter":"1","increase":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
-(93, 'Popular Tags', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_tags_popular', 1, 1, '{"maximum":"5","timeframe":"alltime","order_value":"count","order_direction":"1","display_count":0,"no_results_text":"0","minsize":1,"maxsize":2,"layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(94, 'Similar Tags', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_tags_similar', 1, 1, '{"maximum":"5","matchtype":"any","layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(95, 'Syndicate Feeds', '', '', 1, 'position-8', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_syndicate', 1, 1, '{"display_text":1,"text":"Feed Entries","format":"rss","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(97, 'Similar Tags 2', '', '', 1, 'position-8', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_tags_similar', 1, 1, '{"maximum":"5","matchtype":"any","layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(98, 'Top-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-a', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(99, 'Top-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-a', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(100, 'Top-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-a', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-secondary","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(101, 'Top-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-a', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-info","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(102, 'Top-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-b', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-primary","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(103, 'Top-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-b', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-success","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(104, 'Top-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-b', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-danger","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(105, 'Top-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-b', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-warning","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(106, 'Main-top', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Main-top</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'main-top', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"12","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(110, 'Bottom-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Bottom-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-a', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-primary text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(111, 'Main-bottom', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Main-bottom</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'main-bottom', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"12","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(112, 'Bottom-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Bottom-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-a', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-info text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(113, 'Bottom-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Bottom-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-a', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-success text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(114, 'Bottom-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Bottom-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-a', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-warning text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(115, 'Bottom-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span><span class="badge badge-primary">New</span></p>\r\n<p class="demo-title">Bottom-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-b', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(116, 'Bottom-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span><span class="badge badge-info">New</span></p>\r\n<p class="demo-title">Bottom-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-b', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(117, 'Bottom-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span><span class="badge badge-success">New</span></p>\r\n<p class="demo-title">Bottom-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-b', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(118, 'Bottom-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span><span class="badge badge-default">New</span></p>\r\n<p class="demo-title">Bottom-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-b', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-danger text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(119, 'Banner', '', '<p><img src="images/banners/banner.jpg"></p>', 1, 'banner', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(120, 'Footer', '', '&copy; Joomla! CMS', 1, 'footer', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 1, '', 0, '*');
+(1, 'Main Menu', '', '', 1, 'sidebar-right', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(3, 'Popular Articles', '', '', 2, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_popular', 3, 1, '{"count":"5","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
+(4, 'Recently Added Articles', '', '', 1, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_latest', 3, 1, '{"count":"5","ordering":"c_dsc","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
+(8, 'Toolbar', '', '', 1, 'toolbar', 0, NULL, NULL, NULL, 1, 'mod_toolbar', 3, 1, '', 1, '*'),
+(9, 'Quick Icons', '', '', 1, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 3, 1, '', 1, '*'),
+(10, 'Logged-in Users', '', '', 4, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_logged', 3, 1, '{"count":"5","name":"1","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
+(12, 'Admin Menu', '', '', 1, 'menu', 0, NULL, NULL, NULL, 1, 'mod_menu', 3, 1, '{"layout":"","moduleclass_sfx":"","shownew":"1","showhelp":"1","cache":"0"}', 1, '*'),
+(14, 'User Status', '', '', 2, 'status', 0, NULL, NULL, NULL, 1, 'mod_status', 3, 1, '', 1, '*'),
+(15, 'Title', '', '', 1, 'title', 0, NULL, NULL, NULL, 1, 'mod_title', 3, 1, '', 1, '*'),
+(16, 'Login Form', '', '', 2, 'sidebar-right', 0, NULL, NULL, NULL, 1, 'mod_login', 1, 1, '{"pretext":"","posttext":"","login":"","logout":"","greeting":"1","profilelink":"0","name":"0","usetext":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"card-title","style":"Cassiopeia-cardGrey"}', 0, '*'),
+(17, 'Breadcrumbs', '', '', 1, 'breadcrumbs', 0, NULL, NULL, NULL, 1, 'mod_breadcrumbs', 1, 1, '{"moduleclass_sfx":"","showHome":"1","homeText":"","showComponent":"1","separator":"","cache":"0","cache_time":"0","cachemode":"itemid"}', 0, '*'),
+(18, 'Book Store', '', '', 1, 'position-10', 0, NULL, NULL, NULL, 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"3","catid":[""],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Books!","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
+(19, 'User Menu', '', '', 3, 'sidebar-right', 0, NULL, NULL, NULL, 1, 'mod_menu', 2, 1, '{"menutype":"usermenu","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'),
+(20, 'Top', '', '', 1, 'menu', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"top","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":" navbar-nav mr-auto","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(22, 'Australian Parks ', '', '', 2, 'position-5', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"parks","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, 'en-GB'),
+(23, 'A Deep Menu', '', '', 4, 'sidebar-right', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"aboutjoomla","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(25, 'Site Map', '', '', 1, 'sitemapload', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 0, '{"menutype":"mainmenu","startLevel":"2","endLevel":"3","showAllChildren":"1","tag_id":"","class_sfx":"sitemap","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'),
+(26, 'This Site', '', '', 5, 'sidebar-right', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","base":"","startLevel":"1","endLevel":"1","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(27, 'Archived Articles', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_articles_archive', 1, 1, '{"count":"10","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(28, 'Latest News', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_articles_latest', 1, 1, '{"catid":["19"],"count":"5","show_featured":"","ordering":"c_dsc","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(29, 'Articles Most Read', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_articles_popular', 1, 1, '{"catid":["26","29"],"count":"5","show_front":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(30, 'Feed Display', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_feed', 1, 1, '{"rssurl":"http:\\/\\/feeds.joomla.org\\/JoomlaMagazine","rssdesc":"1","rssimage":"1","rssitems":"3","rssitemdesc":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
+(31, 'News Flash', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_articles_news', 1, 1, '{"catid":["19"],"image":"0","item_title":"0","link_titles":"","item_heading":"h4","showLastSeparator":"1","readmore":"1","count":"1","ordering":"a.publish_up","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'),
+(33, 'Random Image', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_random_image', 1, 1, '{"type":"jpg","folder":"images\\/sampledata\\/parks\\/animals","link":"","width":"180","height":"","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 0, '*'),
+(34, 'Articles Related Items', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_related_items', 1, 1, '{"showDate":"0","layout":"_:default","moduleclass_sfx":"","owncache":"1"}', 0, '*'),
+(36, 'Statistics', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_stats', 1, 1, '{"serverinfo":"1","siteinfo":"1","counter":"1","increase":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(37, 'Syndicate Feeds', '', '', 1, 'syndicateload', 0, NULL, NULL, NULL, 1, 'mod_syndicate', 1, 1, '{"text":"Feed Entries","format":"rss","layout":"","moduleclass_sfx":"","cache":"0"}', 0, '*'),
+(38, 'Users Latest', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_users_latest', 1, 1, '{"shownumber":"5","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"static"}', 0, '*'),
+(39, 'Who\'s Online', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_whosonline', 1, 1, '{"showmode":"2","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 0, '*'),
+(40, 'Wrapper', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_wrapper', 1, 1, '{"url":"https:\\/\\/www.youtube.com\\/embed\\/vb2eObvmvdI","add":"1","scrolling":"auto","width":"100%","height":"390","height_auto":"1","target":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(41, 'Footer', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_footer', 1, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(45, 'Menu Example', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'),
+(47, 'Latest Park Blogs', '', '', 6, 'sidebar-right', 0, NULL, NULL, NULL, 1, 'mod_articles_latest', 1, 1, '{"catid":["27"],"count":"5","ordering":"c_dsc","user_id":"0","show_front":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, 'en-GB'),
+(48, 'Custom', '', '<p>This is a custom module. That means you can enter whatever content you want.</p>', 1, '', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 1, '{"prepare_content":"1","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(52, 'Breadcrumbs', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_breadcrumbs', 1, 1, '{"showHere":"1","showHome":"1","homeText":"Home","showLast":"1","separator":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"0","cachemode":"itemid"}', 0, '*'),
+(56, 'Banners', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_banners', 1, 1, '{"target":"1","count":"1","cid":"1","catid":["15"],"tag_search":"0","ordering":"random","header_text":"","footer_text":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
+(57, 'Fruit Shop', '', '', 3, 'position-5', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"fruitshop","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'),
+(58, 'Special!', '', '<h1>This week we have a special, half price on delicious oranges!</h1><div>Only for our special customers!</div><div>Use the code: Joomla! when ordering</div><p><em>This module can only be seen by people in the customers group or higher.</em></p>', 1, 'position-12', 0, NULL, NULL, NULL, 1, 'mod_custom', 4, 1, '{"prepare_content":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(61, 'Articles Categories', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_articles_categories', 1, 1, '{"parent":"29","show_description":"0","show_children":"0","count":"0","maxlevel":"0","layout":"_:default","item_heading":"4","moduleclass_sfx":"","owncache":"1","cache_time":"900"}', 0, '*'),
+(63, 'Search', '', '', 1, 'search', 0, '2017-03-22 16:31:37', NULL, NULL, 1, 'mod_search', 1, 1, '{"label":"","text":"","button":"0","imagebutton":"1","button_text":"","opensearch":"1","opensearch_title":"","set_itemid":"0","layout":"_:default","moduleclass_sfx":" hidden-md-down","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(64, 'Language Switcher', '', '', 1, 'sidebar-left', 0, NULL, NULL, NULL, 0, 'mod_languages', 1, 1, '{"header_text":"","footer_text":"","dropdown":"0","dropdownimage":"1","lineheight":"0","image":"1","show_active":"1","full_name":"1","inline":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(65, 'About Fruit Shop', '', '<p>The Fruit Shop site shows a number of Joomla! features.</p><p>The template uses classes in cascading style sheets to change the layout of items, such as creating the horizontal alphabetical list in the Fruit Encyclopedia.</p><p> </p>', 1, 'position-4', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 1, '{"prepare_content":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(67, 'Extensions', '', '', 2, 'sidebar-right', 0, NULL, NULL, NULL, 0, 'mod_menu', 1, 1, '{"menutype":"aboutjoomla","startLevel":"1","endLevel":"6","showAllChildren":"1","tag_id":"","class_sfx":"-menu","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'),
+(68, 'About Parks', '', '<p>The Parks sample site is designed as a simple site that can be routinely updated from the front end of Joomla!.</p><p>As a site, it is largely focused on a blog which can be updated using the front end article submission.</p><p>New weblinks can also be added through the front end.</p><p>A simple image gallery uses com_content with thumbnails displayed in a blog layout and full size images shown in article layout.</p><p>The Parks site features the language switch module. All of the content and modules are tagged as English (en-GB). If a second language pack is added with sample data this can be filtered using the language switch.</p><p>Parks uses HTML5 which is a major web standard (along with XHTML which is used in other areas of sample data).</p>', 2, 'position-4', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 1, '{"prepare_content":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(69, 'Articles Category', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_articles_category', 1, 1, '{"mode":"normal","show_on_article_page":"1","show_front":"show","count":"0","category_filtering_type":"1","catid":["72"],"show_child_category_articles":"0","levels":"1","author_filtering_type":"1","created_by":[""],"author_alias_filtering_type":"1","created_by_alias":[""],"excluded_articles":"","date_filtering":"off","date_field":"a.created","start_date_range":"","end_date_range":"","relative_date":"30","article_ordering":"a.title","article_ordering_direction":"ASC","article_grouping":"none","article_grouping_direction":"ksort","month_year_format":"F Y","item_heading":"4","link_titles":"1","show_date":"0","show_date_field":"created","show_date_format":"Y-m-d H:i:s","show_category":"0","show_hits":"0","show_author":"0","show_introtext":"0","introtext_limit":"100","show_readmore":"0","show_readmore_title":"1","readmore_limit":"15","layout":"_:default","moduleclass_sfx":"","owncache":"1","cache_time":"900"}', 0, '*'),
+(77, 'Shop', '', '', 1, 'position-11', 0, NULL, NULL, NULL, 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"2","catid":["15"],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Shop!","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
+(78, 'Contribute', '', '', 1, 'position-9', 0, NULL, NULL, NULL, 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"1","catid":["15"],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Contribute! ","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
+(79, 'Multilanguage status', '', '', 1, '', 0, NULL, NULL, NULL, 0, 'mod_multilangstatus', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
+(84, 'Smart Search Module', '', '', 2, 'sidebar-left', 0, NULL, NULL, NULL, 1, 'mod_finder', 1, 1, '{"searchfilter":"","show_autosuggest":"1","show_advanced":"0","show_label":"0","alt_label":"","show_button":"1","opensearch":"1","opensearch_title":"","set_itemid":"0","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(86, 'Joomla Version', '', '', 1, 'status', 0, NULL, NULL, NULL, 1, 'mod_version', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
+(87, 'All Front End  Views', '', '', 2, 'sidebar-right', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"frontendviews","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(88, 'All Modules', '', '', 1, 'sidebar-left', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"modules","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(89, 'Fruit Shop', '', '', 1, 'sidebar-right', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"fruitshop","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(90, 'Custom Module', '', '<p>Example custom module for the testing data.</p>', 5, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 1, '{"prepare_content":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
+(91, 'Admin Feed Module', '', '', 6, 'cpanel', 0, NULL, NULL, NULL, 0, 'mod_feed', 1, 1, '{"rssurl":"http:\\/\\/feeds.joomla.org\\/JoomlaAnnouncements","rssdesc":"1","rssimage":"1","rssitems":"3","rssitemdesc":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
+(92, 'Statistics', '', '', 3, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_stats_admin', 1, 1, '{"serverinfo":"1","siteinfo":"1","counter":"1","increase":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
+(93, 'Popular Tags', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_tags_popular', 1, 1, '{"maximum":"5","timeframe":"alltime","order_value":"count","order_direction":"1","display_count":0,"no_results_text":"0","minsize":1,"maxsize":2,"layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(94, 'Similar Tags', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_tags_similar', 1, 1, '{"maximum":"5","matchtype":"any","layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(95, 'Syndicate Feeds', '', '', 1, 'position-8', 0, NULL, NULL, NULL, 1, 'mod_syndicate', 1, 1, '{"display_text":1,"text":"Feed Entries","format":"rss","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(97, 'Similar Tags 2', '', '', 1, 'position-8', 0, NULL, NULL, NULL, 1, 'mod_tags_similar', 1, 1, '{"maximum":"5","matchtype":"any","layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(98, 'Top-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-a', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(99, 'Top-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-a', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(100, 'Top-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-a', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-secondary","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(101, 'Top-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-a', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-info","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(102, 'Top-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-b', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-primary","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(103, 'Top-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-b', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-success","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(104, 'Top-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-b', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-danger","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(105, 'Top-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-b', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-warning","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(106, 'Main-top', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Main-top</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'main-top', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"12","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(110, 'Bottom-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Bottom-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-a', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-primary text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(111, 'Main-bottom', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Main-bottom</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'main-bottom', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"12","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(112, 'Bottom-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Bottom-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-a', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-info text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(113, 'Bottom-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Bottom-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-a', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-success text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(114, 'Bottom-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Bottom-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-a', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-warning text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(115, 'Bottom-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span><span class="badge badge-primary">New</span></p>\r\n<p class="demo-title">Bottom-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-b', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(116, 'Bottom-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span><span class="badge badge-info">New</span></p>\r\n<p class="demo-title">Bottom-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-b', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(117, 'Bottom-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span><span class="badge badge-success">New</span></p>\r\n<p class="demo-title">Bottom-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-b', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(118, 'Bottom-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span><span class="badge badge-default">New</span></p>\r\n<p class="demo-title">Bottom-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-b', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-danger text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(119, 'Banner', '', '<p><img src="images/banners/banner.jpg"></p>', 1, 'banner', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(120, 'Footer', '', '&copy; Joomla! CMS', 1, 'footer', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 1, '', 0, '*'),
+(121, 'Latest Actions', '', '', 0, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_latestactions', 6, 1, '{}', 1, '*');
+
 
 
 --
@@ -833,7 +837,8 @@ INSERT INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES
 (117, 435),
 (118, 435),
 (119, 435),
-(120, 0);
+(120, 0),
+(121, 0);
 
 --
 -- Dumping data for table `#__newsfeeds`
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index d10484f63e3da..86d2a7f381a91 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -35,7 +35,7 @@ COMMENT ON COLUMN "#__assets"."rules" IS 'JSON encoded access control.';
 --
 
 INSERT INTO "#__assets" ("id", "parent_id", "lft", "rgt", "level", "name", "title", "rules") VALUES
-(1, 0, 0, 121, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
+(1, 0, 0, 125, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.api":{"6":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
 (2, 1, 1, 2, 1, 'com_admin', 'com_admin', '{}'),
 (3, 1, 3, 6, 1, 'com_banners', 'com_banners', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
 (4, 1, 7, 8, 1, 'com_cache', 'com_cache', '{"core.admin":{"7":1},"core.manage":{"7":1}}'),
@@ -95,8 +95,13 @@ INSERT INTO "#__assets" ("id", "parent_id", "lft", "rgt", "level", "name", "titl
 (61, 56, 29, 30, 3, 'com_content.transition.1', 'Publish', '{}'),
 (62, 56, 31, 32, 3, 'com_content.transition.2', 'Unpublish', '{}'),
 (63, 56, 33, 34, 3, 'com_content.transition.3', 'Archive', '{}'),
-(64, 56, 35, 36, 3, 'com_content.transition.4', 'Trash', '{}');
-SELECT setval('#__assets_id_seq', 65, false);
+(64, 56, 35, 36, 3, 'com_content.transition.4', 'Trash', '{}'),
+(65, 1, 105, 106, 1, 'com_privacy', 'com_privacy', '{}'),
+(66, 1, 107, 108, 1, 'com_actionlogs', 'com_actionlogs', '{}'),
+(67, 18, 74, 75, 2, 'com_modules.module.88', 'Latest Actions', '{}'),
+(68, 18, 76, 77, 2, 'com_modules.module.89', 'Privacy Dashboard', '{}');
+
+SELECT setval('#__assets_id_seq', 69, false);
 
 --
 -- Table structure for table `#__associations`
@@ -358,6 +363,7 @@ CREATE TABLE IF NOT EXISTS "#__content" (
   "featured" smallint DEFAULT 0 NOT NULL,
   "language" varchar(7) DEFAULT '' NOT NULL,
   "xreference" varchar(50) DEFAULT '' NOT NULL,
+  "note" varchar(255) DEFAULT '' NOT NULL,
   PRIMARY KEY ("id")
 );
 CREATE INDEX "#__content_idx_access" ON "#__content" ("access");
@@ -422,7 +428,7 @@ COMMENT ON COLUMN "#__content_types"."content_history_options" IS 'JSON string f
 --
 
 INSERT INTO "#__content_types" ("type_id", "type_title", "type_alias", "table", "rules", "field_mappings", "router", "content_history_options") VALUES
-(1, 'Article', 'com_content.article', '{"special":{"dbtable":"#__content","key":"id","type":"Content","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"introtext", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"attribs", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"asset_id"}, "special":{"fulltext":"fulltext"}}', 'ContentHelperRoute::getArticleRoute', '{"formFile":"administrator\\/components\\/com_content\\/forms\\/article.xml", "hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'),
+(1, 'Article', 'com_content.article', '{"special":{"dbtable":"#__content","key":"id","type":"Content","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"introtext", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"attribs", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"asset_id", "note":"note"}, "special":{"fulltext":"fulltext"}}', 'ContentHelperRoute::getArticleRoute', '{"formFile":"administrator\\/components\\/com_content\\/forms\\/article.xml", "hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'),
 (2, 'Contact', 'com_contact.contact', '{"special":{"dbtable":"#__contact_details","key":"id","type":"Contact","prefix":"ContactTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"address", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"image", "core_urls":"webpage", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special":{"con_position":"con_position","suburb":"suburb","state":"state","country":"country","postcode":"postcode","telephone":"telephone","fax":"fax","misc":"misc","email_to":"email_to","default_con":"default_con","user_id":"user_id","mobile":"mobile","sortname1":"sortname1","sortname2":"sortname2","sortname3":"sortname3"}}', 'ContactHelperRoute::getContactRoute', '{"formFile":"administrator\\/components\\/com_contact\\/forms\\/contact.xml","hideFields":["default_con","checked_out","checked_out_time","version","xreference"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"], "displayLookup":[ {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ] }'),
 (3, 'Newsfeed', 'com_newsfeeds.newsfeed', '{"special":{"dbtable":"#__newsfeeds","key":"id","type":"Newsfeed","prefix":"NewsfeedsTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special":{"numarticles":"numarticles","cache_time":"cache_time","rtl":"rtl"}}', 'NewsfeedsHelperRoute::getNewsfeedRoute', '{"formFile":"administrator\\/components\\/com_newsfeeds\\/forms\\/newsfeed.xml","hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'),
 (4, 'User', 'com_users.user', '{"special":{"dbtable":"#__users","key":"id","type":"User","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"null","core_alias":"username","core_created_time":"registerdate","core_modified_time":"lastvisitDate","core_body":"null", "core_hits":"null","core_publish_up":"null","core_publish_down":"null","access":"null", "core_params":"params", "core_featured":"null", "core_metadata":"null", "core_language":"null", "core_images":"null", "core_urls":"null", "core_version":"null", "core_ordering":"null", "core_metakey":"null", "core_metadesc":"null", "core_catid":"null", "core_xreference":"null", "asset_id":"null"}, "special":{}}', '', ''),
@@ -449,7 +455,7 @@ CREATE TABLE IF NOT EXISTS "#__contentitem_tag_map" (
   "tag_id" integer NOT NULL,
   "tag_date" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
   "type_id" integer NOT NULL,
- CONSTRAINT "#__uc_itemnametagid" UNIQUE ("type_id", "content_item_id", "tag_id")
+ PRIMARY KEY ("type_id", "content_item_id", "tag_id")
 );
 CREATE INDEX "#__contentitem_tag_map_idx_tag_type" ON "#__contentitem_tag_map" ("tag_id", "type_id");
 CREATE INDEX "#__contentitem_tag_map_idx_date_id" ON "#__contentitem_tag_map" ("tag_date", "tag_id");
@@ -501,6 +507,7 @@ CREATE TABLE IF NOT EXISTS "#__extensions" (
   "name" varchar(100) NOT NULL,
   "type" varchar(20) NOT NULL,
   "element" varchar(100) NOT NULL,
+  "changelogurl" text,
   "folder" varchar(100) NOT NULL,
   "client_id" smallint NOT NULL,
   "enabled" smallint DEFAULT 0 NOT NULL,
@@ -541,7 +548,7 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem
 (18, 0, 'com_plugins', 'component', 'com_plugins', '', 1, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (19, 0, 'com_search', 'component', 'com_search', '', 1, 1, 1, 0, '', '{"enabled":"0","search_phrases":"1","search_areas":"1","show_date":"1","opensearch_name":"","opensearch_description":""}', 0, '1970-01-01 00:00:00', 0, 0),
 (20, 0, 'com_templates', 'component', 'com_templates', '', 1, 1, 1, 1, '', '{"template_positions_display":"0","upload_limit":"10","image_formats":"gif,bmp,jpg,jpeg,png","source_formats":"txt,less,ini,xml,js,php,css,scss,sass,json","font_formats":"woff,ttf,otf","compressed_formats":"zip"}', 0, '1970-01-01 00:00:00', 0, 0),
-(22, 0, 'com_content', 'component', 'com_content', '', 1, 1, 0, 1, '', '{"article_layout":"_:default","show_title":"1","link_titles":"1","show_intro":"1","show_category":"1","link_category":"1","show_parent_category":"0","link_parent_category":"0","show_author":"1","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"1","show_item_navigation":"1","show_vote":"0","show_readmore":"1","show_readmore_title":"1","readmore_limit":"100","show_icons":"1","show_print_icon":"1","show_email_icon":"0","show_hits":"1","show_noauth":"0","show_publishing_options":"1","show_article_options":"1","save_history":"1","history_limit":10,"show_urls_images_frontend":"0","show_urls_images_backend":"1","targeta":0,"targetb":0,"targetc":0,"float_intro":"left","float_fulltext":"left","category_layout":"_:blog","show_category_title":"0","show_description":"0","show_description_image":"0","maxLevel":"1","show_empty_categories":"0","show_no_articles":"1","show_subcat_desc":"1","show_cat_num_articles":"0","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"1","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"0","show_subcategory_content":"0","show_pagination_limit":"1","filter_field":"hide","show_headings":"1","list_show_date":"0","date_format":"","list_show_hits":"1","list_show_author":"1","orderby_pri":"order","orderby_sec":"rdate","order_date":"published","show_pagination":"2","show_pagination_results":"1","show_feed_link":"1","feed_summary":"0"}', 0, '1970-01-01 00:00:00', 0, 0),
+(22, 0, 'com_content', 'component', 'com_content', '', 1, 1, 0, 1, '', '{"article_layout":"_:default","show_title":"1","link_titles":"1","show_intro":"1","show_category":"1","link_category":"1","show_parent_category":"0","link_parent_category":"0","show_author":"1","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"1","show_item_navigation":"1","show_vote":"0","show_readmore":"1","show_readmore_title":"1","readmore_limit":"100","show_icons":"1","show_print_icon":"1","show_email_icon":"0","show_hits":"1","show_noauth":"0","show_publishing_options":"1","show_article_options":"1","save_history":"1","history_limit":10,"show_urls_images_frontend":"0","show_urls_images_backend":"1","targeta":0,"targetb":0,"targetc":0,"float_intro":"left","float_fulltext":"left","category_layout":"_:blog","show_category_title":"0","show_description":"0","show_description_image":"0","maxLevel":"1","show_empty_categories":"0","show_no_articles":"1","show_subcat_desc":"1","show_cat_num_articles":"0","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"1","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","show_subcategory_content":"0","show_pagination_limit":"1","filter_field":"hide","show_headings":"1","list_show_date":"0","date_format":"","list_show_hits":"1","list_show_author":"1","orderby_pri":"order","orderby_sec":"rdate","order_date":"published","show_pagination":"2","show_pagination_results":"1","show_feed_link":"1","feed_summary":"0"}', 0, '1970-01-01 00:00:00', 0, 0),
 (23, 0, 'com_config', 'component', 'com_config', '', 1, 1, 0, 1, '', '{"filters":{"1":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"6":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"7":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"2":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"3":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"4":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"5":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"10":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"12":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"8":{"filter_type":"NONE","filter_tags":"","filter_attributes":""}}}', 0, '1970-01-01 00:00:00', 0, 0),
 (24, 0, 'com_redirect', 'component', 'com_redirect', '', 1, 1, 0, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (25, 0, 'com_users', 'component', 'com_users', '', 1, 1, 0, 1, '', '{"allowUserRegistration":"0","new_usertype":"2","guest_usergroup":"9","sendpassword":"0","useractivation":"2","mail_to_admin":"1","captcha":"","frontend_userparams":"1","site_language":"0","change_login_name":"0","reset_count":"10","reset_time":"1","minimum_length":"4","minimum_integers":"0","minimum_symbols":"0","minimum_uppercase":"0","save_history":"1","history_limit":5,"mailSubjectPrefix":"","mailBodySuffix":""}', 0, '1970-01-01 00:00:00', 0, 0),
@@ -553,8 +560,10 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem
 (32, 0, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (33, 0, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (34, 0, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(35, 0, 'com_workflow', 'component', 'com_workflow', '', 1, 1, 0, 1, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
-(36, 0, 'com_csp', 'component', 'com_csp', '', 1, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(35, 0, 'com_privacy', 'component', 'com_privacy', '', 1, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(36, 0, 'com_actionlogs', 'component', 'com_actionlogs', '', 1, 1, 1, 1, '', '{"ip_logging":0,"csv_delimiter":",","loggable_extensions":["com_banners","com_cache","com_categories","com_config","com_contact","com_content","com_installer","com_media","com_menus","com_messages","com_modules","com_newsfeeds","com_plugins","com_redirect","com_tags","com_templates","com_users"]}', 0, '1970-01-01 00:00:00', 0, 0),
+(37, 0, 'com_workflow', 'component', 'com_workflow', '', 1, 1, 0, 1, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(38, 0, 'com_csp', 'component', 'com_csp', '', 1, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (103, 0, 'Joomla! Platform', 'library', 'joomla', '', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (106, 0, 'PHPass', 'library', 'phpass', '', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (200, 0, 'mod_articles_archive', 'module', 'mod_articles_archive', '', 0, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
@@ -596,6 +605,9 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem
 (315, 0, 'mod_stats_admin', 'module', 'mod_stats_admin', '', 1, 1, 1, 0, '', '{"serverinfo":"0","siteinfo":"0","counter":"0","increase":"0","cache":"1","cache_time":"900","cachemode":"static"}', 0, '1970-01-01 00:00:00', 0, 0),
 (316, 0, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', 0, '1970-01-01 00:00:00', 0, 0),
 (317, 0, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '', '{"maximum":"5","matchtype":"any","owncache":"1"}', 0, '1970-01-01 00:00:00', 0, 0),
+(318, 0, 'mod_sampledata', 'module', 'mod_sampledata', '', 1, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(319, 0, 'mod_latestactions', 'module', 'mod_latestactions', '', 1, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(320, 0, 'mod_privacy_dashboard', 'module', 'mod_privacy_dashboard', '', 1, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
 (401, 0, 'plg_authentication_joomla', 'plugin', 'joomla', 'authentication', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (402, 0, 'plg_authentication_ldap', 'plugin', 'ldap', 'authentication', 0, 0, 1, 0, '', '{"host":"","port":"389","use_ldapV3":"0","negotiate_tls":"0","no_referrals":"0","auth_method":"bind","base_dn":"","search_string":"","users_dn":"","username":"admin","password":"bobby7","ldap_fullname":"fullName","ldap_email":"mail","ldap_uid":"uid"}', 0, '1970-01-01 00:00:00', 3, 0),
 (403, 0, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 1, 0),
@@ -672,26 +684,44 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem
 (478, 0, 'plg_editors-xtd_fields', 'plugin', 'fields', 'editors-xtd', 0, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (479, 0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (480, 0, 'plg_system_sessiongc', 'plugin', 'sessiongc', 'system', 0, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(481, 0, 'plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
-(482, 0, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
-(483, 0, 'plg_filesystem_local', 'plugin', 'local', 'filesystem', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
-(484, 0, 'plg_media-action_crop', 'plugin', 'crop', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
-(485, 0, 'plg_media-action_resize', 'plugin', 'resize', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
-(486, 0, 'plg_media-action_rotate', 'plugin', 'rotate', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
-(487, 0, 'plg_installer_webinstaller', 'plugin', 'webinstaller', 'installer', 0, 1, 1, 0, '', '{"tab_position":"1"}', 0, '1970-01-01 00:00:00', 0, 0),
-(488, 0, 'plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
-(489, 0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(490, 0, 'plg_extension_namespacemap', 'plugin', 'namespacemap', 'extension', 0, 1, 1, 1, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
-(491, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 4, 0),
-(492, 0, 'plg_quickicon_overridecheck', 'plugin', 'overridecheck', 'quickicon', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(481, 0, 'plg_fields_repeatable', 'plugin', 'repeatable', 'fields', 0, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(482, 0, 'plg_content_confirmconsent', 'plugin', 'confirmconsent', 'content', 0, 0, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(483, 0, 'plg_system_actionlogs', 'plugin', 'actionlogs', 'system', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(484, 0, 'plg_actionlog_joomla', 'plugin', 'joomla', 'actionlog', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(485, 0, 'plg_system_privacyconsent', 'plugin', 'privacyconsent', 'system', 0, 0, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(486, 0, 'plg_system_logrotation', 'plugin', 'logrotation', 'system', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(487, 0, 'plg_privacy_user', 'plugin', 'user', 'privacy', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(488, 0, 'plg_quickicon_privacycheck', 'plugin', 'privacycheck', 'quickicon', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(489, 0, 'plg_user_terms', 'plugin', 'terms', 'user', 0, 0, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(490, 0, 'plg_privacy_contact', 'plugin', 'contact', 'privacy', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(491, 0, 'plg_privacy_content', 'plugin', 'content', 'privacy', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(492, 0, 'plg_privacy_message', 'plugin', 'message', 'privacy', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(493, 0, 'plg_privacy_actionlogs', 'plugin', 'actionlogs', 'privacy', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(494, 0, 'plg_captcha_recaptcha_invisible', 'plugin', 'recaptcha_invisible', 'captcha', 0, 0, 1, 0, '', '{"public_key":"","private_key":"","theme":"clean"}', 0, '1970-01-01 00:00:00', 0, 0),
+(495, 0, 'plg_privacy_consents', 'plugin', 'consents', 'privacy', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(496, 0, 'plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(497, 0, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(498, 0, 'plg_installer_webinstaller', 'plugin', 'webinstaller', 'installer', 0, 1, 1, 0, '', '{"tab_position":"1"}', 0, '1970-01-01 00:00:00', 0, 0),
+(499, 0, 'plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(500, 0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(501, 0, 'plg_extension_namespacemap', 'plugin', 'namespacemap', 'extension', 0, 1, 1, 1, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(502, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 4, 0),
+(503, 0, 'plg_quickicon_overridecheck', 'plugin', 'overridecheck', 'quickicon', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(504, 0, 'plg_extension_finder', 'plugin', 'finder', 'extension', 0, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(505, 0, 'plg_system_skipto', 'plugin', 'skipto', 'system', 0, 1, 1, 0, '', '{}',  0, '1970-01-01 00:00:00', 0, 0),
+(509, 0, 'atum', 'template', 'atum', '', 1, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(510, 0, 'cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '', '{"logoFile":"","fluidContainer":"0","sidebarLeftWidth":"3","sidebarRightWidth":"3"}', 0, '1970-01-01 00:00:00', 0, 0),
 (600, 802, 'English (en-GB)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (601, 802, 'English (en-GB)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (700, 0, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(802, 0, 'English (en-GB) Language Pack', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0, '');
-
-INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
-(509, 0, 'atum', 'template', 'atum', '', 1, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(510, 0, 'cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '', '{"logoFile":"","fluidContainer":"0","sidebarLeftWidth":"3","sidebarRightWidth":"3"}', 0, '1970-01-01 00:00:00', 0, 0);
+(802, 0, 'English (en-GB) Language Pack', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0),
+-- Temporarily giving some plugins IDs of 900 until we remove all and just use auto-increment.
+(900, 0, 'plg_api-authentication_basic', 'plugin', 'basic', 'api-authentication', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(901, 0, 'plg_webservices_content', 'plugin', 'content', 'webservices', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(902, 0, 'plg_filesystem_local', 'plugin', 'local', 'filesystem', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(903, 0, 'plg_media-action_crop', 'plugin', 'crop', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(904, 0, 'plg_media-action_resize', 'plugin', 'resize', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
+(905, 0, 'plg_media-action_rotate', 'plugin', 'rotate', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0);
 
 SELECT setval('#__extensions_extension_id_seq', 10000, false);
 
@@ -876,24 +906,31 @@ CREATE INDEX "#__finder_logging_idx_searchterm" on "#__finder_logging" ("searcht
 CREATE TABLE IF NOT EXISTS "#__finder_taxonomy" (
   "id" serial NOT NULL,
   "parent_id" integer DEFAULT 0 NOT NULL,
-  "title" varchar(255) NOT NULL,
+  "lft" integer DEFAULT 0 NOT NULL,
+  "rgt" integer DEFAULT 0 NOT NULL,
+  "level" integer DEFAULT 0 NOT NULL,
+  "path" VARCHAR(400) NOT NULL DEFAULT '',
+  "title" VARCHAR(255) NOT NULL DEFAULT '',
+  "alias" VARCHAR(400) NOT NULL DEFAULT '',
   "state" smallint DEFAULT 1 NOT NULL,
-  "access" smallint DEFAULT 0 NOT NULL,
-  "ordering" smallint DEFAULT 0 NOT NULL,
+  "access" smallint DEFAULT 1 NOT NULL,
+  "language" varchar(7) DEFAULT '' NOT NULL,
   PRIMARY KEY ("id")
 );
-CREATE INDEX "#__finder_taxonomy_parent_id" on "#__finder_taxonomy" ("parent_id");
 CREATE INDEX "#__finder_taxonomy_state" on "#__finder_taxonomy" ("state");
-CREATE INDEX "#__finder_taxonomy_ordering" on "#__finder_taxonomy" ("ordering");
 CREATE INDEX "#__finder_taxonomy_access" on "#__finder_taxonomy" ("access");
+CREATE INDEX "#__finder_taxonomy_path" on "#__finder_taxonomy" ("path");
+CREATE INDEX "#__finder_taxonomy_lft_rgt" on "#__finder_taxonomy" ("lft", "rgt");
+CREATE INDEX "#__finder_taxonomy_alias" on "#__finder_taxonomy" ("alias");
+CREATE INDEX "#__finder_taxonomy_language" on "#__finder_taxonomy" ("language");
 CREATE INDEX "#__finder_taxonomy_idx_parent_published" on "#__finder_taxonomy" ("parent_id", "state", "access");
 
 --
 -- Dumping data for table `#__finder_taxonomy`
 --
 
-INSERT INTO "#__finder_taxonomy" ("id", "parent_id", "title", "state", "access", "ordering") VALUES
-(1, 0, 'ROOT', 0, 0, 0);
+INSERT INTO "#__finder_taxonomy" ("id", "parent_id", "lft", "rgt", "level", "path", "title", "alias", "state", "access", "language") VALUES
+(1, 0, 0, 1, 0, '', 'ROOT', 'root', 1, 1, '*');
 
 SELECT setval('#__finder_taxonomy_id_seq', 2, false);
 
@@ -929,6 +966,7 @@ CREATE TABLE IF NOT EXISTS "#__finder_terms" (
 CREATE INDEX "#__finder_terms_idx_term_phrase" on "#__finder_terms" ("term", "phrase");
 CREATE INDEX "#__finder_terms_idx_stem_phrase" on "#__finder_terms" ("stem", "phrase");
 CREATE INDEX "#__finder_terms_idx_soundex_phrase" on "#__finder_terms" ("soundex", "phrase");
+CREATE INDEX "#__finder_terms_idx_language" on "#__finder_terms" ("language");
 
 --
 -- Table structure for table `#__finder_terms_common`
@@ -936,7 +974,9 @@ CREATE INDEX "#__finder_terms_idx_soundex_phrase" on "#__finder_terms" ("soundex
 
 CREATE TABLE IF NOT EXISTS "#__finder_terms_common" (
   "term" varchar(75) NOT NULL,
-  "language" varchar(7) DEFAULT '' NOT NULL
+  "language" varchar(7) DEFAULT '' NOT NULL,
+  "custom" integer DEFAULT 0 NOT NULL,
+  CONSTRAINT "#__finder_terms_idx_term" UNIQUE ("term", "language")
 );
 CREATE INDEX "#__finder_terms_common_idx_word_lang" on "#__finder_terms_common" ("term", "language");
 CREATE INDEX "#__finder_terms_common_idx_lang" on "#__finder_terms_common" ("language");
@@ -945,117 +985,181 @@ CREATE INDEX "#__finder_terms_common_idx_lang" on "#__finder_terms_common" ("lan
 -- Dumping data for table `#__finder_terms_common`
 --
 
-INSERT INTO "#__finder_terms_common" ("term", "language") VALUES
-('a', 'en-GB'),
-('about', 'en-GB'),
-('after', 'en-GB'),
-('ago', 'en-GB'),
-('all', 'en-GB'),
-('am', 'en-GB'),
-('an', 'en-GB'),
-('and', 'en-GB'),
-('any', 'en-GB'),
-('are', 'en-GB'),
-('aren''t', 'en-GB'),
-('as', 'en-GB'),
-('at', 'en-GB'),
-('be', 'en-GB'),
-('but', 'en-GB'),
-('by', 'en-GB'),
-('for', 'en-GB'),
-('from', 'en-GB'),
-('get', 'en-GB'),
-('go', 'en-GB'),
-('how', 'en-GB'),
-('if', 'en-GB'),
-('in', 'en-GB'),
-('into', 'en-GB'),
-('is', 'en-GB'),
-('isn''t', 'en-GB'),
-('it', 'en-GB'),
-('its', 'en-GB'),
-('me', 'en-GB'),
-('more', 'en-GB'),
-('most', 'en-GB'),
-('must', 'en-GB'),
-('my', 'en-GB'),
-('new', 'en-GB'),
-('no', 'en-GB'),
-('none', 'en-GB'),
-('not', 'en-GB'),
-('nothing', 'en-GB'),
-('of', 'en-GB'),
-('off', 'en-GB'),
-('often', 'en-GB'),
-('old', 'en-GB'),
-('on', 'en-GB'),
-('onc', 'en-GB'),
-('once', 'en-GB'),
-('only', 'en-GB'),
-('or', 'en-GB'),
-('other', 'en-GB'),
-('our', 'en-GB'),
-('ours', 'en-GB'),
-('out', 'en-GB'),
-('over', 'en-GB'),
-('page', 'en-GB'),
-('she', 'en-GB'),
-('should', 'en-GB'),
-('small', 'en-GB'),
-('so', 'en-GB'),
-('some', 'en-GB'),
-('than', 'en-GB'),
-('thank', 'en-GB'),
-('that', 'en-GB'),
-('the', 'en-GB'),
-('their', 'en-GB'),
-('theirs', 'en-GB'),
-('them', 'en-GB'),
-('then', 'en-GB'),
-('there', 'en-GB'),
-('these', 'en-GB'),
-('they', 'en-GB'),
-('this', 'en-GB'),
-('those', 'en-GB'),
-('thus', 'en-GB'),
-('time', 'en-GB'),
-('times', 'en-GB'),
-('to', 'en-GB'),
-('too', 'en-GB'),
-('true', 'en-GB'),
-('under', 'en-GB'),
-('until', 'en-GB'),
-('up', 'en-GB'),
-('upon', 'en-GB'),
-('use', 'en-GB'),
-('user', 'en-GB'),
-('users', 'en-GB'),
-('version', 'en-GB'),
-('very', 'en-GB'),
-('via', 'en-GB'),
-('want', 'en-GB'),
-('was', 'en-GB'),
-('way', 'en-GB'),
-('were', 'en-GB'),
-('what', 'en-GB'),
-('when', 'en-GB'),
-('where', 'en-GB'),
-('which', 'en-GB'),
-('who', 'en-GB'),
-('whom', 'en-GB'),
-('whose', 'en-GB'),
-('why', 'en-GB'),
-('wide', 'en-GB'),
-('will', 'en-GB'),
-('with', 'en-GB'),
-('within', 'en-GB'),
-('without', 'en-GB'),
-('would', 'en-GB'),
-('yes', 'en-GB'),
-('yet', 'en-GB'),
-('you', 'en-GB'),
-('your', 'en-GB'),
-('yours', 'en-GB');
+INSERT INTO "#__finder_terms_common" ("term", "language", "custom") VALUES
+('i', 'en', 0),
+('me', 'en', 0),
+('my', 'en', 0),
+('myself', 'en', 0),
+('we', 'en', 0),
+('our', 'en', 0),
+('ours', 'en', 0),
+('ourselves', 'en', 0),
+('you', 'en', 0),
+('your', 'en', 0),
+('yours', 'en', 0),
+('yourself', 'en', 0),
+('yourselves', 'en', 0),
+('he', 'en', 0),
+('him', 'en', 0),
+('his', 'en', 0),
+('himself', 'en', 0),
+('she', 'en', 0),
+('her', 'en', 0),
+('hers', 'en', 0),
+('herself', 'en', 0),
+('it', 'en', 0),
+('its', 'en', 0),
+('itself', 'en', 0),
+('they', 'en', 0),
+('them', 'en', 0),
+('their', 'en', 0),
+('theirs', 'en', 0),
+('themselves', 'en', 0),
+('what', 'en', 0),
+('which', 'en', 0),
+('who', 'en', 0),
+('whom', 'en', 0),
+('this', 'en', 0),
+('that', 'en', 0),
+('these', 'en', 0),
+('those', 'en', 0),
+('am', 'en', 0),
+('is', 'en', 0),
+('are', 'en', 0),
+('was', 'en', 0),
+('were', 'en', 0),
+('be', 'en', 0),
+('been', 'en', 0),
+('being', 'en', 0),
+('have', 'en', 0),
+('has', 'en', 0),
+('had', 'en', 0),
+('having', 'en', 0),
+('do', 'en', 0),
+('does', 'en', 0),
+('did', 'en', 0),
+('doing', 'en', 0),
+('would', 'en', 0),
+('should', 'en', 0),
+('could', 'en', 0),
+('ought', 'en', 0),
+('i\'m', 'en', 0),
+('you\'re', 'en', 0),
+('he\'s', 'en', 0),
+('she\'s', 'en', 0),
+('it\'s', 'en', 0),
+('we\'re', 'en', 0),
+('they\'re', 'en', 0),
+('i\'ve', 'en', 0),
+('you\'ve', 'en', 0),
+('we\'ve', 'en', 0),
+('they\'ve', 'en', 0),
+('i\'d', 'en', 0),
+('you\'d', 'en', 0),
+('he\'d', 'en', 0),
+('she\'d', 'en', 0),
+('we\'d', 'en', 0),
+('they\'d', 'en', 0),
+('i\'ll', 'en', 0),
+('you\'ll', 'en', 0),
+('he\'ll', 'en', 0),
+('she\'ll', 'en', 0),
+('we\'ll', 'en', 0),
+('they\'ll', 'en', 0),
+('isn\'t', 'en', 0),
+('aren\'t', 'en', 0),
+('wasn\'t', 'en', 0),
+('weren\'t', 'en', 0),
+('hasn\'t', 'en', 0),
+('haven\'t', 'en', 0),
+('hadn\'t', 'en', 0),
+('doesn\'t', 'en', 0),
+('don\'t', 'en', 0),
+('didn\'t', 'en', 0),
+('won\'t', 'en', 0),
+('wouldn\'t', 'en', 0),
+('shan\'t', 'en', 0),
+('shouldn\'t', 'en', 0),
+('can\'t', 'en', 0),
+('cannot', 'en', 0),
+('couldn\'t', 'en', 0),
+('mustn\'t', 'en', 0),
+('let\'s', 'en', 0),
+('that\'s', 'en', 0),
+('who\'s', 'en', 0),
+('what\'s', 'en', 0),
+('here\'s', 'en', 0),
+('there\'s', 'en', 0),
+('when\'s', 'en', 0),
+('where\'s', 'en', 0),
+('why\'s', 'en', 0),
+('how\'s', 'en', 0),
+('a', 'en', 0),
+('an', 'en', 0),
+('the', 'en', 0),
+('and', 'en', 0),
+('but', 'en', 0),
+('if', 'en', 0),
+('or', 'en', 0),
+('because', 'en', 0),
+('as', 'en', 0),
+('until', 'en', 0),
+('while', 'en', 0),
+('of', 'en', 0),
+('at', 'en', 0),
+('by', 'en', 0),
+('for', 'en', 0),
+('with', 'en', 0),
+('about', 'en', 0),
+('against', 'en', 0),
+('between', 'en', 0),
+('into', 'en', 0),
+('through', 'en', 0),
+('during', 'en', 0),
+('before', 'en', 0),
+('after', 'en', 0),
+('above', 'en', 0),
+('below', 'en', 0),
+('to', 'en', 0),
+('from', 'en', 0),
+('up', 'en', 0),
+('down', 'en', 0),
+('in', 'en', 0),
+('out', 'en', 0),
+('on', 'en', 0),
+('off', 'en', 0),
+('over', 'en', 0),
+('under', 'en', 0),
+('again', 'en', 0),
+('further', 'en', 0),
+('then', 'en', 0),
+('once', 'en', 0),
+('here', 'en', 0),
+('there', 'en', 0),
+('when', 'en', 0),
+('where', 'en', 0),
+('why', 'en', 0),
+('how', 'en', 0),
+('all', 'en', 0),
+('any', 'en', 0),
+('both', 'en', 0),
+('each', 'en', 0),
+('few', 'en', 0),
+('more', 'en', 0),
+('most', 'en', 0),
+('other', 'en', 0),
+('some', 'en', 0),
+('such', 'en', 0),
+('no', 'en', 0),
+('nor', 'en', 0),
+('not', 'en', 0),
+('only', 'en', 0),
+('own', 'en', 0),
+('same', 'en', 0),
+('so', 'en', 0),
+('than', 'en', 0),
+('too', 'en', 0),
+('very', 'en', 0);
 
 --
 -- Table structure for table `#__finder_tokens`
@@ -1224,8 +1328,8 @@ INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link
 (20, 'main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 1, 1, 1, 29, 0, '1970-01-01 00:00:00', 0, 1, 'class:tags', 0, '', 35, 36, 0, '', 1),
 (21, 'main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 1, 1, 1, 32, 0, '1970-01-01 00:00:00', 0, 1, 'class:postinstall', 0, '', 37, 38, 0, '*', 1),
 (22, 'main', 'com_associations', 'Multilingual Associations', '', 'Multilingual Associations', 'index.php?option=com_associations', 'component', 1, 1, 1, 34, 0, '1970-01-01 00:00:00', 0, 0, 'class:associations', 0, '', 39, 40, 0, '*', 1),
-(23, 'main', 'com_csp', 'Content-Security-Policy', '', 'Content-Security-Policy', 'index.php?option=com_csp', 'component', 1, 1, 1, 35, 0, '1970-01-01 00:00:00', 0, 0, 'class:associations', 0, '', 41, 42, 0, '*', 1),
-(101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 41, 42, 1, '*', 0);
+(23, 'main', 'com_csp', 'Content-Security-Policy', '', 'Content-Security-Policy', 'index.php?option=com_csp', 'component', 1, 1, 1, 38, 0, '1970-01-01 00:00:00', 0, 0, 'class:associations', 0, '', 41, 42, 0, '*', 1),
+(101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_links":"0","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 41, 42, 1, '*', 0);
 
 SELECT setval('#__menu_id_seq', 102, false);
 
@@ -1295,9 +1399,9 @@ CREATE TABLE IF NOT EXISTS "#__modules" (
   "ordering" bigint DEFAULT 0 NOT NULL,
   "position" varchar(50) DEFAULT '' NOT NULL,
   "checked_out" integer DEFAULT 0 NOT NULL,
-  "checked_out_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
-  "publish_up" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
-  "publish_down" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "checked_out_time" timestamp without time zone,
+  "publish_up" timestamp without time zone,
+  "publish_down" timestamp without time zone,
   "published" smallint DEFAULT 0 NOT NULL,
   "module" varchar(50) DEFAULT NULL,
   "access" bigint DEFAULT 0 NOT NULL,
@@ -1316,23 +1420,25 @@ CREATE INDEX "#__modules_idx_language" ON "#__modules" ("language");
 --
 
 INSERT INTO "#__modules" ("id", "asset_id", "title", "note", "content", "ordering", "position", "checked_out", "checked_out_time", "publish_up", "publish_down", "published", "module", "access", "showtitle", "params", "client_id", "language") VALUES
-(1, 39, 'Main Menu', '', '', 1, 'sidebar-right', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","startLevel":"0","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'),
-(2, 40, 'Login', '', '', 1, 'login', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_login', 1, 1, '', 1, '*'),
-(3, 41, 'Popular Articles', '', '', 3, 'cpanel', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_popular', 3, 1, '{"count":"5","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","bootstrap_size": "6"}', 1, '*'),
-(4, 42, 'Recently Added Articles', '', '', 4, 'cpanel', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_latest', 3, 1, '{"count":"5","ordering":"c_dsc","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","bootstrap_size": "6"}', 1, '*'),
-(8, 43, 'Toolbar', '', '', 1, 'toolbar', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_toolbar', 3, 1, '', 1, '*'),
-(9, 44, 'Quick Icons', '', '', 1, 'icon', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_quickicon', 3, 1, '', 1, '*'),
-(10, 45, 'Logged-in Users', '', '', 2, 'cpanel', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_logged', 3, 1, '{"count":"5","name":"1","layout":"_:default","moduleclass_sfx":"","cache":"0","bootstrap_size": "6"}', 1, '*'),
-(12, 46, 'Admin Menu', '', '', 1, 'menu', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 3, 1, '{"layout":"","moduleclass_sfx":"","shownew":"1","showhelp":"1","cache":"0"}', 1, '*'),
-(14, 48, 'User Status', '', '', 2, 'status', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_status', 3, 1, '', 1, '*'),
-(15, 49, 'Title', '', '', 1, 'title', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_title', 3, 1, '', 1, '*'),
-(16, 50, 'Login Form', '', '', 7, 'sidebar-right', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_login', 1, 1, '{"greeting":"1","name":"0"}', 0, '*'),
-(17, 51, 'Breadcrumbs', '', '', 1, 'breadcrumbs', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_breadcrumbs', 1, 1, '{"moduleclass_sfx":"","showHome":"1","homeText":"","showComponent":"1","separator":"","cache":"0","cache_time":"0","cachemode":"itemid"}', 0, '*'),
-(79, 52, 'Multilanguage status', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 0, 'mod_multilangstatus', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
-(86, 53, 'Joomla Version', '', '', 1, 'status', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_version', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
-(87, 55, 'Sample Data', '', '', 0, 'cpanel', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_sampledata', 6, 1, '{"bootstrap_size": "6"}', 1, '*');
-
-SELECT setval('#__modules_id_seq', 88, false);
+(1, 39, 'Main Menu', '', '', 1, 'sidebar-right', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","startLevel":"0","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'),
+(2, 40, 'Login', '', '', 1, 'login', 0, NULL, NULL, NULL, 1, 'mod_login', 1, 1, '', 1, '*'),
+(3, 41, 'Popular Articles', '', '', 3, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_popular', 3, 1, '{"count":"5","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","bootstrap_size": "6"}', 1, '*'),
+(4, 42, 'Recently Added Articles', '', '', 4, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_latest', 3, 1, '{"count":"5","ordering":"c_dsc","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","bootstrap_size": "6"}', 1, '*'),
+(8, 43, 'Toolbar', '', '', 1, 'toolbar', 0, NULL, NULL, NULL, 1, 'mod_toolbar', 3, 1, '', 1, '*'),
+(9, 44, 'Quick Icons', '', '', 1, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 3, 1, '', 1, '*'),
+(10, 45, 'Logged-in Users', '', '', 2, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_logged', 3, 1, '{"count":"5","name":"1","layout":"_:default","moduleclass_sfx":"","cache":"0","bootstrap_size": "6"}', 1, '*'),
+(12, 46, 'Admin Menu', '', '', 1, 'menu', 0, NULL, NULL, NULL, 1, 'mod_menu', 3, 1, '{"layout":"","moduleclass_sfx":"","shownew":"1","showhelp":"1","cache":"0"}', 1, '*'),
+(14, 48, 'User Status', '', '', 2, 'status', 0, NULL, NULL, NULL, 1, 'mod_status', 3, 1, '', 1, '*'),
+(15, 49, 'Title', '', '', 1, 'title', 0, NULL, NULL, NULL, 1, 'mod_title', 3, 1, '', 1, '*'),
+(16, 50, 'Login Form', '', '', 7, 'sidebar-right', 0, NULL, NULL, NULL, 1, 'mod_login', 1, 1, '{"greeting":"1","name":"0"}', 0, '*'),
+(17, 51, 'Breadcrumbs', '', '', 1, 'breadcrumbs', 0, NULL, NULL, NULL, 1, 'mod_breadcrumbs', 1, 1, '{"moduleclass_sfx":"","showHome":"1","homeText":"","showComponent":"1","separator":"","cache":"0","cache_time":"0","cachemode":"itemid"}', 0, '*'),
+(79, 52, 'Multilanguage status', '', '', 1, '', 0, NULL, NULL, NULL, 0, 'mod_multilangstatus', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
+(86, 53, 'Joomla Version', '', '', 1, 'status', 0, NULL, NULL, NULL, 1, 'mod_version', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
+(87, 55, 'Sample Data', '', '', 0, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_sampledata', 6, 1, '{"bootstrap_size": "6"}', 1, '*'),
+(88, 58, 'Latest Actions', '', '', 0, 'cpanel', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_latestactions', 6, 1, '{}', 1, '*'),
+(89, 59, 'Privacy Dashboard', '', '', 0, 'cpanel', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_privacy_dashboard', 6, 1, '{}', 1, '*');
+
+SELECT setval('#__modules_id_seq', 90, false);
 
 --
 -- Table structure for table `#__modules_menu`
@@ -1365,7 +1471,9 @@ INSERT INTO "#__modules_menu" ("moduleid", "menuid") VALUES
 (17, 0),
 (79, 0),
 (86, 0),
-(87, 0);
+(87, 0),
+(88, 0),
+(89, 0);
 
 --
 -- Table structure for table `#__newsfeeds`
@@ -1470,7 +1578,42 @@ INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description
 (700, 'COM_CPANEL_WELCOME_BEGINNERS_TITLE', 'COM_CPANEL_WELCOME_BEGINNERS_MESSAGE', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.2.0', 1),
 (700, 'COM_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1),
 (700, 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION', 'plg_system_updatenotification', 1, 'action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_condition', '3.6.3', 1),
-(700, 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_TITLE', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_BODY', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_ACTION', 'plg_system_httpheaders', 1, 'action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_condition', '4.0.0', 1);
+(700, 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_TITLE', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_BODY', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_ACTION', 'plg_system_httpheaders', 1, 'action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_condition', '4.0.0', 1),
+(700, 'COM_ACTIONLOGS_POSTINSTALL_TITLE', 'COM_ACTIONLOGS_POSTINSTALL_BODY', '', 'com_actionlogs', 1, 'message', '', '', '', '', '3.9.0', 1),
+(700, 'COM_PRIVACY_POSTINSTALL_TITLE', 'COM_PRIVACY_POSTINSTALL_BODY', '', 'com_privacy', 1, 'message', '', '', '', '', '3.9.0', 1);
+
+--
+-- Table structure for table `#__privacy_requests`
+--
+
+CREATE TABLE "#__privacy_requests" (
+  "id" serial NOT NULL,
+  "email" varchar(100) DEFAULT '' NOT NULL,
+  "requested_at" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "status" smallint DEFAULT 0 NOT NULL,
+  "request_type" varchar(25) DEFAULT '' NOT NULL,
+  "confirm_token" varchar(100) DEFAULT '' NOT NULL,
+  "confirm_token_created_at" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  PRIMARY KEY ("id")
+);
+
+--
+-- Table structure for table `#__privacy_consents`
+--
+
+CREATE TABLE "#__privacy_consents" (
+  "id" serial NOT NULL,
+  "user_id" bigint DEFAULT 0 NOT NULL,
+  "state" smallint DEFAULT 1 NOT NULL,
+  "created" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "subject" varchar(255) DEFAULT '' NOT NULL,
+  "body" text NOT NULL,
+  "remind" smallint DEFAULT 0 NOT NULL,
+  "token" varchar(100) DEFAULT '' NOT NULL,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "#__privacy_consents_idx_user_id" ON "#__privacy_consents" ("user_id");
+
 --
 -- Table structure for table `#__redirect_links`
 --
@@ -1506,10 +1649,10 @@ CREATE TABLE IF NOT EXISTS "#__schemas" (
 --
 
 CREATE TABLE IF NOT EXISTS "#__session" (
-  "session_id" varchar(200) DEFAULT '' NOT NULL,
+  "session_id" bytea NOT NULL,
   "client_id" smallint DEFAULT NULL,
   "guest" smallint DEFAULT 1,
-  "time" varchar(14) DEFAULT '',
+  "time" integer DEFAULT 0 NOT NULL,
   "data" text,
   "userid" bigint DEFAULT 0,
   "username" varchar(150) DEFAULT '',
@@ -1729,6 +1872,7 @@ CREATE TABLE IF NOT EXISTS "#__updates" (
   "data" text NOT NULL,
   "detailsurl" text NOT NULL,
   "infourl" text NOT NULL,
+  "changelogurl" text,
   "extra_query" varchar(1000) DEFAULT '',
   PRIMARY KEY ("update_id")
 );
@@ -1923,6 +2067,114 @@ CREATE TABLE IF NOT EXISTS "#__user_usergroup_map" (
 COMMENT ON COLUMN "#__user_usergroup_map"."user_id" IS 'Foreign Key to #__users.id';
 COMMENT ON COLUMN "#__user_usergroup_map"."group_id" IS 'Foreign Key to #__usergroups.id';
 
+--
+-- Table: #__action_logs
+--
+CREATE TABLE "#__action_logs" (
+  "id" serial NOT NULL,
+  "message_language_key" varchar(255) NOT NULL DEFAULT '',
+  "message" text NOT NULL DEFAULT '',
+  "log_date" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "extension" varchar(50) NOT NULL DEFAULT '',
+  "user_id" integer DEFAULT 0 NOT NULL,
+  "item_id" integer DEFAULT 0 NOT NULL,
+  "ip_address" varchar(40) NOT NULL DEFAULT '0.0.0.0',
+  PRIMARY KEY ("id")
+);
+
+CREATE INDEX "#__action_logs_idx_user_id" ON "#__action_logs" ("user_id"); 
+CREATE INDEX "#__action_logs_idx_user_id_logdate" ON "#__action_logs" ("user_id", "log_date"); 
+CREATE INDEX "#__action_logs_idx_user_id_extension" ON "#__action_logs" ("user_id", "extension");
+CREATE INDEX "#__action_logs_idx_extension_itemid" ON "#__action_logs" ("extension", "item_id");
+
+--
+-- Table: #__action_logs_extensions
+--
+CREATE TABLE "#__action_logs_extensions" (
+  "id" serial NOT NULL,
+  "extension" varchar(50) NOT NULL DEFAULT '',
+  PRIMARY KEY ("id")
+);
+
+--
+-- Dumping data for table '#__action_logs_extensions'
+--
+INSERT INTO "#__action_logs_extensions" ("id", "extension") VALUES
+(1, 'com_banners'),
+(2, 'com_cache'),
+(3, 'com_categories'),
+(4, 'com_config'),
+(5, 'com_contact'),
+(6, 'com_content'),
+(7, 'com_installer'),
+(8, 'com_media'),
+(9, 'com_menus'),
+(10, 'com_messages'),
+(11, 'com_modules'),
+(12, 'com_newsfeeds'),
+(13, 'com_plugins'),
+(14, 'com_redirect'),
+(15, 'com_tags'),
+(16, 'com_templates'),
+(17, 'com_users');
+
+SELECT setval('#__action_logs_extensions_id_seq', 18, false);
+-- --------------------------------------------------------
+
+--
+-- Table: #__action_log_config
+--
+CREATE TABLE "#__action_log_config" (
+  "id" serial NOT NULL,
+  "type_title" varchar(255) NOT NULL DEFAULT '',
+  "type_alias" varchar(255) NOT NULL DEFAULT '',
+  "id_holder" varchar(255) NULL,
+  "title_holder" varchar(255) NULL,
+  "table_name" varchar(255) NULL,
+  "text_prefix" varchar(255) NULL,
+  PRIMARY KEY ("id")
+);
+
+--
+-- Dumping data for table #__action_log_config
+--
+INSERT INTO "#__action_log_config" ("id", "type_title", "type_alias", "id_holder", "title_holder", "table_name", "text_prefix") VALUES
+(1, 'article', 'com_content.article', 'id' ,'title' , '#__content', 'PLG_ACTIONLOG_JOOMLA'),
+(2, 'article', 'com_content.form', 'id', 'title' , '#__content', 'PLG_ACTIONLOG_JOOMLA'),
+(3, 'banner', 'com_banners.banner', 'id' ,'name' , '#__banners', 'PLG_ACTIONLOG_JOOMLA'),
+(4, 'user_note', 'com_users.note', 'id', 'subject' ,'#__user_notes', 'PLG_ACTIONLOG_JOOMLA'),
+(5, 'media', 'com_media.file', '' , 'name' , '',  'PLG_ACTIONLOG_JOOMLA'),
+(6, 'category', 'com_categories.category', 'id' , 'title' , '#__categories', 'PLG_ACTIONLOG_JOOMLA'),
+(7, 'menu', 'com_menus.menu', 'id' ,'title' , '#__menu_types', 'PLG_ACTIONLOG_JOOMLA'),
+(8, 'menu_item', 'com_menus.item', 'id' , 'title' , '#__menu', 'PLG_ACTIONLOG_JOOMLA'),
+(9, 'newsfeed', 'com_newsfeeds.newsfeed', 'id' ,'name' , '#__newsfeeds', 'PLG_ACTIONLOG_JOOMLA'),
+(10, 'link', 'com_redirect.link', 'id', 'old_url' , '#__redirect_links', 'PLG_ACTIONLOG_JOOMLA'),
+(11, 'tag', 'com_tags.tag', 'id', 'title' , '#__tags', 'PLG_ACTIONLOG_JOOMLA'),
+(12, 'style', 'com_templates.style', 'id' , 'title' , '#__template_styles', 'PLG_ACTIONLOG_JOOMLA'),
+(13, 'plugin', 'com_plugins.plugin', 'extension_id' , 'name' , '#__extensions', 'PLG_ACTIONLOG_JOOMLA'),
+(14, 'component_config', 'com_config.component', 'extension_id' , 'name', '', 'PLG_ACTIONLOG_JOOMLA'),
+(15, 'contact', 'com_contact.contact', 'id', 'name', '#__contact_details', 'PLG_ACTIONLOG_JOOMLA'),
+(16, 'module', 'com_modules.module', 'id' ,'title', '#__modules', 'PLG_ACTIONLOG_JOOMLA'),
+(17, 'access_level', 'com_users.level', 'id' , 'title', '#__viewlevels', 'PLG_ACTIONLOG_JOOMLA'),
+(18, 'banner_client', 'com_banners.client', 'id', 'name', '#__banner_clients', 'PLG_ACTIONLOG_JOOMLA'),
+(19, 'application_config', 'com_config.application', '', 'name', '', 'PLG_ACTIONLOG_JOOMLA');
+
+
+SELECT setval('#__action_log_config_id_seq', 20, false);
+
+--
+-- Table structure for table `#__action_logs_users`
+--
+
+CREATE TABLE "#__action_logs_users" (
+  "user_id" integer NOT NULL,
+  "notify" integer NOT NULL,
+  "extensions" text NOT NULL,
+  PRIMARY KEY ("user_id")
+);
+
+CREATE INDEX "#__action_logs_users_idx_notify" ON "#__action_logs_users" ("notify");
+
 --
 -- Table structure for table `#__viewlevels`
 --
@@ -2031,8 +2283,8 @@ CREATE INDEX "#__workflow_stages_idx_default" ON "#__workflow_stages" ("default"
 --
 
 INSERT INTO "#__workflow_stages" ("id", "asset_id", "ordering", "workflow_id", "published", "title", "description", "condition", "default") VALUES
-(1, 0, 1, 1, 1, 'JUNPUBLISHED', '', 0, 0),
-(2, 0, 2, 1, 1, 'JPUBLISHED', '', 1, 1),
+(1, 0, 1, 1, 1, 'JUNPUBLISHED', '', 0, 1),
+(2, 0, 2, 1, 1, 'JPUBLISHED', '', 1, 0),
 (3, 0, 3, 1, 1, 'JTRASHED', '', -2, 0),
 (4, 0, 4, 1, 1, 'JARCHIVED', '', 2, 0);
 
diff --git a/installation/sql/postgresql/sample_testing.sql b/installation/sql/postgresql/sample_testing.sql
index 43f783f5d0afd..bb9d5fc38f6fb 100644
--- a/installation/sql/postgresql/sample_testing.sql
+++ b/installation/sql/postgresql/sample_testing.sql
@@ -17,7 +17,7 @@ TRUNCATE "#__viewlevels" RESTART IDENTITY;
 --
 
 INSERT INTO "#__assets" ("id", "parent_id", "lft", "rgt", "level", "name", "title", "rules") VALUES
-(1, 0, 1, 479, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
+(1, 0, 1, 483, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
 (2, 1, 2, 3, 1, 'com_admin', 'com_admin', '{}'),
 (3, 1, 4, 11, 1, 'com_banners', 'com_banners', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
 (4, 1, 12, 13, 1, 'com_cache', 'com_cache', '{"core.admin":{"7":1},"core.manage":{"7":1}}'),
@@ -201,7 +201,9 @@ INSERT INTO "#__assets" ("id", "parent_id", "lft", "rgt", "level", "name", "titl
 (198, 18, 357, 358, 2, 'com_modules.module.118', 'Bottom-b', '{"core.delete":[],"core.edit":[],"core.edit.state":[],"module.edit.frontend":[]}'),
 (210, 18, 359, 360, 2, 'com_modules.module.64', 'Language Switcher', '{"core.delete":[],"core.edit":[],"core.edit.state":[],"module.edit.frontend":[]}'),
 (211, 18, 361, 362, 2, 'com_modules.module.84', 'Smart Search Module', '{"core.delete":[],"core.edit":[],"core.edit.state":[],"module.edit.frontend":[]}'),
-(212, 18, 363, 364, 2, 'com_modules.module.119', 'Banner', '{"core.delete":[],"core.edit":[],"core.edit.state":[],"module.edit.frontend":[]}');
+(212, 18, 363, 364, 2, 'com_modules.module.119', 'Banner', '{"core.delete":[],"core.edit":[],"core.edit.state":[],"module.edit.frontend":[]}'),
+(213, 1, 365, 366, 1, 'com_privacy', 'com_privacy', '{"core.admin":{"7":1}}'),
+(214, 1, 367, 368, 1, 'com_actionlogs', 'com_actionlogs', '{"core.admin":{"7":1}}');
 
 SELECT setval('#__assets_id_seq', max(id)) FROM "#__assets";
 
@@ -453,11 +455,11 @@ INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link
 (207, 'top', 'Joomla.org', 'joomlaorg', '', 'joomlaorg', 'https://www.joomla.org/', 'url', 1, 1, 1, 0, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"menu-anchor_title":"","menu-anchor_css":"","menu_image":""}', 93, 94, 0, '*', 0),
 (229, 'frontendviews', 'Single Contact', 'single-contact', '', 'single-contact', 'index.php?option=com_contact&view=contact&id=1', 'component', 1, 1, 1, 8, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_category_crumb":"","presentation_style":"","show_contact_category":"","show_contact_list":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_links":"","linka_name":"","linkb_name":"","linkc_name":"","linkd_name":"","linke_name":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 157, 158, 0, '*', 0),
 (233, 'mainmenu', 'Login', 'login', '', 'login', 'index.php?option=com_users&view=login', 'component', 1, 1, 1, 25, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 13, 14, 0, '*', 0),
-(234, 'parks', 'Park Blog', 'park-blog', '', 'park-blog', 'index.php?option=com_content&view=category&layout=blog&id=27', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 114, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"1","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"1","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 99, 100, 0, 'en-GB', 0),
+(234, 'parks', 'Park Blog', 'park-blog', '', 'park-blog', 'index.php?option=com_content&view=category&layout=blog&id=27', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 114, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"1","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 99, 100, 0, 'en-GB', 0),
 (238, 'mainmenu', 'Sample Sites', 'sample-sites', '', 'sample-sites', 'index.php?option=com_content&view=article&id=38', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"0","link_category":"","show_parent_category":"0","link_parent_category":"","show_author":"0","link_author":"","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"0","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"0","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 121, 126, 0, '*', 0),
 (242, 'parks', 'Write a Blog Post', 'write-a-blog-post', '', 'write-a-blog-post', 'index.php?option=com_content&view=form&layout=edit', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 3, '', 114, '{"menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 101, 102, 0, 'en-GB', 0),
 (243, 'parks', 'Parks Home', 'parks-home', '', 'parks-home', 'index.php?option=com_content&view=article&id=6', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 114, '{"show_noauth":"","show_title":"0","link_titles":"","show_intro":"","show_category":"0","link_category":"0","show_parent_category":"","link_parent_category":"","show_author":"0","link_author":"","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"0","show_icons":"","show_print_icon":"0","show_email_icon":"0","show_hits":"0","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 97, 98, 0, 'en-GB', 0),
-(244, 'parks', 'Image Gallery', 'image-gallery', '', 'image-gallery', 'index.php?option=com_content&view=categories&id=28', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 114, '{"show_base_description":"1","categories_description":"","maxLevelcat":"","show_empty_categories_cat":"","show_subcat_desc_cat":"","show_cat_num_articles_cat":"","drill_down_layout":"1","show_category_title":"","show_description":"1","show_description_image":"1","maxLevel":"-1","show_empty_categories":"","show_subcat_desc":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_pagination_results":"","show_pagination_limit":"","filter_field":"","show_headings":"","list_show_date":"","date_format":"","list_show_hits":"","list_show_author":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 103, 108, 0, 'en-GB', 0),
+(244, 'parks', 'Image Gallery', 'image-gallery', '', 'image-gallery', 'index.php?option=com_content&view=categories&id=28', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 114, '{"show_base_description":"1","categories_description":"","maxLevelcat":"","show_empty_categories_cat":"","show_subcat_desc_cat":"","show_cat_num_articles_cat":"","drill_down_layout":"1","show_category_title":"","show_description":"1","show_description_image":"1","maxLevel":"-1","show_empty_categories":"","show_subcat_desc":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_pagination_results":"","show_pagination_limit":"","filter_field":"","show_headings":"","list_show_date":"","date_format":"","list_show_hits":"","list_show_author":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 103, 108, 0, 'en-GB', 0),
 (251, 'frontendviews', 'Contact Categories', 'contact-categories', '', 'contact-categories', 'index.php?option=com_contact&view=categories&id=16', 'component', 1, 1, 1, 8, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_base_description":"","categories_description":"","maxLevel":"-1","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","display_num":"","show_headings":"","filter_field":"","show_pagination":"","show_noauth":"","presentation_style":"sliders","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_links":"1","linka_name":"","linkb_name":"","linkc_name":"","linkd_name":"","linke_name":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 153, 154, 0, '*', 0),
 (252, 'frontendviews', 'News Feed Categories', 'new-feed-categories', '', 'new-feed-categories', 'index.php?option=com_newsfeeds&view=categories&id=0', 'component', 1, 1, 1, 17, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_base_description":"1","categories_description":"Because this links to the root category the \\"uncategorised\\" category is displayed. ","maxLevel":"-1","show_empty_categories":"1","show_description":"1","show_description_image":"1","show_cat_num_articles":"1","display_num":"","show_headings":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_feed_image":"","show_feed_description":"","show_item_description":"","feed_character_count":"0","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 163, 164, 0, '*', 0),
 (253, 'frontendviews', 'News Feed Category', 'news-feed-category', '', 'news-feed-category', 'index.php?option=com_newsfeeds&view=category&id=17', 'component', 1, 1, 1, 17, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"-1","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","display_num":"","show_headings":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_feed_image":"","show_feed_description":"","show_item_description":"","feed_character_count":"0","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 167, 168, 0, '*', 0),
@@ -465,22 +467,22 @@ INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link
 (255, 'frontendviews', 'Search', 'search', '', 'search', 'index.php?option=com_search&view=search', 'component', 1, 1, 1, 19, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"search_areas":"1","show_date":"1","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 185, 186, 0, '*', 0),
 (256, 'frontendviews', 'Archived Articles', 'archived-articles', '', 'archived-articles', 'index.php?option=com_content&view=archive', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"orderby_sec":"","order_date":"","display_num":"","filter_field":"","show_category":"1","link_category":"1","show_title":"1","link_titles":"1","show_intro":"1","show_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_hits":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 147, 148, 0, '*', 0),
 (257, 'frontendviews', 'Single Article', 'single-article', '', 'single-article', 'index.php?option=com_content&view=article&id=6', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 137, 138, 0, '*', 0),
-(259, 'frontendviews', 'Article Category Blog', 'article-category-blog', '', 'article-category-blog', 'index.php?option=com_content&view=category&layout=blog&id=27', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"0","show_description_image":"0","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 141, 142, 0, '*', 0),
+(259, 'frontendviews', 'Article Category Blog', 'article-category-blog', '', 'article-category-blog', 'index.php?option=com_content&view=category&layout=blog&id=27', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"0","show_description_image":"0","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 141, 142, 0, '*', 0),
 (260, 'frontendviews', 'Article Category List', 'article-category-list', '', 'article-category-list', 'index.php?option=com_content&view=category&id=19', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_category_title":"","show_description":"","show_description_image":"","maxLevel":"","show_empty_categories":"","show_no_articles":"","show_subcat_desc":"","show_cat_num_articles":"","page_subheading":"","show_pagination_limit":"","filter_field":"","show_headings":"","list_show_date":"","date_format":"","list_show_hits":"","list_show_author":"","orderby_pri":"","orderby_sec":"alpha","order_date":"","show_pagination":"","show_pagination_results":"","display_num":"10","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 143, 144, 0, '*', 0),
-(262, 'frontendviews', 'Featured Articles', 'featured-articles', '', 'featured-articles', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 145, 146, 0, '*', 0),
+(262, 'frontendviews', 'Featured Articles', 'featured-articles', '', 'featured-articles', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 145, 146, 0, '*', 0),
 (263, 'frontendviews', 'Submit Article', 'submit-article', '', 'submit-article', 'index.php?option=com_content&view=form&layout=edit', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 3, '', 0, '{"menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 149, 150, 0, '*', 0),
 (266, 'frontendviews', 'Content Component', 'content-component', '', 'content-component', 'index.php?option=com_content&view=article&id=10', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"article-allow_ratings":"","article-allow_comments":"","show_category":"","link_category":"","show_title":"","link_titles":"","show_intro":"","show_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 135, 136, 0, '*', 0),
 (267, 'frontendviews', 'News Feeds Component', 'news-feeds-component', '', 'news-feeds-component', 'index.php?option=com_content&view=article&id=60', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"Newsfeeds Categories View ","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 161, 162, 0, '*', 0),
 (270, 'frontendviews', 'Contact Component', 'contact-component', '', 'contact-component', 'index.php?option=com_content&view=article&id=9', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 151, 152, 0, '*', 0),
 (271, 'frontendviews', 'Users Component', 'users-component', '', 'users-component', 'index.php?option=com_content&view=article&id=52', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 169, 170, 0, '*', 0),
-(272, 'frontendviews', 'Article Categories', 'article-categories', '', 'article-categories', 'index.php?option=com_content&view=categories&id=14', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_base_description":"","categories_description":"","maxLevel":"-1","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","display_num":"","category_layout":"","show_headings":"","show_date":"","date_format":"","filter_field":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 139, 140, 0, '*', 0),
+(272, 'frontendviews', 'Article Categories', 'article-categories', '', 'article-categories', 'index.php?option=com_content&view=categories&id=14', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_base_description":"","categories_description":"","maxLevel":"-1","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","display_num":"","category_layout":"","show_headings":"","show_date":"","date_format":"","filter_field":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 139, 140, 0, '*', 0),
 (275, 'frontendviews', 'Contact Single Category', 'contact-single-category', '', 'contact-single-category', 'index.php?option=com_contact&view=category&catid=26&id=36', 'component', 1, 1, 1, 8, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"-1","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","display_num":"20","show_headings":"","filter_field":"","show_pagination":"","show_noauth":"","presentation_style":"sliders","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_links":"1","linka_name":"","linkb_name":"","linkc_name":"","linkd_name":"","linke_name":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 155, 156, 0, '*', 0),
 (276, 'frontendviews', 'Search Components', 'search-component', '', 'search-component', 'index.php?option=com_content&view=article&id=39', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 183, 184, 0, '*', 0),
-(277, 'aboutjoomla', 'Using Extensions', 'extensions', '', 'using-joomla/extensions', 'index.php?option=com_content&view=categories&id=20', 'component', 1, 280, 2, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_base_description":"1","categories_description":"","maxLevelcat":"1","show_empty_categories_cat":"1","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"0","drill_down_layout":"0","show_category_title":"","show_description":"1","show_description_image":"1","maxLevel":"1","show_empty_categories":"1","show_subcat_desc":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_pagination_results":"","show_pagination_limit":"","filter_field":"","show_headings":"","list_show_date":"","date_format":"","list_show_hits":"","list_show_author":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 48, 87, 0, '*', 0),
+(277, 'aboutjoomla', 'Using Extensions', 'extensions', '', 'using-joomla/extensions', 'index.php?option=com_content&view=categories&id=20', 'component', 1, 280, 2, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_base_description":"1","categories_description":"","maxLevelcat":"1","show_empty_categories_cat":"1","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"0","drill_down_layout":"0","show_category_title":"","show_description":"1","show_description_image":"1","maxLevel":"1","show_empty_categories":"1","show_subcat_desc":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_pagination_results":"","show_pagination_limit":"","filter_field":"","show_headings":"","list_show_date":"","date_format":"","list_show_hits":"","list_show_author":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 48, 87, 0, '*', 0),
 (280, 'aboutjoomla', 'Using Joomla!', 'using-joomla', '', 'using-joomla', 'index.php?option=com_content&view=article&id=53', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_title":"1","link_titles":"0","show_intro":"1","show_category":"0","link_category":"","show_parent_category":"0","link_parent_category":"","show_author":"0","link_author":"","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"0","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"0","show_noauth":"0","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 47, 88, 0, '*', 0),
 (282, 'aboutjoomla', 'Templates', 'templates', '', 'using-joomla/extensions/templates', 'index.php?option=com_content&view=category&id=23', 'component', 1, 277, 3, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_category_title":"","show_description":"1","show_description_image":"","maxLevel":"2","show_empty_categories":"1","show_no_articles":"0","show_subcat_desc":"1","show_cat_num_articles":"","page_subheading":"","show_pagination_limit":"0","filter_field":"hide","show_headings":"0","list_show_date":"0","date_format":"","list_show_hits":"0","list_show_author":"0","show_pagination":"0","show_pagination_results":"","show_title":"1","link_titles":"1","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"Templates","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 49, 68, 0, '*', 0),
-(283, 'aboutjoomla', 'Languages', 'languages', '', 'using-joomla/extensions/languages', 'index.php?option=com_content&view=category&layout=blog&id=24', 'component', 1, 277, 3, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"1","show_category_title":"1","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 69, 70, 0, '*', 0),
-(284, 'aboutjoomla', 'Plugins', 'plugins', '', 'using-joomla/extensions/plugins', 'index.php?option=com_content&view=category&layout=blog&id=25', 'component', 1, 277, 3, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_category_title":"1","show_cat_num_articles":"","num_leading_articles":"0","num_intro_articles":"7","num_columns":"1","num_links":"0","multi_column_order":"","orderby_pri":"","orderby_sec":"order","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"0","link_category":"0","show_parent_category":"0","link_parent_category":"0","show_author":"0","link_author":"","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"","show_readmore":"","show_icons":"0","show_print_icon":"0","show_email_icon":"0","show_hits":"0","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 71, 86, 0, '*', 0),
+(283, 'aboutjoomla', 'Languages', 'languages', '', 'using-joomla/extensions/languages', 'index.php?option=com_content&view=category&layout=blog&id=24', 'component', 1, 277, 3, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"1","show_category_title":"1","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 69, 70, 0, '*', 0),
+(284, 'aboutjoomla', 'Plugins', 'plugins', '', 'using-joomla/extensions/plugins', 'index.php?option=com_content&view=category&layout=blog&id=25', 'component', 1, 277, 3, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_category_title":"1","show_cat_num_articles":"","num_leading_articles":"0","num_intro_articles":"7","num_links":"0","orderby_pri":"","orderby_sec":"order","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"0","link_category":"0","show_parent_category":"0","link_parent_category":"0","show_author":"0","link_author":"","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"","show_readmore":"","show_icons":"0","show_print_icon":"0","show_email_icon":"0","show_hits":"0","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 71, 86, 0, '*', 0),
 (285, 'aboutjoomla', 'Typography Atomic', 'typography-atomic', '', 'using-joomla/extensions/templates/atomic/typography-atomic', 'index.php?option=com_content&view=article&id=49', 'component', 1, 422, 5, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 3, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 63, 64, 0, '*', 0),
 (300, 'modules', 'Latest Users', 'latest-users', '', 'latest-users', 'index.php?option=com_content&view=article&id=66', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 213, 214, 0, '*', 0),
 (301, 'modules', 'Who''s Online', 'whos-online', '', 'whos-online', 'index.php?option=com_content&view=article&id=56', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 215, 216, 0, '*', 0),
@@ -495,7 +497,7 @@ INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link
 (311, 'modules', 'Syndicate', 'syndicate', '', 'syndicate', 'index.php?option=com_content&view=article&id=45', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 229, 230, 0, '*', 0),
 (312, 'modules', 'Login', 'login-module', '', 'login-module', 'index.php?option=com_content&view=article&id=28', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","urls_position":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 211, 212, 0, '*', 0),
 (313, 'modules', 'Wrapper', 'wrapper-module', '', 'wrapper-module', 'index.php?option=com_content&view=article&id=59', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","urls_position":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 237, 238, 0, '*', 0),
-(316, 'aboutjoomla', 'Home Page Atomic', 'home-page-atomic', '', 'using-joomla/extensions/templates/atomic/home-page-atomic', 'index.php?option=com_content&view=featured', 'component', 1, 422, 5, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 3, '{"maxLevel":"","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 65, 66, 0, '*', 0),
+(316, 'aboutjoomla', 'Home Page Atomic', 'home-page-atomic', '', 'using-joomla/extensions/templates/atomic/home-page-atomic', 'index.php?option=com_content&view=featured', 'component', 1, 422, 5, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 3, '{"maxLevel":"","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"3","num_links":"0","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 65, 66, 0, '*', 0),
 (317, 'aboutjoomla', 'System', 'system', '', 'using-joomla/extensions/plugins/system', 'index.php?option=com_content&view=article&id=46', 'component', 1, 284, 4, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 84, 85, 0, '*', 0),
 (318, 'aboutjoomla', 'Authentication', 'authentication', '', 'using-joomla/extensions/plugins/authentication', 'index.php?option=com_content&view=article&id=5', 'component', 1, 284, 4, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 72, 73, 0, '*', 0),
 (319, 'aboutjoomla', 'Content', 'content', '', 'using-joomla/extensions/plugins/content', 'index.php?option=com_content&view=article&id=62', 'component', 1, 284, 4, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 74, 75, 0, '*', 0),
@@ -506,8 +508,8 @@ INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link
 (324, 'modules', 'Footer', 'footer', '', 'footer', 'index.php?option=com_content&view=article&id=19', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 225, 226, 0, '*', 0),
 (325, 'modules', 'Archive', 'archive', '', 'archive', 'index.php?option=com_content&view=article&id=2', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 201, 202, 0, '*', 0),
 (326, 'modules', 'Related Items', 'related-items', '', 'related-items', 'index.php?option=com_content&view=article&id=37', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 203, 204, 0, '*', 0),
-(399, 'parks', 'Animals', 'animals', '', 'image-gallery/animals', 'index.php?option=com_content&view=category&layout=blog&id=72', 'component', 1, 244, 2, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 114, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"0","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"0","num_intro_articles":"6","num_columns":"2","num_links":"4","multi_column_order":"1","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"0","show_category":"1","link_category":"1","show_parent_category":"","link_parent_category":"","show_author":"0","link_author":"","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"1","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 104, 105, 0, 'en-GB', 0),
-(400, 'parks', 'Scenery', 'scenery', '', 'image-gallery/scenery', 'index.php?option=com_content&view=category&layout=blog&id=73', 'component', 1, 244, 2, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 114, '{"maxLevel":"","show_empty_categories":"","show_description":"0","show_description_image":"0","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"0","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"1","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"0","show_category":"1","link_category":"","show_parent_category":"0","link_parent_category":"0","show_author":"0","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"1","show_readmore":"1","show_icons":"0","show_print_icon":"0","show_email_icon":"0","show_hits":"0","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 106, 107, 0, 'en-GB', 0),
+(399, 'parks', 'Animals', 'animals', '', 'image-gallery/animals', 'index.php?option=com_content&view=category&layout=blog&id=72', 'component', 1, 244, 2, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 114, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"0","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"0","num_intro_articles":"6","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"0","show_category":"1","link_category":"1","show_parent_category":"","link_parent_category":"","show_author":"0","link_author":"","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"1","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 104, 105, 0, 'en-GB', 0),
+(400, 'parks', 'Scenery', 'scenery', '', 'image-gallery/scenery', 'index.php?option=com_content&view=category&layout=blog&id=73', 'component', 1, 244, 2, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 114, '{"maxLevel":"","show_empty_categories":"","show_description":"0","show_description_image":"0","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"0","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"0","show_category":"1","link_category":"","show_parent_category":"0","link_parent_category":"0","show_author":"0","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"1","show_readmore":"1","show_icons":"0","show_print_icon":"0","show_email_icon":"0","show_hits":"0","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 106, 107, 0, 'en-GB', 0),
 (402, 'frontendviews', 'Login Form', 'login-form', '', 'login-form', 'index.php?option=com_users&view=login', 'component', 1, 1, 1, 25, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"login_redirect_url":"","logindescription_show":"1","login_description":"","login_image":"","logout_redirect_url":"","logoutdescription_show":"1","logout_description":"","logout_image":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 171, 172, 0, '*', 0),
 (403, 'frontendviews', 'User Profile', 'user-profile', '', 'user-profile', 'index.php?option=com_users&view=profile', 'component', 1, 1, 1, 25, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 173, 174, 0, '*', 0),
 (404, 'frontendviews', 'Edit User Profile', 'edit-user-profile', '', 'edit-user-profile', 'index.php?option=com_users&view=profile&layout=edit', 'component', 1, 1, 1, 25, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 175, 176, 0, '*', 0),
@@ -519,14 +521,14 @@ INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link
 (412, 'modules', 'User Modules', 'user-modules', '', 'user-modules', 'index.php?option=com_content&view=category&id=65', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"0","show_category_title":"1","page_subheading":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_cat_num_articles":"","display_num":"0","show_headings":"0","list_show_title":"1","list_show_date":"","date_format":"","list_show_hits":"0","list_show_author":"0","filter_field":"hide","orderby_pri":"","orderby_sec":"order","order_date":"","show_pagination":"","show_pagination_limit":"0","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"1","link_category":"1","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 209, 210, 0, '*', 0),
 (416, 'modules', 'Breadcrumbs', 'breadcrumbs', '', 'breadcrumbs', 'index.php?option=com_content&view=article&id=61', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 191, 192, 0, '*', 0),
 (418, 'modules', 'Custom', 'custom', '', 'custom', 'index.php?option=com_content&view=article&id=12', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 227, 228, 0, '*', 0),
-(419, 'aboutjoomla', 'Beez 2', 'beez-2', '', 'using-joomla/extensions/templates/beez-2', 'index.php?option=com_content&view=category&layout=blog&id=69', 'component', 1, 282, 4, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 50, 55, 0, '*', 0),
-(422, 'aboutjoomla', 'Atomic', 'atomic', '', 'using-joomla/extensions/templates/atomic', 'index.php?option=com_content&view=category&layout=blog&id=68', 'component', 1, 282, 4, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"2","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 62, 67, 0, '*', 0),
+(419, 'aboutjoomla', 'Beez 2', 'beez-2', '', 'using-joomla/extensions/templates/beez-2', 'index.php?option=com_content&view=category&layout=blog&id=69', 'component', 1, 282, 4, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 50, 55, 0, '*', 0),
+(422, 'aboutjoomla', 'Atomic', 'atomic', '', 'using-joomla/extensions/templates/atomic', 'index.php?option=com_content&view=category&layout=blog&id=68', 'component', 1, 282, 4, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"2","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 62, 67, 0, '*', 0),
 (423, 'aboutjoomla', 'Typography Beez 2', 'typography-beez-2', '', 'using-joomla/extensions/templates/beez-2/typography-beez-2', 'index.php?option=com_content&view=article&id=49', 'component', 1, 419, 5, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 4, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 51, 52, 0, '*', 0),
-(424, 'aboutjoomla', 'Home Page Beez 2', 'home-page-beez-2', '', 'using-joomla/extensions/templates/beez-2/home-page-beez-2', 'index.php?option=com_content&view=featured', 'component', 1, 419, 5, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 4, '{"maxLevel":"","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 53, 54, 0, '*', 0),
+(424, 'aboutjoomla', 'Home Page Beez 2', 'home-page-beez-2', '', 'using-joomla/extensions/templates/beez-2/home-page-beez-2', 'index.php?option=com_content&view=featured', 'component', 1, 419, 5, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 4, '{"maxLevel":"","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"3","num_links":"0","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":0,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 53, 54, 0, '*', 0),
 (427, 'fruitshop', 'Fruit Encyclopedia', 'fruit-encyclopedia', '', 'fruit-encyclopedia', 'index.php?option=com_contact&view=categories&id=37', 'component', 1, 1, 1, 8, 0, '1970-01-01 00:00:00', 0, 1, '', 7, '{"show_base_description":"1","categories_description":"","maxLevelcat":"","show_empty_categories_cat":"","show_subcat_desc_cat":"","show_cat_items_cat":"","show_category_title":"","show_description":"1","show_description_image":"1","maxLevel":"-1","show_empty_categories":"1","show_subcat_desc":"","show_cat_items":"","show_pagination_limit":"","show_headings":"0","show_position_headings":"","show_email_headings":"0","show_telephone_headings":"0","show_mobile_headings":"0","show_fax_headings":"0","show_suburb_headings":"0","show_state_headings":"","show_country_headings":"","show_pagination":"","show_pagination_results":"","presentation_style":"","show_contact_category":"","show_contact_list":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_links":"1","linka_name":"","linkb_name":"","linkc_name":"","linkd_name":"","linke_name":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":"","show_feed_link":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":" categories-listalphabet","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 111, 112, 0, '*', 0),
 (429, 'fruitshop', 'Welcome', 'welcome', 'Fruit store front page', 'welcome', 'index.php?option=com_content&view=article&id=20', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 7, '{"show_title":"0","link_titles":"0","show_intro":"1","show_category":"0","link_category":"0","show_parent_category":"","link_parent_category":"","show_author":"0","link_author":"","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"0","show_vote":"","show_icons":"0","show_print_icon":"0","show_email_icon":"0","show_hits":"0","show_noauth":"","urls_position":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 109, 110, 0, '*', 0),
 (430, 'fruitshop', 'Contact Us', 'contact-us', '', 'contact-us', 'index.php?option=com_contact&view=category&catid=47&id=36', 'component', 1, 1, 1, 8, 0, '1970-01-01 00:00:00', 0, 1, '', 7, '{"show_category_title":"","show_description":"","show_description_image":"","maxLevel":"-1","show_empty_categories":"","show_subcat_desc":"","show_cat_items":"","show_pagination_limit":"","show_headings":"0","show_position_headings":"","show_email_headings":"","show_telephone_headings":"","show_mobile_headings":"","show_fax_headings":"","show_suburb_headings":"","show_state_headings":"","show_country_headings":"","show_pagination":"","show_pagination_results":"","initial_sort":"","presentation_style":"","show_contact_category":"","show_contact_list":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_links":"1","linka_name":"","linkb_name":"","linkc_name":"","linkd_name":"","linke_name":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":"","show_feed_link":"1","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 115, 116, 0, '*', 0),
-(431, 'fruitshop', 'Growers', 'growers', '', 'growers', 'index.php?option=com_content&view=category&layout=blog&id=30', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 7, '{"layout_type":"blog","show_category_title":"1","show_description":"1","show_description_image":"","maxLevel":"0","show_empty_categories":"","show_no_articles":"","show_subcat_desc":"","show_cat_num_articles":"","page_subheading":"","num_leading_articles":"5","num_intro_articles":"0","num_columns":"1","num_links":"4","multi_column_order":"","show_subcategory_content":"","orderby_pri":"","orderby_sec":"alpha","order_date":"","show_pagination":"","show_pagination_results":"","show_title":"1","link_titles":"1","show_intro":"1","show_category":"0","link_category":"","show_parent_category":"0","link_parent_category":"0","show_author":"0","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"0","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"0","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 113, 114, 0, '*', 0),
+(431, 'fruitshop', 'Growers', 'growers', '', 'growers', 'index.php?option=com_content&view=category&layout=blog&id=30', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 7, '{"layout_type":"blog","show_category_title":"1","show_description":"1","show_description_image":"","maxLevel":"0","show_empty_categories":"","show_no_articles":"","show_subcat_desc":"","show_cat_num_articles":"","page_subheading":"","num_leading_articles":"5","num_intro_articles":"0","num_links":"4","show_subcategory_content":"","orderby_pri":"","orderby_sec":"alpha","order_date":"","show_pagination":"","show_pagination_results":"","show_title":"1","link_titles":"1","show_intro":"1","show_category":"0","link_category":"","show_parent_category":"0","link_parent_category":"0","show_author":"0","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"0","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"0","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 113, 114, 0, '*', 0),
 (432, 'fruitshop', 'Login ', 'shop-login', '', 'shop-login', 'index.php?option=com_users&view=login', 'component', 1, 1, 1, 25, 0, '1970-01-01 00:00:00', 0, 1, '', 7, '{"login_redirect_url":"","logindescription_show":"1","login_description":"","login_image":"","logout_redirect_url":"","logoutdescription_show":"1","logout_description":"","logout_image":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 117, 118, 0, '*', 0),
 (433, 'fruitshop', 'Directions', 'directions', '', 'directions', 'index.php?option=com_content&view=article&id=13', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 7, '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","urls_position":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 119, 120, 0, '*', 0),
 (435, 'mainmenu', 'Home', 'homepage', '', 'homepage', 'index.php?option=com_content&view=article&id=24', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_title":"1","link_titles":"","show_intro":"","show_category":"0","link_category":"0","show_parent_category":"0","link_parent_category":"0","show_author":"0","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"0","show_item_navigation":"0","show_vote":"","show_icons":"0","show_print_icon":"0","show_email_icon":"0","show_hits":"0","show_noauth":"","urls_position":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 11, 12, 1, '*', 0),
@@ -539,9 +541,9 @@ INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link
 (448, 'mainmenu', 'Site Administrator', 'site-administrator', '', 'site-administrator', 'administrator', 'url', 1, 1, 1, 0, 0, '1970-01-01 00:00:00', 1, 1, '', 0, '{"menu-anchor_title":"","menu-anchor_css":"","menu_image":""}', 127, 128, 0, '*', 0),
 (449, 'usermenu', 'Submit an Article', 'submit-an-article', '', 'submit-an-article', 'index.php?option=com_content&view=form&layout=edit', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 3, '', 0, '{"menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 129, 130, 0, '*', 0),
 (452, 'frontendviews', 'Featured Contacts', 'featured-contacts', '', 'featured-contacts', 'index.php?option=com_contact&view=featured&id=16', 'component', 1, 1, 1, 8, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"-1","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","display_num":"","show_headings":"","filter_field":"","show_pagination":"","show_noauth":"","presentation_style":"sliders","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_links":"1","linka_name":"","linkb_name":"","linkc_name":"","linkd_name":"","linke_name":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 159, 160, 0, '*', 0),
-(456, 'aboutjoomla', 'Beez5', 'beez5', '', 'using-joomla/extensions/templates/beez5', 'index.php?option=com_content&view=category&layout=blog&id=70', 'component', 1, 282, 4, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 56, 61, 0, '*', 0),
+(456, 'aboutjoomla', 'Beez5', 'beez5', '', 'using-joomla/extensions/templates/beez5', 'index.php?option=com_content&view=category&layout=blog&id=70', 'component', 1, 282, 4, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"1","show_description_image":"","show_category_title":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"4","num_links":"4","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 56, 61, 0, '*', 0),
 (457, 'aboutjoomla', 'Typography Beez5', 'typography-beez-5', '', 'using-joomla/extensions/templates/beez5/typography-beez-5', 'index.php?option=com_content&view=article&id=49', 'component', 1, 456, 5, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 57, 58, 0, '*', 0),
-(458, 'aboutjoomla', 'Home Page Beez5', 'home-page-beez5', '', 'using-joomla/extensions/templates/beez5/home-page-beez5', 'index.php?option=com_content&view=featured', 'component', 1, 456, 5, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 59, 60, 0, '*', 0),
+(458, 'aboutjoomla', 'Home Page Beez5', 'home-page-beez5', '', 'using-joomla/extensions/templates/beez5/home-page-beez5', 'index.php?option=com_content&view=featured', 'component', 1, 456, 5, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"maxLevel":"","show_empty_categories":"","show_description":"","show_description_image":"","show_cat_num_articles":"","num_leading_articles":"1","num_intro_articles":"3","num_links":"0","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"","show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 59, 60, 0, '*', 0),
 (459, 'modules', 'Article Category', 'article-category', '', 'article-category', 'index.php?option=com_content&view=article&id=4', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"show_noauth":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","robots":"","rights":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","secure":0}', 207, 208, 0, '*', 0),
 (462, 'fruitshop', 'Add a recipe', 'add-a-recipe', '', 'add-a-recipe', 'index.php?option=com_content&view=form&layout=edit', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 4, '', 7, '{"enable_category":"0","catid":"14","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 131, 132, 0, '*', 0),
 (463, 'fruitshop', 'Recipes', 'recipes', '', 'recipes', 'index.php?option=com_content&view=category&id=76', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 7, '{"show_category_title":"1","show_description":"1","show_description_image":"","maxLevel":"0","show_empty_categories":"0","show_no_articles":"","show_subcat_desc":"","show_cat_num_articles":"","page_subheading":"","show_pagination_limit":"","filter_field":"","show_headings":"","list_show_date":"","date_format":"","list_show_hits":"","list_show_author":"","orderby_pri":"","orderby_sec":"","order_date":"","show_pagination":"","show_pagination_results":"","display_num":"10","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 133, 134, 0, '*', 0),
@@ -581,86 +583,87 @@ SELECT setval('#__menu_types_id_seq', max(id)) FROM "#__menu_types";
 --
 
 INSERT INTO "#__modules" ("id", "title", "note", "content", "ordering", "position", "checked_out", "checked_out_time", "publish_up", "publish_down", "published", "module", "access", "showtitle", "params", "client_id", "language") VALUES
-(1, 'Main Menu', '', '', 1, 'sidebar-right', 0, '2017-03-22 14:43:08', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(3, 'Popular Articles', '', '', 2, 'cpanel', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_popular', 3, 1, '{"count":"5","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
-(4, 'Recently Added Articles', '', '', 1, 'cpanel', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_latest', 3, 1, '{"count":"5","ordering":"c_dsc","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
-(8, 'Toolbar', '', '', 1, 'toolbar', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_toolbar', 3, 1, '', 1, '*'),
-(9, 'Quick Icons', '', '', 1, 'icon', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_quickicon', 3, 1, '', 1, '*'),
-(10, 'Logged-in Users', '', '', 4, 'cpanel', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_logged', 3, 1, '{"count":"5","name":"1","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
-(12, 'Admin Menu', '', '', 1, 'menu', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 3, 1, '{"layout":"","moduleclass_sfx":"","shownew":"1","showhelp":"1","cache":"0"}', 1, '*'),
-(14, 'User Status', '', '', 2, 'status', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_status', 3, 1, '', 1, '*'),
-(15, 'Title', '', '', 1, 'title', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_title', 3, 1, '', 1, '*'),
-(16, 'Login Form', '', '', 2, 'sidebar-right', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_login', 1, 1, '{"pretext":"","posttext":"","login":"","logout":"","greeting":"1","profilelink":"0","name":"0","usetext":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"card-title","style":"Cassiopeia-cardGrey"}', 0, '*'),
-(17, 'Breadcrumbs', '', '', 1, 'breadcrumbs', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_breadcrumbs', 1, 1, '{"moduleclass_sfx":"","showHome":"1","homeText":"","showComponent":"1","separator":"","cache":"0","cache_time":"0","cachemode":"itemid"}', 0, '*'),
-(18, 'Book Store', '', '', 1, 'position-10', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"3","catid":[""],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Books!","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
-(19, 'User Menu', '', '', 3, 'sidebar-right', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 2, 1, '{"menutype":"usermenu","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'),
-(20, 'Top', '', '', 1, 'menu', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"top","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":" navbar-nav mr-auto","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(22, 'Australian Parks ', '', '', 2, 'position-5', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"parks","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, 'en-GB'),
-(23, 'A Deep Menu', '', '', 4, 'sidebar-right', 0, '2017-03-22 14:18:02', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"aboutjoomla","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(25, 'Site Map', '', '', 1, 'sitemapload', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 1, 0, '{"menutype":"mainmenu","startLevel":"2","endLevel":"3","showAllChildren":"1","tag_id":"","class_sfx":"sitemap","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'),
-(26, 'This Site', '', '', 5, 'sidebar-right', 0, '2017-03-22 14:17:57', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","base":"","startLevel":"1","endLevel":"1","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(27, 'Archived Articles', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_articles_archive', 1, 1, '{"count":"10","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(28, 'Latest News', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_articles_latest', 1, 1, '{"catid":["19"],"count":"5","show_featured":"","ordering":"c_dsc","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(29, 'Articles Most Read', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_articles_popular', 1, 1, '{"catid":["26","29"],"count":"5","show_front":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(30, 'Feed Display', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_feed', 1, 1, '{"rssurl":"http:\\/\\/feeds.joomla.org\\/JoomlaMagazine","rssdesc":"1","rssimage":"1","rssitems":"3","rssitemdesc":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
-(31, 'News Flash', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_articles_news', 1, 1, '{"catid":["19"],"image":"0","item_title":"0","link_titles":"","item_heading":"h4","showLastSeparator":"1","readmore":"1","count":"1","ordering":"a.publish_up","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'),
-(33, 'Random Image', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_random_image', 1, 1, '{"type":"jpg","folder":"images\\/sampledata\\/parks\\/animals","link":"","width":"180","height":"","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 0, '*'),
-(34, 'Articles Related Items', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_related_items', 1, 1, '{"showDate":"0","layout":"_:default","moduleclass_sfx":"","owncache":"1"}', 0, '*'),
-(36, 'Statistics', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_stats', 1, 1, '{"serverinfo":"1","siteinfo":"1","counter":"1","increase":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(37, 'Syndicate Feeds', '', '', 1, 'syndicateload', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_syndicate', 1, 1, '{"text":"Feed Entries","format":"rss","layout":"","moduleclass_sfx":"","cache":"0"}', 0, '*'),
-(38, 'Users Latest', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_users_latest', 1, 1, '{"shownumber":"5","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"static"}', 0, '*'),
-(39, 'Who''s Online', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_whosonline', 1, 1, '{"showmode":"2","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 0, '*'),
-(40, 'Wrapper', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_wrapper', 1, 1, '{"url":"https:\\/\\/www.youtube.com\\/embed\\/vb2eObvmvdI","add":"1","scrolling":"auto","width":"640","height":"390","height_auto":"1","target":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(41, 'Footer', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_footer', 1, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(45, 'Menu Example', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'),
-(47, 'Latest Park Blogs', '', '', 6, 'sidebar-right', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_articles_latest', 1, 1, '{"catid":["27"],"count":"5","ordering":"c_dsc","user_id":"0","show_front":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, 'en-GB'),
-(48, 'Custom', '', '<p>This is a custom module. That means you can enter whatever content you want.</p>', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 1, '{"prepare_content":"1","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(52, 'Breadcrumbs', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_breadcrumbs', 1, 1, '{"showHere":"1","showHome":"1","homeText":"Home","showLast":"1","separator":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"0","cachemode":"itemid"}', 0, '*'),
-(56, 'Banners', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_banners', 1, 1, '{"target":"1","count":"1","cid":"1","catid":["15"],"tag_search":"0","ordering":"random","header_text":"","footer_text":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
-(57, 'Fruit Shop', '', '', 3, 'position-5', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"fruitshop","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'),
-(58, 'Special!', '', '<h1>This week we have a special, half price on delicious oranges!</h1><div>Only for our special customers!</div><div>Use the code: Joomla! when ordering</div><p><em>This module can only be seen by people in the customers group or higher.</em></p>', 1, 'position-12', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 4, 1, '{"prepare_content":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(61, 'Articles Categories', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_articles_categories', 1, 1, '{"parent":"29","show_description":"0","show_children":"0","count":"0","maxlevel":"0","layout":"_:default","item_heading":"4","moduleclass_sfx":"","owncache":"1","cache_time":"900"}', 0, '*'),
-(63, 'Search', '', '', 1, 'search', 0, '2017-03-22 16:31:37', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_search', 1, 1, '{"label":"","text":"","button":"0","imagebutton":"1","button_text":"","opensearch":"1","opensearch_title":"","set_itemid":"0","layout":"_:default","moduleclass_sfx":" hidden-md-down","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(64, 'Language Switcher', '', '', 1, 'sidebar-left', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 0, 'mod_languages', 1, 1, '{"header_text":"","footer_text":"","dropdown":"0","dropdownimage":"1","lineheight":"0","image":"1","show_active":"1","full_name":"1","inline":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(65, 'About Fruit Shop', '', '<p>The Fruit Shop site shows a number of Joomla! features.</p><p>The template uses classes in cascading style sheets to change the layout of items, such as creating the horizontal alphabetical list in the Fruit Encyclopedia.</p><p> </p>', 1, 'position-4', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 1, '{"prepare_content":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(67, 'Extensions', '', '', 2, 'sidebar-right', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 0, 'mod_menu', 1, 1, '{"menutype":"aboutjoomla","startLevel":"1","endLevel":"6","showAllChildren":"1","tag_id":"","class_sfx":"-menu","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'),
-(68, 'About Parks', '', '<p>The Parks sample site is designed as a simple site that can be routinely updated from the front end of Joomla!.</p><p>As a site, it is largely focused on a blog which can be updated using the front end article submission.</p><p>New weblinks can also be added through the front end.</p><p>A simple image gallery uses com_content with thumbnails displayed in a blog layout and full size images shown in article layout.</p><p>The Parks site features the language switch module. All of the content and modules are tagged as English (en-GB). If a second language pack is added with sample data this can be filtered using the language switch.</p><p>Parks uses HTML5 which is a major web standard (along with XHTML which is used in other areas of sample data).</p>', 2, 'position-4', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 1, '{"prepare_content":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
-(69, 'Articles Category', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_articles_category', 1, 1, '{"mode":"normal","show_on_article_page":"1","show_front":"show","count":"0","category_filtering_type":"1","catid":["72"],"show_child_category_articles":"0","levels":"1","author_filtering_type":"1","created_by":[""],"author_alias_filtering_type":"1","created_by_alias":[""],"excluded_articles":"","date_filtering":"off","date_field":"a.created","start_date_range":"","end_date_range":"","relative_date":"30","article_ordering":"a.title","article_ordering_direction":"ASC","article_grouping":"none","article_grouping_direction":"ksort","month_year_format":"F Y","item_heading":"4","link_titles":"1","show_date":"0","show_date_field":"created","show_date_format":"Y-m-d H:i:s","show_category":"0","show_hits":"0","show_author":"0","show_introtext":"0","introtext_limit":"100","show_readmore":"0","show_readmore_title":"1","readmore_limit":"15","layout":"_:default","moduleclass_sfx":"","owncache":"1","cache_time":"900"}', 0, '*'),
-(77, 'Shop', '', '', 1, 'position-11', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"2","catid":["15"],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Shop!","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
-(78, 'Contribute', '', '', 1, 'position-9', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"1","catid":["15"],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Contribute! ","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
-(79, 'Multilanguage status', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 0, 'mod_multilangstatus', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
-(84, 'Smart Search Module', '', '', 2, 'sidebar-left', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_finder', 1, 1, '{"searchfilter":"","show_autosuggest":"1","show_advanced":"0","show_label":"0","alt_label":"","show_button":"1","opensearch":"1","opensearch_title":"","set_itemid":"0","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(86, 'Joomla Version', '', '', 1, 'status', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_version', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
-(87, 'All Front End  Views', '', '', 2, 'sidebar-right', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"frontendviews","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(88, 'All Modules', '', '', 1, 'sidebar-left', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"modules","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(89, 'Fruit Shop', '', '', 1, 'sidebar-right', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"fruitshop","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(90, 'Custom Module', '', '<p>Example custom module for the testing data.</p>', 5, 'cpanel', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 1, '{"prepare_content":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
-(91, 'Admin Feed Module', '', '', 6, 'cpanel', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 0, 'mod_feed', 1, 1, '{"rssurl":"http:\\/\\/feeds.joomla.org\\/JoomlaAnnouncements","rssdesc":"1","rssimage":"1","rssitems":"3","rssitemdesc":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
-(92, 'Statistics', '', '', 3, 'cpanel', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_stats_admin', 1, 1, '{"serverinfo":"1","siteinfo":"1","counter":"1","increase":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
-(93, 'Popular Tags', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_tags_popular', 1, 1, '{"maximum":"5","timeframe":"alltime","order_value":"count","order_direction":"1","display_count":0,"no_results_text":"0","minsize":1,"maxsize":2,"layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(94, 'Similar Tags', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_tags_similar', 1, 1, '{"maximum":"5","matchtype":"any","layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(95, 'Syndicate Feeds', '', '', 1, 'position-8', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_syndicate', 1, 1, '{"display_text":1,"text":"Feed Entries","format":"rss","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(97, 'Similar Tags 2', '', '', 1, 'position-8', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_tags_similar', 1, 1, '{"maximum":"5","matchtype":"any","layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(98, 'Top-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-a', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(99, 'Top-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-a', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(100, 'Top-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-a', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-secondary","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(101, 'Top-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-a', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-info","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(102, 'Top-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-b', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-primary","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(103, 'Top-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-b', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-success","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(104, 'Top-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-b', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-danger","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(105, 'Top-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-b', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-warning","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(106, 'Main-top', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Main-top</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'main-top', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"12","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(110, 'Bottom-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Bottom-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-a', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-primary text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(111, 'Main-bottom', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Main-bottom</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'main-bottom', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"12","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(112, 'Bottom-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Bottom-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-a', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-info text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(113, 'Bottom-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Bottom-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-a', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-success text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(114, 'Bottom-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Bottom-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-a', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-warning text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(115, 'Bottom-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span><span class="badge badge-primary">New</span></p>\r\n<p class="demo-title">Bottom-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-b', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(116, 'Bottom-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span><span class="badge badge-info">New</span></p>\r\n<p class="demo-title">Bottom-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-b', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(117, 'Bottom-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span><span class="badge badge-success">New</span></p>\r\n<p class="demo-title">Bottom-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-b', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(118, 'Bottom-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span><span class="badge badge-default">New</span></p>\r\n<p class="demo-title">Bottom-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-b', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-danger text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
-(119, 'Banner', '', '<p><img src="images/banners/banner.jpg"></p>', 1, 'banner', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(120, 'Footer', '', '&copy; Joomla! CMS', 1, 'footer', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 1, '', 0, '*');
+(1, 'Main Menu', '', '', 1, 'sidebar-right', 0, '2017-03-22 14:43:08', NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(3, 'Popular Articles', '', '', 2, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_popular', 3, 1, '{"count":"5","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
+(4, 'Recently Added Articles', '', '', 1, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_latest', 3, 1, '{"count":"5","ordering":"c_dsc","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
+(8, 'Toolbar', '', '', 1, 'toolbar', 0, NULL, NULL, NULL, 1, 'mod_toolbar', 3, 1, '', 1, '*'),
+(9, 'Quick Icons', '', '', 1, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 3, 1, '', 1, '*'),
+(10, 'Logged-in Users', '', '', 4, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_logged', 3, 1, '{"count":"5","name":"1","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
+(12, 'Admin Menu', '', '', 1, 'menu', 0, NULL, NULL, NULL, 1, 'mod_menu', 3, 1, '{"layout":"","moduleclass_sfx":"","shownew":"1","showhelp":"1","cache":"0"}', 1, '*'),
+(14, 'User Status', '', '', 2, 'status', 0, NULL, NULL, NULL, 1, 'mod_status', 3, 1, '', 1, '*'),
+(15, 'Title', '', '', 1, 'title', 0, NULL, NULL, NULL, 1, 'mod_title', 3, 1, '', 1, '*'),
+(16, 'Login Form', '', '', 2, 'sidebar-right', 0, NULL, NULL, NULL, 1, 'mod_login', 1, 1, '{"pretext":"","posttext":"","login":"","logout":"","greeting":"1","profilelink":"0","name":"0","usetext":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"card-title","style":"Cassiopeia-cardGrey"}', 0, '*'),
+(17, 'Breadcrumbs', '', '', 1, 'breadcrumbs', 0, NULL, NULL, NULL, 1, 'mod_breadcrumbs', 1, 1, '{"moduleclass_sfx":"","showHome":"1","homeText":"","showComponent":"1","separator":"","cache":"0","cache_time":"0","cachemode":"itemid"}', 0, '*'),
+(18, 'Book Store', '', '', 1, 'position-10', 0, NULL, NULL, NULL, 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"3","catid":[""],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Books!","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
+(19, 'User Menu', '', '', 3, 'sidebar-right', 0, NULL, NULL, NULL, 1, 'mod_menu', 2, 1, '{"menutype":"usermenu","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'),
+(20, 'Top', '', '', 1, 'menu', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"top","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":" navbar-nav mr-auto","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(22, 'Australian Parks ', '', '', 2, 'position-5', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"parks","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, 'en-GB'),
+(23, 'A Deep Menu', '', '', 4, 'sidebar-right', 0, '2017-03-22 14:18:02', NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"aboutjoomla","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(25, 'Site Map', '', '', 1, 'sitemapload', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 0, '{"menutype":"mainmenu","startLevel":"2","endLevel":"3","showAllChildren":"1","tag_id":"","class_sfx":"sitemap","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'),
+(26, 'This Site', '', '', 5, 'sidebar-right', 0, '2017-03-22 14:17:57', NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","base":"","startLevel":"1","endLevel":"1","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(27, 'Archived Articles', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_articles_archive', 1, 1, '{"count":"10","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(28, 'Latest News', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_articles_latest', 1, 1, '{"catid":["19"],"count":"5","show_featured":"","ordering":"c_dsc","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(29, 'Articles Most Read', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_articles_popular', 1, 1, '{"catid":["26","29"],"count":"5","show_front":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(30, 'Feed Display', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_feed', 1, 1, '{"rssurl":"http:\\/\\/feeds.joomla.org\\/JoomlaMagazine","rssdesc":"1","rssimage":"1","rssitems":"3","rssitemdesc":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
+(31, 'News Flash', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_articles_news', 1, 1, '{"catid":["19"],"image":"0","item_title":"0","link_titles":"","item_heading":"h4","showLastSeparator":"1","readmore":"1","count":"1","ordering":"a.publish_up","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'),
+(33, 'Random Image', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_random_image', 1, 1, '{"type":"jpg","folder":"images\\/sampledata\\/parks\\/animals","link":"","width":"180","height":"","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 0, '*'),
+(34, 'Articles Related Items', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_related_items', 1, 1, '{"showDate":"0","layout":"_:default","moduleclass_sfx":"","owncache":"1"}', 0, '*'),
+(36, 'Statistics', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_stats', 1, 1, '{"serverinfo":"1","siteinfo":"1","counter":"1","increase":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(37, 'Syndicate Feeds', '', '', 1, 'syndicateload', 0, NULL, NULL, NULL, 1, 'mod_syndicate', 1, 1, '{"text":"Feed Entries","format":"rss","layout":"","moduleclass_sfx":"","cache":"0"}', 0, '*'),
+(38, 'Users Latest', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_users_latest', 1, 1, '{"shownumber":"5","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"static"}', 0, '*'),
+(39, 'Who''s Online', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_whosonline', 1, 1, '{"showmode":"2","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 0, '*'),
+(40, 'Wrapper', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_wrapper', 1, 1, '{"url":"https:\\/\\/www.youtube.com\\/embed\\/vb2eObvmvdI","add":"1","scrolling":"auto","width":"640","height":"390","height_auto":"1","target":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(41, 'Footer', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_footer', 1, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(45, 'Menu Example', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'),
+(47, 'Latest Park Blogs', '', '', 6, 'sidebar-right', 0, NULL, NULL, NULL, 1, 'mod_articles_latest', 1, 1, '{"catid":["27"],"count":"5","ordering":"c_dsc","user_id":"0","show_front":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, 'en-GB'),
+(48, 'Custom', '', '<p>This is a custom module. That means you can enter whatever content you want.</p>', 1, '', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 1, '{"prepare_content":"1","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(52, 'Breadcrumbs', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_breadcrumbs', 1, 1, '{"showHere":"1","showHome":"1","homeText":"Home","showLast":"1","separator":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"0","cachemode":"itemid"}', 0, '*'),
+(56, 'Banners', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_banners', 1, 1, '{"target":"1","count":"1","cid":"1","catid":["15"],"tag_search":"0","ordering":"random","header_text":"","footer_text":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
+(57, 'Fruit Shop', '', '', 3, 'position-5', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"fruitshop","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'),
+(58, 'Special!', '', '<h1>This week we have a special, half price on delicious oranges!</h1><div>Only for our special customers!</div><div>Use the code: Joomla! when ordering</div><p><em>This module can only be seen by people in the customers group or higher.</em></p>', 1, 'position-12', 0, NULL, NULL, NULL, 1, 'mod_custom', 4, 1, '{"prepare_content":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(61, 'Articles Categories', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_articles_categories', 1, 1, '{"parent":"29","show_description":"0","show_children":"0","count":"0","maxlevel":"0","layout":"_:default","item_heading":"4","moduleclass_sfx":"","owncache":"1","cache_time":"900"}', 0, '*'),
+(63, 'Search', '', '', 1, 'search', 0, '2017-03-22 16:31:37', NULL, NULL, 1, 'mod_search', 1, 1, '{"label":"","text":"","button":"0","imagebutton":"1","button_text":"","opensearch":"1","opensearch_title":"","set_itemid":"0","layout":"_:default","moduleclass_sfx":" hidden-md-down","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(64, 'Language Switcher', '', '', 1, 'sidebar-left', 0, NULL, NULL, NULL, 0, 'mod_languages', 1, 1, '{"header_text":"","footer_text":"","dropdown":"0","dropdownimage":"1","lineheight":"0","image":"1","show_active":"1","full_name":"1","inline":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(65, 'About Fruit Shop', '', '<p>The Fruit Shop site shows a number of Joomla! features.</p><p>The template uses classes in cascading style sheets to change the layout of items, such as creating the horizontal alphabetical list in the Fruit Encyclopedia.</p><p> </p>', 1, 'position-4', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 1, '{"prepare_content":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(67, 'Extensions', '', '', 2, 'sidebar-right', 0, NULL, NULL, NULL, 0, 'mod_menu', 1, 1, '{"menutype":"aboutjoomla","startLevel":"1","endLevel":"6","showAllChildren":"1","tag_id":"","class_sfx":"-menu","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'),
+(68, 'About Parks', '', '<p>The Parks sample site is designed as a simple site that can be routinely updated from the front end of Joomla!.</p><p>As a site, it is largely focused on a blog which can be updated using the front end article submission.</p><p>New weblinks can also be added through the front end.</p><p>A simple image gallery uses com_content with thumbnails displayed in a blog layout and full size images shown in article layout.</p><p>The Parks site features the language switch module. All of the content and modules are tagged as English (en-GB). If a second language pack is added with sample data this can be filtered using the language switch.</p><p>Parks uses HTML5 which is a major web standard (along with XHTML which is used in other areas of sample data).</p>', 2, 'position-4', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 1, '{"prepare_content":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'),
+(69, 'Articles Category', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_articles_category', 1, 1, '{"mode":"normal","show_on_article_page":"1","show_front":"show","count":"0","category_filtering_type":"1","catid":["72"],"show_child_category_articles":"0","levels":"1","author_filtering_type":"1","created_by":[""],"author_alias_filtering_type":"1","created_by_alias":[""],"excluded_articles":"","date_filtering":"off","date_field":"a.created","start_date_range":"","end_date_range":"","relative_date":"30","article_ordering":"a.title","article_ordering_direction":"ASC","article_grouping":"none","article_grouping_direction":"ksort","month_year_format":"F Y","item_heading":"4","link_titles":"1","show_date":"0","show_date_field":"created","show_date_format":"Y-m-d H:i:s","show_category":"0","show_hits":"0","show_author":"0","show_introtext":"0","introtext_limit":"100","show_readmore":"0","show_readmore_title":"1","readmore_limit":"15","layout":"_:default","moduleclass_sfx":"","owncache":"1","cache_time":"900"}', 0, '*'),
+(77, 'Shop', '', '', 1, 'position-11', 0, NULL, NULL, NULL, 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"2","catid":["15"],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Shop!","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
+(78, 'Contribute', '', '', 1, 'position-9', 0, NULL, NULL, NULL, 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"1","catid":["15"],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Contribute! ","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
+(79, 'Multilanguage status', '', '', 1, '', 0, NULL, NULL, NULL, 0, 'mod_multilangstatus', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
+(84, 'Smart Search Module', '', '', 2, 'sidebar-left', 0, NULL, NULL, NULL, 1, 'mod_finder', 1, 1, '{"searchfilter":"","show_autosuggest":"1","show_advanced":"0","show_label":"0","alt_label":"","show_button":"1","opensearch":"1","opensearch_title":"","set_itemid":"0","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(86, 'Joomla Version', '', '', 1, 'status', 0, NULL, NULL, NULL, 1, 'mod_version', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
+(87, 'All Front End  Views', '', '', 2, 'sidebar-right', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"frontendviews","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(88, 'All Modules', '', '', 1, 'sidebar-left', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"modules","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(89, 'Fruit Shop', '', '', 1, 'sidebar-right', 0, NULL, NULL, NULL, 1, 'mod_menu', 1, 1, '{"menutype":"fruitshop","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(90, 'Custom Module', '', '<p>Example custom module for the testing data.</p>', 5, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 1, '{"prepare_content":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
+(91, 'Admin Feed Module', '', '', 6, 'cpanel', 0, NULL, NULL, NULL, 0, 'mod_feed', 1, 1, '{"rssurl":"http:\\/\\/feeds.joomla.org\\/JoomlaAnnouncements","rssdesc":"1","rssimage":"1","rssitems":"3","rssitemdesc":"1","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
+(92, 'Statistics', '', '', 3, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_stats_admin', 1, 1, '{"serverinfo":"1","siteinfo":"1","counter":"1","increase":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
+(93, 'Popular Tags', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_tags_popular', 1, 1, '{"maximum":"5","timeframe":"alltime","order_value":"count","order_direction":"1","display_count":0,"no_results_text":"0","minsize":1,"maxsize":2,"layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(94, 'Similar Tags', '', '', 1, '', 0, NULL, NULL, NULL, 1, 'mod_tags_similar', 1, 1, '{"maximum":"5","matchtype":"any","layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(95, 'Syndicate Feeds', '', '', 1, 'position-8', 0, NULL, NULL, NULL, 1, 'mod_syndicate', 1, 1, '{"display_text":1,"text":"Feed Entries","format":"rss","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(97, 'Similar Tags 2', '', '', 1, 'position-8', 0, NULL, NULL, NULL, 1, 'mod_tags_similar', 1, 1, '{"maximum":"5","matchtype":"any","layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(98, 'Top-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-a', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(99, 'Top-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-a', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(100, 'Top-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-a', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-secondary","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(101, 'Top-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-a', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-info","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(102, 'Top-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-b', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-primary","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(103, 'Top-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-b', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-success","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(104, 'Top-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-b', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-danger","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(105, 'Top-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Top-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'top-b', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" border-warning","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(106, 'Main-top', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Main-top</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'main-top', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"12","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(110, 'Bottom-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Bottom-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-a', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-primary text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(111, 'Main-bottom', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Main-bottom</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'main-bottom', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"12","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(112, 'Bottom-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Bottom-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-a', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-info text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(113, 'Bottom-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Bottom-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-a', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-success text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(114, 'Bottom-a', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span></p>\r\n<p class="demo-title">Bottom-a</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-a', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-warning text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(115, 'Bottom-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span><span class="badge badge-primary">New</span></p>\r\n<p class="demo-title">Bottom-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-b', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(116, 'Bottom-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span><span class="badge badge-info">New</span></p>\r\n<p class="demo-title">Bottom-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-b', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(117, 'Bottom-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span><span class="badge badge-success">New</span></p>\r\n<p class="demo-title">Bottom-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-b', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(118, 'Bottom-b', '', '<div class="demo-module">\r\n<p><span class="fa fa-joomla">&nbsp;</span><span class="badge badge-default">New</span></p>\r\n<p class="demo-title">Bottom-b</p>\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>\r\n</div>', 1, 'bottom-b', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":" bg-danger text-white","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"3","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
+(119, 'Banner', '', '<p><img src="images/banners/banner.jpg"></p>', 1, 'banner', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
+(120, 'Footer', '', '&copy; Joomla! CMS', 1, 'footer', 0, NULL, NULL, NULL, 1, 'mod_custom', 1, 1, '', 0, '*'),
+(121, 'Latest Actions', '', '', 0, 'cpanel', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_latestactions', 6, 1, '{}', 1, '*');
 
 
 
@@ -849,6 +852,7 @@ INSERT INTO "#__modules_menu" ("moduleid", "menuid") VALUES
 (118, 435),
 (119, 435),
 (120, 0);
+(121, 0);
 
 --
 -- Dumping data for table `#__newsfeeds`
diff --git a/installation/src/Application/InstallationApplication.php b/installation/src/Application/InstallationApplication.php
index 1459511cf0c46..e357e8a7f0699 100644
--- a/installation/src/Application/InstallationApplication.php
+++ b/installation/src/Application/InstallationApplication.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/Controller/DisplayController.php b/installation/src/Controller/DisplayController.php
index 16b6c151749fd..c10285b022ac9 100644
--- a/installation/src/Controller/DisplayController.php
+++ b/installation/src/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/Controller/InstallationController.php b/installation/src/Controller/InstallationController.php
index 02411b4092edd..e7565e6ae3e97 100644
--- a/installation/src/Controller/InstallationController.php
+++ b/installation/src/Controller/InstallationController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/Controller/JSONController.php b/installation/src/Controller/JSONController.php
index fca34fe5077b0..db0922e6930f9 100644
--- a/installation/src/Controller/JSONController.php
+++ b/installation/src/Controller/JSONController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -70,6 +70,6 @@ protected function sendJsonResponse($response)
 	public function checkValidToken()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or $this->sendJsonResponse(new \Exception(Text::_('JINVALID_TOKEN'), 403));
+		Session::checkToken() or $this->sendJsonResponse(new \Exception(Text::_('JINVALID_TOKEN_NOTICE'), 403));
 	}
 }
diff --git a/installation/src/Controller/LanguageController.php b/installation/src/Controller/LanguageController.php
index 2e35e2e5e3407..a102b4db5ca1c 100644
--- a/installation/src/Controller/LanguageController.php
+++ b/installation/src/Controller/LanguageController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/Error/Renderer/JsonRenderer.php b/installation/src/Error/Renderer/JsonRenderer.php
index 75c3f63f98b8f..145b41034cc7d 100644
--- a/installation/src/Error/Renderer/JsonRenderer.php
+++ b/installation/src/Error/Renderer/JsonRenderer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Error
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/Form/Field/Installation/LanguageField.php b/installation/src/Form/Field/Installation/LanguageField.php
index 28ee44bc65179..0a27e0c680fb0 100644
--- a/installation/src/Form/Field/Installation/LanguageField.php
+++ b/installation/src/Form/Field/Installation/LanguageField.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/Form/Field/Installation/PrefixField.php b/installation/src/Form/Field/Installation/PrefixField.php
index 26aa029da0c85..5d50d75c56d83 100644
--- a/installation/src/Form/Field/Installation/PrefixField.php
+++ b/installation/src/Form/Field/Installation/PrefixField.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/Form/Field/Installation/SampleField.php b/installation/src/Form/Field/Installation/SampleField.php
index aab25961e79d6..38c4486cfe580 100644
--- a/installation/src/Form/Field/Installation/SampleField.php
+++ b/installation/src/Form/Field/Installation/SampleField.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -53,6 +53,10 @@ protected function getOptions()
 		{
 			$type = 'postgresql';
 		}
+		elseif ($type === 'pgsql')
+		{
+			$type = 'postgresql';
+		}
 
 		// Get a list of files in the search path with the given filter.
 		$files = Folder::files(JPATH_INSTALLATION . '/sql/' . $type, '^sample.*\.sql$');
diff --git a/installation/src/Form/Rule/PrefixRule.php b/installation/src/Form/Rule/PrefixRule.php
index 15b7dee896614..fc7b742ff4cfb 100644
--- a/installation/src/Form/Rule/PrefixRule.php
+++ b/installation/src/Form/Rule/PrefixRule.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/Helper/DatabaseHelper.php b/installation/src/Helper/DatabaseHelper.php
index bb75be1bcfbf3..816b80eaaf40b 100644
--- a/installation/src/Helper/DatabaseHelper.php
+++ b/installation/src/Helper/DatabaseHelper.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/Model/BaseInstallationModel.php b/installation/src/Model/BaseInstallationModel.php
index 73639560617f0..0342263b2d5c8 100644
--- a/installation/src/Model/BaseInstallationModel.php
+++ b/installation/src/Model/BaseInstallationModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/Model/ChecksModel.php b/installation/src/Model/ChecksModel.php
index c5cdf67334101..fdb33468a1dc7 100644
--- a/installation/src/Model/ChecksModel.php
+++ b/installation/src/Model/ChecksModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/Model/CleanupModel.php b/installation/src/Model/CleanupModel.php
index 551617d380595..e7c0eab1de2b0 100644
--- a/installation/src/Model/CleanupModel.php
+++ b/installation/src/Model/CleanupModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/Model/ConfigurationModel.php b/installation/src/Model/ConfigurationModel.php
index e59c22a8feabd..9900e588f8cb9 100644
--- a/installation/src/Model/ConfigurationModel.php
+++ b/installation/src/Model/ConfigurationModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -124,6 +124,7 @@ public function createConfiguration($options)
 		// Debug settings.
 		$registry->set('debug', false);
 		$registry->set('debug_lang', false);
+		$registry->set('debug_lang_const', true);
 
 		// Database settings.
 		$registry->set('dbtype', $options->db_type);
diff --git a/installation/src/Model/DatabaseModel.php b/installation/src/Model/DatabaseModel.php
index cf0f5e25a8362..5e02bb3a94a01 100644
--- a/installation/src/Model/DatabaseModel.php
+++ b/installation/src/Model/DatabaseModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -147,14 +147,6 @@ public function initialise()
 			return false;
 		}
 
-		// Ensure that a database name was input.
-		if (empty($options->db_name))
-		{
-			Factory::getApplication()->enqueueMessage(Text::_('INSTL_DATABASE_EMPTY_NAME'), 'warning');
-
-			return false;
-		}
-
 		// Validate database table prefix.
 		if (isset($options->db_prefix) && !preg_match('#^[a-zA-Z]+[a-zA-Z0-9_]*$#', $options->db_prefix))
 		{
@@ -180,7 +172,7 @@ public function initialise()
 		}
 
 		// Validate database name.
-		if (in_array($options->db_type, ['pgsql', 'postgresql']) && !preg_match('#^[a-zA-Z_][0-9a-zA-Z_$]*$#', $options->db_name))
+		if (in_array($options->db_type, ['pgsql', 'postgresql'], true) && !preg_match('#^[a-zA-Z_][0-9a-zA-Z_$]*$#', $options->db_name))
 		{
 			Factory::getApplication()->enqueueMessage(Text::_('INSTL_DATABASE_NAME_MSG_POSTGRESQL'), 'warning');
 
@@ -931,6 +923,7 @@ protected function updateDates($db)
 				$query = $db->getQuery(true)
 					->update($db->quoteName($table))
 					->set($db->quoteName($field) . ' = ' . $db->quote($currentDate))
+					->where($db->quoteName($field) . ' IS NOT NULL')
 					->where($db->quoteName($field) . ' != ' . $db->quote($nullDate));
 
 				$db->setQuery($query);
diff --git a/installation/src/Model/LanguagesModel.php b/installation/src/Model/LanguagesModel.php
index 7afdc77cf4918..f2530e9d5e207 100644
--- a/installation/src/Model/LanguagesModel.php
+++ b/installation/src/Model/LanguagesModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -921,8 +921,8 @@ public function addFeaturedMenuItem($itemLanguage)
 			'level'        => 1,
 			'home'         => 1,
 			'params'       => '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1",'
-				. '"num_intro_articles":"3","num_columns":"3","num_links":"0","orderby_pri":"","orderby_sec":"front",'
-				. '"order_date":"","multi_column_order":"1","show_pagination":"2","show_pagination_results":"1","show_noauth":"",'
+				. '"num_intro_articles":"3","num_links":"0","orderby_pri":"","orderby_sec":"front",'
+				. '"order_date":"","show_pagination":"2","show_pagination_results":"1","show_noauth":"",'
 				. '"article-allow_ratings":"","article-allow_comments":"","show_feed_link":"1","feed_summary":"",'
 				. '"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"",'
 				. '"show_parent_category":"","link_parent_category":"","show_author":"","show_create_date":"",'
@@ -997,8 +997,8 @@ public function addAllCategoriesMenuItem($itemLanguage)
 				. '"show_empty_categories_cat":"","show_subcat_desc_cat":"","show_cat_num_articles_cat":"",'
 				. '"show_category_title":"","show_description":"","show_description_image":"","maxLevel":"",'
 				. '"show_empty_categories":"","show_no_articles":"","show_subcat_desc":"","show_cat_num_articles":"",'
-				. '"num_leading_articles":"","num_intro_articles":"","num_columns":"","num_links":"",'
-				. '"multi_column_order":"","show_subcategory_content":"","orderby_pri":"","orderby_sec":"",'
+				. '"num_leading_articles":"","num_intro_articles":"","num_links":"",'
+				. '"show_subcategory_content":"","orderby_pri":"","orderby_sec":"",'
 				. '"order_date":"","show_pagination_limit":"","filter_field":"","show_headings":"",'
 				. '"list_show_date":"","date_format":"","list_show_hits":"","list_show_author":"","display_num":"10",'
 				. '"show_pagination":"","show_pagination_results":"","show_title":"","link_titles":"",'
@@ -1351,8 +1351,8 @@ public function addBlogMenuItem($itemLanguage, $categoryId)
 			'params'       => '{"layout_type":"blog","show_category_heading_title_text":"","show_category_title":"",'
 				. '"show_description":"","show_description_image":"","maxLevel":"","show_empty_categories":"",'
 				. '"show_no_articles":"","show_subcat_desc":"","show_cat_num_articles":"","show_cat_tags":"",'
-				. '"page_subheading":"","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3",'
-				. '"num_links":"0","multi_column_order":"1","show_subcategory_content":"","orderby_pri":"",'
+				. '"page_subheading":"","num_leading_articles":"1","num_intro_articles":"3",'
+				. '"num_links":"0","show_subcategory_content":"","orderby_pri":"",'
 				. '"orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1",'
 				. '"show_featured":"","show_title":"","link_titles":"","show_intro":"","info_block_position":"",'
 				. '"info_block_show_title":"","show_category":"","link_category":"","show_parent_category":"",'
diff --git a/installation/src/Model/SetupModel.php b/installation/src/Model/SetupModel.php
index e872716e85d82..7dd2faceefde6 100644
--- a/installation/src/Model/SetupModel.php
+++ b/installation/src/Model/SetupModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -230,7 +230,9 @@ public function validate($data, $view = null)
 		if ($return === false)
 		{
 			// Get the validation messages from the form.
-			foreach ($form->getErrors() as $message)
+			$messages = array_reverse($form->getErrors());
+
+			foreach ($messages as $message)
 			{
 				if ($message instanceof \Exception)
 				{
diff --git a/installation/src/Response/JsonResponse.php b/installation/src/Response/JsonResponse.php
index aa7d2fb5595aa..a6c960dceb833 100644
--- a/installation/src/Response/JsonResponse.php
+++ b/installation/src/Response/JsonResponse.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Response
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/Router/InstallationRouter.php b/installation/src/Router/InstallationRouter.php
index 617fb2feeded1..757373aa5a30e 100644
--- a/installation/src/Router/InstallationRouter.php
+++ b/installation/src/Router/InstallationRouter.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/Service/Provider/Application.php b/installation/src/Service/Provider/Application.php
index f3efe25782dd2..52a51b16727d7 100644
--- a/installation/src/Service/Provider/Application.php
+++ b/installation/src/Service/Provider/Application.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Service
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/View/DefaultView.php b/installation/src/View/DefaultView.php
index 26ad953a3d21d..f085531fd9b9e 100644
--- a/installation/src/View/DefaultView.php
+++ b/installation/src/View/DefaultView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/View/Error/HtmlView.php b/installation/src/View/Error/HtmlView.php
index 273345c552f08..9943eb66c9b09 100644
--- a/installation/src/View/Error/HtmlView.php
+++ b/installation/src/View/Error/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/View/Preinstall/HtmlView.php b/installation/src/View/Preinstall/HtmlView.php
index bef09db520427..6a5db5351cd94 100644
--- a/installation/src/View/Preinstall/HtmlView.php
+++ b/installation/src/View/Preinstall/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/View/Remove/HtmlView.php b/installation/src/View/Remove/HtmlView.php
index cdcb758192c82..cae6aa8ac2f99 100644
--- a/installation/src/View/Remove/HtmlView.php
+++ b/installation/src/View/Remove/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/src/View/Setup/HtmlView.php b/installation/src/View/Setup/HtmlView.php
index a0b1345aa1941..23902f20680bf 100644
--- a/installation/src/View/Setup/HtmlView.php
+++ b/installation/src/View/Setup/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/template/body.php b/installation/template/body.php
index 46734af36a7aa..4ae20ddbab65c 100644
--- a/installation/template/body.php
+++ b/installation/template/body.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/template/css/template.css.map b/installation/template/css/template.css.map
deleted file mode 100644
index f6360453eec2b..0000000000000
--- a/installation/template/css/template.css.map
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-	"version": 3,
-	"file": "template.css",
-	"sources": [
-		"../scss/template.scss",
-		"../../../administrator/templates/atum/scss/_variables.scss",
-		"../../../media/vendor/bootstrap/scss/bootstrap.scss",
-		"../../../media/vendor/bootstrap/scss/_variables.scss",
-		"../../../media/vendor/bootstrap/scss/_mixins.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_breakpoints.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_hover.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_image.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_badge.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_resize.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_screen-reader.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_size.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_reset-text.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_text-emphasis.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_text-hide.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_text-truncate.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_transforms.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_visibility.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_alert.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_buttons.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_cards.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_pagination.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_lists.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_list-group.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_nav-divider.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_forms.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_table-row.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_background-variant.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_border-radius.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_gradients.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_clearfix.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_grid-framework.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_grid.scss",
-		"../../../media/vendor/bootstrap/scss/mixins/_float.scss",
-		"../../../media/vendor/bootstrap/scss/_custom.scss",
-		"../../../media/vendor/bootstrap/scss/_normalize.scss",
-		"../../../media/vendor/bootstrap/scss/_print.scss",
-		"../../../media/vendor/bootstrap/scss/_reboot.scss",
-		"../../../media/vendor/bootstrap/scss/_type.scss",
-		"../../../media/vendor/bootstrap/scss/_images.scss",
-		"../../../media/vendor/bootstrap/scss/_code.scss",
-		"../../../media/vendor/bootstrap/scss/_grid.scss",
-		"../../../media/vendor/bootstrap/scss/_tables.scss",
-		"../../../media/vendor/bootstrap/scss/_forms.scss",
-		"../../../media/vendor/bootstrap/scss/_buttons.scss",
-		"../../../media/vendor/bootstrap/scss/_transitions.scss",
-		"../../../media/vendor/bootstrap/scss/_dropdown.scss",
-		"../../../media/vendor/bootstrap/scss/_button-group.scss",
-		"../../../media/vendor/bootstrap/scss/_input-group.scss",
-		"../../../media/vendor/bootstrap/scss/_custom-forms.scss",
-		"../../../media/vendor/bootstrap/scss/_nav.scss",
-		"../../../media/vendor/bootstrap/scss/_navbar.scss",
-		"../../../media/vendor/bootstrap/scss/_card.scss",
-		"../../../media/vendor/bootstrap/scss/_breadcrumb.scss",
-		"../../../media/vendor/bootstrap/scss/_pagination.scss",
-		"../../../media/vendor/bootstrap/scss/_badge.scss",
-		"../../../media/vendor/bootstrap/scss/_jumbotron.scss",
-		"../../../media/vendor/bootstrap/scss/_alert.scss",
-		"../../../media/vendor/bootstrap/scss/_progress.scss",
-		"../../../media/vendor/bootstrap/scss/_media.scss",
-		"../../../media/vendor/bootstrap/scss/_list-group.scss",
-		"../../../media/vendor/bootstrap/scss/_responsive-embed.scss",
-		"../../../media/vendor/bootstrap/scss/_close.scss",
-		"../../../media/vendor/bootstrap/scss/_modal.scss",
-		"../../../media/vendor/bootstrap/scss/_tooltip.scss",
-		"../../../media/vendor/bootstrap/scss/_popover.scss",
-		"../../../media/vendor/bootstrap/scss/_carousel.scss",
-		"../../../media/vendor/bootstrap/scss/_utilities.scss",
-		"../../../media/vendor/bootstrap/scss/utilities/_align.scss",
-		"../../../media/vendor/bootstrap/scss/utilities/_background.scss",
-		"../../../media/vendor/bootstrap/scss/utilities/_borders.scss",
-		"../../../media/vendor/bootstrap/scss/utilities/_clearfix.scss",
-		"../../../media/vendor/bootstrap/scss/utilities/_display.scss",
-		"../../../media/vendor/bootstrap/scss/utilities/_flex.scss",
-		"../../../media/vendor/bootstrap/scss/utilities/_float.scss",
-		"../../../media/vendor/bootstrap/scss/utilities/_position.scss",
-		"../../../media/vendor/bootstrap/scss/utilities/_screenreaders.scss",
-		"../../../media/vendor/bootstrap/scss/utilities/_sizing.scss",
-		"../../../media/vendor/bootstrap/scss/utilities/_spacing.scss",
-		"../../../media/vendor/bootstrap/scss/utilities/_text.scss",
-		"../../../media/vendor/bootstrap/scss/utilities/_visibility.scss",
-		"../../../media/vendor/font-awesome/scss/font-awesome.scss",
-		"../../../media/vendor/font-awesome/scss/_variables.scss",
-		"../../../media/vendor/font-awesome/scss/_mixins.scss",
-		"../../../media/vendor/font-awesome/scss/_path.scss",
-		"../../../media/vendor/font-awesome/scss/_core.scss",
-		"../../../media/vendor/font-awesome/scss/_larger.scss",
-		"../../../media/vendor/font-awesome/scss/_fixed-width.scss",
-		"../../../media/vendor/font-awesome/scss/_list.scss",
-		"../../../media/vendor/font-awesome/scss/_bordered-pulled.scss",
-		"../../../media/vendor/font-awesome/scss/_animated.scss",
-		"../../../media/vendor/font-awesome/scss/_rotated-flipped.scss",
-		"../../../media/vendor/font-awesome/scss/_stacked.scss",
-		"../../../media/vendor/font-awesome/scss/_icons.scss",
-		"../../../media/vendor/font-awesome/scss/_screen-reader.scss"
-	],
-	"names": [],
-	"mappings": ";AEAA;;;;;GAKG;AiCLH,4EAA4E;AAY5E,AAAA,IAAI,CAAC;EACH,WAAW,EAAE,UAAU;EACvB,WAAW,EAAE,IAAI;EACjB,oBAAoB,EAAE,IAAI;EAC1B,wBAAwB,EAAE,IAAI,GAC/B;;AASD,AAAA,IAAI,CAAC;EACH,MAAM,EAAE,CAAC,GACV;;AAMD,AAAA,OAAO;AACP,AAAA,KAAK;AACL,AAAA,MAAM;AACN,AAAA,MAAM;AACN,AAAA,GAAG;AACH,AAAA,OAAO,CAAC;EACN,OAAO,EAAE,KAAK,GACf;;AAOD,AAAA,EAAE,CAAC;EACD,SAAS,EAAE,GAAG;EACd,MAAM,EAAE,QAAQ,GACjB;;AAUD,AAAA,UAAU;AACV,AAAA,MAAM;AACN,AAAA,IAAI,CAAC;EACH,OAAO,EAAE,KAAK,GACf;;AAMD,AAAA,MAAM,CAAC;EACL,MAAM,EAAE,QAAQ,GACjB;;AAOD,AAAA,EAAE,CAAC;EACD,UAAU,EAAE,WAAW;EACvB,MAAM,EAAE,CAAC;EACT,QAAQ,EAAE,OAAO,GAClB;;AAOD,AAAA,GAAG,CAAC;EACF,WAAW,EAAE,oBAAoB;EACjC,SAAS,EAAE,GAAG,GACf;;AAUD,AAAA,CAAC,CAAC;EACA,gBAAgB,EAAE,WAAW;EAC7B,4BAA4B,EAAE,OAAO,GACtC;;AAOD,AAAA,CAAC,AAAA,OAAO;AACR,AAAA,CAAC,AAAA,MAAM,CAAC;EACN,aAAa,EAAE,CAAC,GACjB;;AAOD,AAAA,IAAI,CAAA,AAAA,KAAC,AAAA,EAAO;EACV,aAAa,EAAE,IAAI;EACnB,eAAe,EAAE,SAAS;EAC1B,eAAe,EAAE,gBAAgB,GAClC;;AAMD,AAAA,CAAC;AACD,AAAA,MAAM,CAAC;EACL,WAAW,EAAE,OAAO,GACrB;;AAMD,AAAA,CAAC;AACD,AAAA,MAAM,CAAC;EACL,WAAW,EAAE,MAAM,GACpB;;AAOD,AAAA,IAAI;AACJ,AAAA,GAAG;AACH,AAAA,IAAI,CAAC;EACH,WAAW,EAAE,oBAAoB;EACjC,SAAS,EAAE,GAAG,GACf;;AAMD,AAAA,GAAG,CAAC;EACF,UAAU,EAAE,MAAM,GACnB;;AAMD,AAAA,IAAI,CAAC;EACH,gBAAgB,EAAE,IAAI;EACtB,KAAK,EAAE,IAAI,GACZ;;AAMD,AAAA,KAAK,CAAC;EACJ,SAAS,EAAE,GAAG,GACf;;AAOD,AAAA,GAAG;AACH,AAAA,GAAG,CAAC;EACF,SAAS,EAAE,GAAG;EACd,WAAW,EAAE,CAAC;EACd,QAAQ,EAAE,QAAQ;EAClB,cAAc,EAAE,QAAQ,GACzB;;AAED,AAAA,GAAG,CAAC;EACF,MAAM,EAAE,OAAO,GAChB;;AAED,AAAA,GAAG,CAAC;EACF,GAAG,EAAE,MAAM,GACZ;;AASD,AAAA,KAAK;AACL,AAAA,KAAK,CAAC;EACJ,OAAO,EAAE,YAAY,GACtB;;AAMD,AAAA,KAAK,AAAA,IAAK,EAAA,AAAA,AAAA,QAAC,AAAA,GAAW;EACpB,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,CAAC,GACV;;AAMD,AAAA,GAAG,CAAC;EACF,YAAY,EAAE,IAAI,GACnB;;AAMD,AAAA,GAAG,AAAA,IAAK,CAAA,AAAA,KAAK,EAAE;EACb,QAAQ,EAAE,MAAM,GACjB;;AAUD,AAAA,MAAM;AACN,AAAA,KAAK;AACL,AAAA,QAAQ;AACR,AAAA,MAAM;AACN,AAAA,QAAQ,CAAC;EACP,WAAW,EAAE,UAAU;EACvB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,CAAC,GACV;;AAOD,AAAA,MAAM;AACN,AAAA,KAAK,CAAC;EACJ,QAAQ,EAAE,OAAO,GAClB;;AAOD,AAAA,MAAM;AACN,AAAA,MAAM,CAAC;EACL,cAAc,EAAE,IAAI,GACrB;;AAQD,AAAA,MAAM;AACN,AAAK,IAAD,EAAC,AAAA,IAAC,CAAK,QAAQ,AAAb;CACN,AAAA,AAAA,IAAC,CAAK,OAAO,AAAZ;CACD,AAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,EAAe;EACd,kBAAkB,EAAE,MAAM,GAC3B;;AAMD,AAAA,MAAM,AAAA,kBAAkB;CACxB,AAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,CAAc,kBAAkB;CACjC,AAAA,AAAA,IAAC,CAAK,OAAO,AAAZ,CAAa,kBAAkB;CAChC,AAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,CAAc,kBAAkB,CAAC;EAChC,YAAY,EAAE,IAAI;EAClB,OAAO,EAAE,CAAC,GACX;;AAMD,AAAA,MAAM,AAAA,eAAe;CACrB,AAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,CAAc,eAAe;CAC9B,AAAA,AAAA,IAAC,CAAK,OAAO,AAAZ,CAAa,eAAe;CAC7B,AAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,CAAc,eAAe,CAAC;EAC7B,OAAO,EAAE,qBAAqB,GAC/B;;AAMD,AAAA,QAAQ,CAAC;EACP,MAAM,EAAE,iBAAiB;EACzB,MAAM,EAAE,KAAK;EACb,OAAO,EAAE,qBAAqB,GAC/B;;AASD,AAAA,MAAM,CAAC;EACL,UAAU,EAAE,UAAU;EACtB,KAAK,EAAE,OAAO;EACd,OAAO,EAAE,KAAK;EACd,SAAS,EAAE,IAAI;EACf,OAAO,EAAE,CAAC;EACV,WAAW,EAAE,MAAM,GACpB;;AAOD,AAAA,QAAQ,CAAC;EACP,OAAO,EAAE,YAAY;EACrB,cAAc,EAAE,QAAQ,GACzB;;AAMD,AAAA,QAAQ,CAAC;EACP,QAAQ,EAAE,IAAI,GACf;;CAOD,AAAA,AAAA,IAAC,CAAK,UAAU,AAAf;CACD,AAAA,AAAA,IAAC,CAAK,OAAO,AAAZ,EAAc;EACb,UAAU,EAAE,UAAU;EACtB,OAAO,EAAE,CAAC,GACX;;CAMD,AAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,CAAc,2BAA2B;CAC1C,AAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,CAAc,2BAA2B,CAAC;EACzC,MAAM,EAAE,IAAI,GACb;;CAOD,AAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,EAAe;EACd,kBAAkB,EAAE,SAAS;EAC7B,cAAc,EAAE,IAAI,GACrB;;CAMD,AAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,CAAc,8BAA8B;CAC7C,AAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,CAAc,2BAA2B,CAAC;EACzC,kBAAkB,EAAE,IAAI,GACzB;;AAOD,AAAA,4BAA4B,CAAC;EAC3B,kBAAkB,EAAE,MAAM;EAC1B,IAAI,EAAE,OAAO,GACd;;AAUD,AAAA,OAAO;AACP,AAAA,IAAI,CAAC;EACH,OAAO,EAAE,KAAK,GACf;;AAMD,AAAA,OAAO,CAAC;EACN,OAAO,EAAE,SAAS,GACnB;;AASD,AAAA,MAAM,CAAC;EACL,OAAO,EAAE,YAAY,GACtB;;AAMD,AAAA,QAAQ,CAAC;EACP,OAAO,EAAE,IAAI,GACd;;CASD,AAAA,AAAA,MAAC,AAAA,EAAQ;EACP,OAAO,EAAE,IAAI,GACd;;ACjcC,MAAM,CAAC,KAAK;EACV,AAAA,CAAC;EACD,AAAA,CAAC,AAAA,QAAQ;EACT,AAAA,CAAC,AAAA,OAAO;EACR,AAAA,CAAC,AAAA,cAAc;EACf,AAAA,GAAG,AAAA,cAAc;EACjB,AAAA,UAAU,AAAA,cAAc;EACxB,AAAA,EAAE,AAAA,cAAc;EAChB,AAAA,CAAC,AAAA,YAAY;EACb,AAAA,GAAG,AAAA,YAAY;EACf,AAAA,UAAU,AAAA,YAAY;EACtB,AAAA,EAAE,AAAA,YAAY,CAAC;IAIb,WAAW,EAAE,eAAe;IAE5B,UAAU,EAAE,eAAe,GAC5B;EAED,AAAA,CAAC;EACD,AAAA,CAAC,AAAA,QAAQ,CAAC;IACR,eAAe,EAAE,SAAS,GAC3B;EAOD,AAAA,IAAI,CAAA,AAAA,KAAC,AAAA,CAAM,OAAO,CAAC;IACjB,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,GAC9B;EAaD,AAAA,GAAG,CAAC;IACF,WAAW,EAAE,mBAAmB,GACjC;EACD,AAAA,GAAG;EACH,AAAA,UAAU,CAAC;IACT,MAAM,EjC4GG,GAAG,CiC5GU,KAAK,CAAC,IAAI;IAChC,iBAAiB,EAAE,KAAK,GACzB;EAOD,AAAA,KAAK,CAAC;IACJ,OAAO,EAAE,kBAAkB,GAC5B;EAED,AAAA,EAAE;EACF,AAAA,GAAG,CAAC;IACF,iBAAiB,EAAE,KAAK,GACzB;EAED,AAAA,CAAC;EACD,AAAA,EAAE;EACF,AAAA,EAAE,CAAC;IACD,OAAO,EAAE,CAAC;IACV,MAAM,EAAE,CAAC,GACV;EAED,AAAA,EAAE;EACF,AAAA,EAAE,CAAC;IACD,gBAAgB,EAAE,KAAK,GACxB;EAKD,AAAA,OAAO,CAAC;IACN,OAAO,EAAE,IAAI,GACd;EACD,AAAA,MAAM,CAAC;IACL,MAAM,EjCuEG,GAAG,CiCvEU,KAAK,CAAC,IAAI,GACjC;EAED,AAAA,MAAM,CAAC;IACL,eAAe,EAAE,mBAAmB,GAMrC;IAPD,AAGE,MAHI,CAGJ,EAAE;IAHJ,AAIE,MAJI,CAIJ,EAAE,CAAC;MACD,gBAAgB,EAAE,eAAe,GAClC;EAEH,AACE,eADa,CACb,EAAE;EADJ,AAEE,eAFa,CAEb,EAAE,CAAC;IACD,MAAM,EAAE,yBAAyB,GAClC;;AC5FP,AAAA,IAAI,CAAC;EACH,UAAU,EAAE,UAAU,GACvB;;AAED,AAAA,CAAC;AACD,AAAA,CAAC,AAAA,QAAQ;AACT,AAAA,CAAC,AAAA,OAAO,CAAC;EACP,UAAU,EAAE,OAAO,GACpB;;AAmBC,aAAa;EAAG,KAAK,EAAE,YAAY;;AAQrC,AAAA,IAAI,CAAC;EAYH,kBAAkB,EAAE,SAAS;EAG7B,2BAA2B,EAAE,WAAa,GAC3C;;AAED,AAAA,IAAI,CAAC;EACH,WAAW,EpCjCsB,KAAK,EAAE,UAAU;EoCkClD,SAAS,ElC+KM,IAAI;EkC9KnB,WAAW,ElCmLQ,MAAM;EkClLzB,WAAW,ElCsLM,GAAG;EkCpLpB,KAAK,ElC0BqB,OAAO;EkCxBjC,gBAAgB,ElCYT,IAAI,GkCXZ;;CAOD,AAAA,AAAA,QAAC,CAAS,IAAI,AAAb,CAAc,MAAM,CAAC;EACpB,OAAO,EAAE,eAAe,GACzB;;AAWD,AAAA,EAAE,EAAE,AAAA,EAAE,EAAE,AAAA,EAAE,EAAE,AAAA,EAAE,EAAE,AAAA,EAAE,EAAE,AAAA,EAAE,CAAC;EACrB,UAAU,EAAE,CAAC;EACb,aAAa,EAAE,KAAK,GACrB;;AAMD,AAAA,CAAC,CAAC;EACA,UAAU,EAAE,CAAC;EACb,aAAa,EAAE,IAAI,GACpB;;AAGD,AAAA,IAAI,CAAA,AAAA,KAAC,AAAA;AAEL,AAAA,IAAI,CAAA,AAAA,mBAAC,AAAA,EAAqB;EACxB,MAAM,EAAE,IAAI,GACb;;AAED,AAAA,OAAO,CAAC;EACN,aAAa,EAAE,IAAI;EACnB,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,OAAO,GACrB;;AAED,AAAA,EAAE;AACF,AAAA,EAAE;AACF,AAAA,EAAE,CAAC;EACD,UAAU,EAAE,CAAC;EACb,aAAa,EAAE,IAAI,GACpB;;AAED,AAAG,EAAD,CAAC,EAAE;AACL,AAAG,EAAD,CAAC,EAAE;AACL,AAAG,EAAD,CAAC,EAAE;AACL,AAAG,EAAD,CAAC,EAAE,CAAC;EACJ,aAAa,EAAE,CAAC,GACjB;;AAED,AAAA,EAAE,CAAC;EACD,WAAW,ElCgHM,IAAI,GkC/GtB;;AAED,AAAA,EAAE,CAAC;EACD,aAAa,EAAE,KAAK;EACpB,WAAW,EAAE,CAAC,GACf;;AAED,AAAA,UAAU,CAAC;EACT,MAAM,EAAE,QAAQ,GACjB;;AAOD,AAAA,CAAC,CAAC;EACA,KAAK,EpCvJ4B,OAAO;EoCwJxC,eAAe,ElC8BO,IAAI,GkCxB3B;EARD,A/B9II,C+B8IH,A/B9I/C,MAAyD,E+B8IX,A/B7II,C+B6IH,A/B7I/C,MAAyD,CAAC;I+BkJR,KAAK,ElC4Be,OAAwB;IkC3B5C,eAAe,ElC4BK,SAAS,GG7K5B;;A+B2JL,AAAA,CAAC,AAAA,IAAK,EAAA,AAAA,AAAA,IAAC,AAAA,EAAM,IAAK,EAAA,AAAA,AAAA,QAAC,AAAA,GAAW;EAC5B,KAAK,EAAE,OAAO;EACd,eAAe,EAAE,IAAI,GAUtB;EAZD,A/B9JI,C+B8JH,AAAA,IAAK,EAAA,AAAA,AAAA,IAAC,AAAA,EAAM,IAAK,EAAA,AAAA,AAAA,QAAC,AAAA,E/B9JjE,MAAyD,E+B8JX,A/B7JI,C+B6JH,AAAA,IAAK,EAAA,AAAA,AAAA,IAAC,AAAA,EAAM,IAAK,EAAA,AAAA,AAAA,QAAC,AAAA,E/B7JjE,MAAyD,CAAC;I+BkKR,KAAK,EAAE,OAAO;IACd,eAAe,EAAE,IAAI,G/BjKpB;E+B2JL,AASE,CATD,AAAA,IAAK,EAAA,AAAA,AAAA,IAAC,AAAA,EAAM,IAAK,EAAA,AAAA,AAAA,QAAC,AAAA,EASjB,MAAO,CAAC;IACN,OAAO,EAAE,CAAC,GACX;;AAQH,AAAA,GAAG,CAAC;EAEF,UAAU,EAAE,CAAC;EAEb,aAAa,EAAE,IAAI;EAEnB,QAAQ,EAAE,IAAI,GACf;;AAOD,AAAA,MAAM,CAAC;EAGL,MAAM,EAAE,QAAQ,GACjB;;AAOD,AAAA,GAAG,CAAC;EAGF,cAAc,EAAE,MAAM,GAGvB;;CASD,AAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,EAAe;EACd,MAAM,EAAE,OAAO,GAChB;;AAaD,AAAA,CAAC;AACD,AAAA,IAAI;AACJ,AAAA,MAAM;CACN,AAAA,AAAA,IAAC,CAAK,QAAQ,AAAb;AACD,AAAA,KAAK;AACL,AAAA,KAAK;AACL,AAAA,MAAM;AACN,AAAA,OAAO;AACP,AAAA,QAAQ,CAAC;EACP,YAAY,EAAE,YAAY,GAC3B;;AAOD,AAAA,KAAK,CAAC;EAEJ,eAAe,EAAE,QAAQ;EAEzB,gBAAgB,EpC1NiB,WAAW,GoC2N7C;;AAED,AAAA,OAAO,CAAC;EACN,WAAW,ElC6DmB,OAAM;EkC5DpC,cAAc,ElC4DgB,OAAM;EkC3DpC,KAAK,ElC3KqB,OAAO;EkC4KjC,UAAU,EAAE,IAAI;EAChB,YAAY,EAAE,MAAM,GACrB;;AAED,AAAA,EAAE,CAAC;EAED,UAAU,EAAE,IAAI,GACjB;;AAOD,AAAA,KAAK,CAAC;EAEJ,OAAO,EAAE,YAAY;EACrB,aAAa,EAAE,KAAK,GACrB;;AAMD,AAAA,MAAM,AAAA,MAAM,CAAC;EACX,OAAO,EAAE,UAAU;EACnB,OAAO,EAAE,iCAAiC,GAC3C;;AAED,AAAA,KAAK;AACL,AAAA,MAAM;AACN,AAAA,MAAM;AACN,AAAA,QAAQ,CAAC;EAGP,WAAW,EAAE,OAAO,GACrB;;AAED,AAKE,KALG,CAAA,AAAA,IAAC,CAAK,OAAO,AAAZ,CAKL,SAAW;AAJZ,AAIE,KAJG,CAAA,AAAA,IAAC,CAAK,UAAU,AAAf,CAIL,SAAW,CAAC;EACT,MAAM,ElC4IuB,WAAW,GkC3IzC;;AAIH,AAAA,KAAK,CAAA,AAAA,IAAC,CAAK,MAAM,AAAX;AACN,AAAA,KAAK,CAAA,AAAA,IAAC,CAAK,MAAM,AAAX;AACN,AAAA,KAAK,CAAA,AAAA,IAAC,CAAK,gBAAgB,AAArB;AACN,AAAA,KAAK,CAAA,AAAA,IAAC,CAAK,OAAO,AAAZ,EAAc;EAMlB,kBAAkB,EAAE,OAAO,GAC5B;;AAED,AAAA,QAAQ,CAAC;EAEP,MAAM,EAAE,QAAQ,GACjB;;AAED,AAAA,QAAQ,CAAC;EAMP,SAAS,EAAE,CAAC;EAEZ,OAAO,EAAE,CAAC;EACV,MAAM,EAAE,CAAC;EACT,MAAM,EAAE,CAAC,GACV;;AAED,AAAA,MAAM,CAAC;EAEL,OAAO,EAAE,KAAK;EACd,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,CAAC;EACV,aAAa,EAAE,KAAK;EACpB,SAAS,EAAE,MAAM;EACjB,WAAW,EAAE,OAAO,GACrB;;AAED,AAAA,KAAK,CAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,EAAe;EAKnB,kBAAkB,EAAE,IAAI,GACzB;;AAGD,AAAA,MAAM,CAAC;EACL,OAAO,EAAE,YAAY,GAItB;;CAGD,AAAA,AAAA,MAAC,AAAA,EAAQ;EACP,OAAO,EAAE,eAAe,GACzB;;AChYD,AAAA,EAAE,EAAE,AAAA,EAAE,EAAE,AAAA,EAAE,EAAE,AAAA,EAAE,EAAE,AAAA,EAAE,EAAE,AAAA,EAAE;AACtB,AAAA,GAAG,EAAE,AAAA,GAAG,EAAE,AAAA,GAAG,EAAE,AAAA,GAAG,EAAE,AAAA,GAAG,EAAE,AAAA,GAAG,CAAC;EAC3B,aAAa,EnCuQU,MAAa;EmCtQpC,WAAW,EnCuQY,OAAO;EmCtQ9B,WAAW,EnCuQY,GAAG;EmCtQ1B,WAAW,EnCuQY,GAAG;EmCtQ1B,KAAK,EnCuQkB,OAAO,GmCtQ/B;;AAED,AAAA,EAAE,EAAE,AAAA,GAAG,CAAC;EAAE,SAAS,ErCgCgB,QAAQ,GqChCL;;AACtC,AAAA,EAAE,EAAE,AAAA,GAAG,CAAC;EAAE,SAAS,ErCgCgB,QAAQ,GqChCL;;AACtC,AAAA,EAAE,EAAE,AAAA,GAAG,CAAC;EAAE,SAAS,ErCgCgB,QAAQ,GqChCL;;AACtC,AAAA,EAAE,EAAE,AAAA,GAAG,CAAC;EAAE,SAAS,ErCgCgB,IAAI,GqChCD;;AACtC,AAAA,EAAE,EAAE,AAAA,GAAG,CAAC;EAAE,SAAS,ErCgCgB,SAAQ,GqChCL;;AACtC,AAAA,EAAE,EAAE,AAAA,GAAG,CAAC;EAAE,SAAS,ErCgCgB,SAAQ,GqChCL;;AAEtC,AAAA,KAAK,CAAC;EACJ,SAAS,EnCyQQ,OAAO;EmCxQxB,WAAW,EnCyQM,GAAG,GmCxQrB;;AAGD,AAAA,UAAU,CAAC;EACT,SAAS,EnCwPK,IAAI;EmCvPlB,WAAW,EnC4PS,GAAG;EmC3PvB,WAAW,EnCmPY,GAAG,GmClP3B;;AACD,AAAA,UAAU,CAAC;EACT,SAAS,EnCoPK,MAAM;EmCnPpB,WAAW,EnCwPS,GAAG;EmCvPvB,WAAW,EnC8OY,GAAG,GmC7O3B;;AACD,AAAA,UAAU,CAAC;EACT,SAAS,EnCgPK,MAAM;EmC/OpB,WAAW,EnCoPS,GAAG;EmCnPvB,WAAW,EnCyOY,GAAG,GmCxO3B;;AACD,AAAA,UAAU,CAAC;EACT,SAAS,EnC4OK,MAAM;EmC3OpB,WAAW,EnCgPS,GAAG;EmC/OvB,WAAW,EnCoOY,GAAG,GmCnO3B;;AAOD,AAAA,EAAE,CAAC;EACD,UAAU,EnCuFD,IAAI;EmCtFb,aAAa,EnCsFJ,IAAI;EmCrFb,MAAM,EAAE,CAAC;EACT,UAAU,EnCiHG,GAAG,CmCjHa,KAAK,CnCuC3B,kBAAI,GmCtCZ;;AAOD,AAAA,KAAK;AACL,AAAA,MAAM,CAAC;EACL,SAAS,EnC+NO,GAAG;EmC9NnB,WAAW,EnC6LQ,MAAM,GmC5L1B;;AAED,AAAA,IAAI;AACJ,AAAA,KAAK,CAAC;EACJ,OAAO,EnCuOM,KAAI;EmCtOjB,gBAAgB,ErC1DiB,OAAO,GqC2DzC;;AAOD,AAAA,cAAc,CAAC;EhB7Eb,YAAY,EAAE,CAAC;EACf,UAAU,EAAE,IAAI,GgB8EjB;;AAGD,AAAA,YAAY,CAAC;EhBlFX,YAAY,EAAE,CAAC;EACf,UAAU,EAAE,IAAI,GgBmFjB;;AACD,AAAA,iBAAiB,CAAC;EAChB,OAAO,EAAE,YAAY,GAKtB;EAND,AAGE,iBAHe,AAGf,IAAM,CAAA,AAAA,WAAW,EAAE;IACjB,YAAY,EnCyNM,GAAG,GmCxNtB;;AASH,AAAA,WAAW,CAAC;EACV,SAAS,EAAE,GAAG;EACd,cAAc,EAAE,SAAS,GAC1B;;AAGD,AAAA,WAAW,CAAC;EACV,OAAO,EAAE,MAAa,CnC8Bb,IAAI;EmC7Bb,aAAa,EnC6BJ,IAAI;EmC5Bb,SAAS,EnCwLe,OAAwB;EmCvLhD,WAAW,EnCyLa,OAAM,CmCzLQ,KAAK,CnCJjB,OAAO,GmCKlC;;AAED,AAAA,kBAAkB,CAAC;EACjB,OAAO,EAAE,KAAK;EACd,SAAS,EAAE,GAAG;EACd,KAAK,EnCXqB,OAAO,GmCgBlC;EARD,AAKE,kBALgB,AAKhB,QAAS,CAAC;IACR,OAAO,EAAE,aAAa,GACvB;;AAIH,AAAA,mBAAmB,CAAC;EAClB,aAAa,EnCYJ,IAAI;EmCXb,YAAY,EAAE,CAAC;EACf,UAAU,EAAE,KAAK;EACjB,YAAY,EnCuKY,OAAM,CmCvKS,KAAK,CnCtBlB,OAAO;EmCuBjC,WAAW,EAAE,CAAC,GACf;;AAED,AAAoB,mBAAD,CAAC,kBAAkB,AACpC,QAAS,CAAC;EACR,OAAO,EAAE,EAAE,GACZ;;AAHH,AAAoB,mBAAD,CAAC,kBAAkB,AAIpC,OAAQ,CAAC;EACP,OAAO,EAAE,aAAa,GACvB;;ACtIH,AAAA,UAAU,CAAC;EhCIT,SAAS,EAAE,IAAI;EAGf,MAAM,EAAE,IAAI,GgCLb;;AAID,AAAA,cAAc,CAAC;EACb,OAAO,EpC22BqB,OAAM;EoC12BlC,gBAAgB,EpC+ET,IAAI;EoC9EX,MAAM,EpCyJO,GAAG,CoCzJgB,KAAK,CpC42BT,IAAI;EyBx3B9B,aAAa,EzB4TQ,OAAM;ECjTzB,UAAU,EDg3Bc,GAAG,CAAC,IAAG,CAAC,WAAW;EIp3B/C,SAAS,EAAE,IAAI;EAGf,MAAM,EAAE,IAAI,GgCSb;;AAMD,AAAA,OAAO,CAAC;EAEN,OAAO,EAAE,YAAY,GACtB;;AAED,AAAA,WAAW,CAAC;EACV,aAAa,EAAE,MAAe;EAC9B,WAAW,EAAE,CAAC,GACf;;AAED,AAAA,eAAe,CAAC;EACd,SAAS,EpC41BgB,GAAG;EoC31B5B,KAAK,EpCmEqB,OAAO,GoClElC;;ACzCD,AAAA,IAAI;AACJ,AAAA,GAAG;AACH,AAAA,GAAG;AACH,AAAA,IAAI,CAAC;EACH,WAAW,ErCmPY,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,aAAa,EAAE,SAAS,GqClP5F;;AAGD,AAAA,IAAI,CAAC;EACH,OAAO,ErC46BqB,MAAK,CADL,MAAK;EqC16BjC,SAAS,ErCy6BmB,GAAG;EqCx6B/B,KAAK,ErC26BuB,OAAO;EqC16BnC,gBAAgB,ErCiGU,OAAO;EyB1G/B,aAAa,EzB4TQ,OAAM,GqC1S9B;EALC,AAAI,CAAH,GARH,IAAI,CAQI;IACJ,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,OAAO;IACd,gBAAgB,EAAE,OAAO,GAC1B;;AAIH,AAAA,GAAG,CAAC;EACF,OAAO,ErC45BqB,MAAK,CADL,MAAK;EqC15BjC,SAAS,ErCy5BmB,GAAG;EqCx5B/B,KAAK,ErCkEE,IAAI;EqCjEX,gBAAgB,ErC6EU,OAAO;EyBtG/B,aAAa,EzB8TQ,MAAK,GqC3R7B;EAdD,AAQE,GARC,CAQD,GAAG,CAAC;IACF,OAAO,EAAE,CAAC;IACV,SAAS,EAAE,IAAI;IACf,WAAW,ErC6NI,IAAI,GqC3NpB;;AAIH,AAAA,GAAG,CAAC;EACF,OAAO,EAAE,KAAK;EACd,UAAU,EAAE,CAAC;EACb,aAAa,EAAE,IAAI;EACnB,SAAS,ErCs4BmB,GAAG;EqCr4B/B,KAAK,ErC2DqB,OAAO,GqCjDlC;EAfD,AAQE,GARC,CAQD,IAAI,CAAC;IACH,OAAO,EAAE,CAAC;IACV,SAAS,EAAE,OAAO;IAClB,KAAK,EAAE,OAAO;IACd,gBAAgB,EAAE,WAAW;IAC7B,aAAa,EAAE,CAAC,GACjB;;AAIH,AAAA,eAAe,CAAC;EACd,UAAU,ErCm4BkB,KAAK;EqCl4BjC,UAAU,EAAE,MAAM,GACnB;;AC1DC,AAAA,UAAU,CAAC;ETAX,QAAQ,EAAE,QAAQ;EAClB,WAAW,EAAE,IAAI;EACjB,YAAY,EAAE,IAAI;EAKd,aAAa,EAAE,KAAa;EAC5B,YAAY,EAAG,KAAa,GSL/B;EpCgDC,MAAM,EAAE,SAAS,EAAE,KAAK;IoCnD1B,AAAA,UAAU,CAAC;MTOP,aAAa,EAAE,KAAa;MAC5B,YAAY,EAAG,KAAa,GSL/B;EpCgDC,MAAM,EAAE,SAAS,EAAE,KAAK;IoCnD1B,AAAA,UAAU,CAAC;MTOP,aAAa,EAAE,KAAa;MAC5B,YAAY,EAAG,KAAa,GSL/B;EpCgDC,MAAM,EAAE,SAAS,EAAE,KAAK;IoCnD1B,AAAA,UAAU,CAAC;MTOP,aAAa,EAAE,KAAa;MAC5B,YAAY,EAAG,KAAa,GSL/B;EpCgDC,MAAM,EAAE,SAAS,EAAE,MAAM;IoCnD3B,AAAA,UAAU,CAAC;MTOP,aAAa,EAAE,KAAa;MAC5B,YAAY,EAAG,KAAa,GSL/B;EpCgDC,MAAM,EAAE,SAAS,EAAE,KAAK;IoCnD1B,AAAA,UAAU,CAAC;MTkBP,KAAK,E7BqML,KAAK;M6BpML,SAAS,EAAE,IAAI,GShBlB;EpCgDC,MAAM,EAAE,SAAS,EAAE,KAAK;IoCnD1B,AAAA,UAAU,CAAC;MTkBP,KAAK,E7BsML,KAAK;M6BrML,SAAS,EAAE,IAAI,GShBlB;EpCgDC,MAAM,EAAE,SAAS,EAAE,KAAK;IoCnD1B,AAAA,UAAU,CAAC;MTkBP,KAAK,E7BuML,KAAK;M6BtML,SAAS,EAAE,IAAI,GShBlB;EpCgDC,MAAM,EAAE,SAAS,EAAE,MAAM;IoCnD3B,AAAA,UAAU,CAAC;MTkBP,KAAK,E7BwML,MAAM;M6BvMN,SAAS,EAAE,IAAI,GShBlB;;AASD,AAAA,gBAAgB,CAAC;ETZjB,QAAQ,EAAE,QAAQ;EAClB,WAAW,EAAE,IAAI;EACjB,YAAY,EAAE,IAAI;EAKd,aAAa,EAAE,KAAa;EAC5B,YAAY,EAAG,KAAa,GSM/B;EpCqCC,MAAM,EAAE,SAAS,EAAE,KAAK;IoCvC1B,AAAA,gBAAgB,CAAC;MTLb,aAAa,EAAE,KAAa;MAC5B,YAAY,EAAG,KAAa,GSM/B;EpCqCC,MAAM,EAAE,SAAS,EAAE,KAAK;IoCvC1B,AAAA,gBAAgB,CAAC;MTLb,aAAa,EAAE,KAAa;MAC5B,YAAY,EAAG,KAAa,GSM/B;EpCqCC,MAAM,EAAE,SAAS,EAAE,KAAK;IoCvC1B,AAAA,gBAAgB,CAAC;MTLb,aAAa,EAAE,KAAa;MAC5B,YAAY,EAAG,KAAa,GSM/B;EpCqCC,MAAM,EAAE,SAAS,EAAE,MAAM;IoCvC3B,AAAA,gBAAgB,CAAC;MTLb,aAAa,EAAE,KAAa;MAC5B,YAAY,EAAG,KAAa,GSM/B;;AAQD,AAAA,IAAI,CAAC;ETaL,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,IAAI;EAKX,YAAY,EAAE,MAAc;EAC5B,WAAW,EAAG,MAAc,GSlB/B;EpC2BC,MAAM,EAAE,SAAS,EAAE,KAAK;IoC7B1B,AAAA,IAAI,CAAC;MTmBD,YAAY,EAAE,MAAc;MAC5B,WAAW,EAAG,MAAc,GSlB/B;EpC2BC,MAAM,EAAE,SAAS,EAAE,KAAK;IoC7B1B,AAAA,IAAI,CAAC;MTmBD,YAAY,EAAE,MAAc;MAC5B,WAAW,EAAG,MAAc,GSlB/B;EpC2BC,MAAM,EAAE,SAAS,EAAE,KAAK;IoC7B1B,AAAA,IAAI,CAAC;MTmBD,YAAY,EAAE,MAAc;MAC5B,WAAW,EAAG,MAAc,GSlB/B;EpC2BC,MAAM,EAAE,SAAS,EAAE,MAAM;IoC7B3B,AAAA,IAAI,CAAC;MTmBD,YAAY,EAAE,MAAc;MAC5B,WAAW,EAAG,MAAc,GSlB/B;;AAID,AAAA,WAAW,CAAC;EACV,YAAY,EAAE,CAAC;EACf,WAAW,EAAE,CAAC,GAOf;EATD,AAII,WAJO,GAIP,IAAI;EAJR,AAKI,WALO,IAKP,AAAA,KAAC,EAAO,MAAM,AAAb,EAAe;IAChB,aAAa,EAAE,CAAC;IAChB,YAAY,EAAE,CAAC,GAChB;;AVrBC,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,OAaW,EAAP,AAbJ,OAaW,EAAP,AAbJ,OAaW,EAIT,AAjBF,IAiBM,EAJF,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,EAJL,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,EAJL,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,EAJL,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,CAjBI;EACX,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,GAAG;ECuBb,aAAa,EAAE,KAAa;EAC5B,YAAY,EAAG,KAAa,GDrB/B;E1B2CC,MAAM,EAAE,SAAS,EAAE,KAAK;I0BpCtB,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,OAaW,EAAP,AAbJ,OAaW,EAAP,AAbJ,OAaW,EAIT,AAjBF,IAiBM,EAJF,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,EAJL,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,EAJL,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,EAJL,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,CAjBI;MC0BT,aAAa,EAAE,KAAa;MAC5B,YAAY,EAAG,KAAa,GDrB/B;E1B2CC,MAAM,EAAE,SAAS,EAAE,KAAK;I0BpCtB,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,OAaW,EAAP,AAbJ,OAaW,EAAP,AAbJ,OAaW,EAIT,AAjBF,IAiBM,EAJF,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,EAJL,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,EAJL,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,EAJL,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,CAjBI;MC0BT,aAAa,EAAE,KAAa;MAC5B,YAAY,EAAG,KAAa,GDrB/B;E1B2CC,MAAM,EAAE,SAAS,EAAE,KAAK;I0BpCtB,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,OAaW,EAAP,AAbJ,OAaW,EAAP,AAbJ,OAaW,EAIT,AAjBF,IAiBM,EAJF,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,EAJL,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,EAJL,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,EAJL,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,CAjBI;MC0BT,aAAa,EAAE,KAAa;MAC5B,YAAY,EAAG,KAAa,GDrB/B;E1B2CC,MAAM,EAAE,SAAS,EAAE,MAAM;I0BpCvB,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,MAaU,EAAN,AAbJ,OAaW,EAAP,AAbJ,OAaW,EAAP,AAbJ,OAaW,EAIT,AAjBF,IAiBM,EAJF,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,EAJL,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,EAJL,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,EAJL,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,SAaa,EAAT,AAbJ,UAac,EAAV,AAbJ,UAac,EAAV,AAbJ,UAac,EAIZ,AAjBF,OAiBS,CAjBI;MC0BT,aAAa,EAAE,KAAa;MAC5B,YAAY,EAAG,KAAa,GDrB/B;;AAiBG,AAAA,IAAI,CAAU;EACZ,UAAU,EAAE,CAAC;EACb,SAAS,EAAE,CAAC;EACZ,SAAS,EAAE,IAAI,GAChB;;AACD,AAAA,SAAS,CAAU;EACjB,IAAI,EAAE,QAAQ;EACd,KAAK,EAAE,IAAI,GACZ;;AAGC,AAAA,MAAM,CAAc;EC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,QAA4B;EAKtC,SAAS,EAAE,QAA4B,GDhChC;;AAFD,AAAA,MAAM,CAAc;EC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;EAKtC,SAAS,EAAE,SAA4B,GDhChC;;AAFD,AAAA,MAAM,CAAc;EC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAA4B;EAKtC,SAAS,EAAE,GAA4B,GDhChC;;AAFD,AAAA,MAAM,CAAc;EC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;EAKtC,SAAS,EAAE,SAA4B,GDhChC;;AAFD,AAAA,MAAM,CAAc;EC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;EAKtC,SAAS,EAAE,SAA4B,GDhChC;;AAFD,AAAA,MAAM,CAAc;EC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAA4B;EAKtC,SAAS,EAAE,GAA4B,GDhChC;;AAFD,AAAA,MAAM,CAAc;EC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;EAKtC,SAAS,EAAE,SAA4B,GDhChC;;AAFD,AAAA,MAAM,CAAc;EC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;EAKtC,SAAS,EAAE,SAA4B,GDhChC;;AAFD,AAAA,MAAM,CAAc;EC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAA4B;EAKtC,SAAS,EAAE,GAA4B,GDhChC;;AAFD,AAAA,OAAO,CAAa;EC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;EAKtC,SAAS,EAAE,SAA4B,GDhChC;;AAFD,AAAA,OAAO,CAAa;EC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;EAKtC,SAAS,EAAE,SAA4B,GDhChC;;AAFD,AAAA,OAAO,CAAa;EC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAA4B;EAKtC,SAAS,EAAE,IAA4B,GDhChC;;AAKC,AAAA,OAAO,CAAsB;ECuCrC,KAAK,EAA8C,IAAI,GDrC9C;;AAFD,AAAA,OAAO,CAAsB;ECuCrC,KAAK,EAAgB,QAA4B,GDrCxC;;AAFD,AAAA,OAAO,CAAsB;ECuCrC,KAAK,EAAgB,SAA4B,GDrCxC;;AAFD,AAAA,OAAO,CAAsB;ECuCrC,KAAK,EAAgB,GAA4B,GDrCxC;;AAFD,AAAA,OAAO,CAAsB;ECuCrC,KAAK,EAAgB,SAA4B,GDrCxC;;AAFD,AAAA,OAAO,CAAsB;ECuCrC,KAAK,EAAgB,SAA4B,GDrCxC;;AAFD,AAAA,OAAO,CAAsB;ECuCrC,KAAK,EAAgB,GAA4B,GDrCxC;;AAFD,AAAA,OAAO,CAAsB;ECuCrC,KAAK,EAAgB,SAA4B,GDrCxC;;AAFD,AAAA,OAAO,CAAsB;ECuCrC,KAAK,EAAgB,SAA4B,GDrCxC;;AAFD,AAAA,OAAO,CAAsB;ECuCrC,KAAK,EAAgB,GAA4B,GDrCxC;;AAFD,AAAA,QAAQ,CAAqB;ECuCrC,KAAK,EAAgB,SAA4B,GDrCxC;;AAFD,AAAA,QAAQ,CAAqB;ECuCrC,KAAK,EAAgB,SAA4B,GDrCxC;;AAFD,AAAA,QAAQ,CAAqB;ECuCrC,KAAK,EAAgB,IAA4B,GDrCxC;;AAFD,AAAA,OAAO,CAAsB;ECmCrC,IAAI,EAA8C,IAAI,GDjC7C;;AAFD,AAAA,OAAO,CAAsB;ECmCrC,IAAI,EAAgB,QAA4B,GDjCvC;;AAFD,AAAA,OAAO,CAAsB;ECmCrC,IAAI,EAAgB,SAA4B,GDjCvC;;AAFD,AAAA,OAAO,CAAsB;ECmCrC,IAAI,EAAgB,GAA4B,GDjCvC;;AAFD,AAAA,OAAO,CAAsB;ECmCrC,IAAI,EAAgB,SAA4B,GDjCvC;;AAFD,AAAA,OAAO,CAAsB;ECmCrC,IAAI,EAAgB,SAA4B,GDjCvC;;AAFD,AAAA,OAAO,CAAsB;ECmCrC,IAAI,EAAgB,GAA4B,GDjCvC;;AAFD,AAAA,OAAO,CAAsB;ECmCrC,IAAI,EAAgB,SAA4B,GDjCvC;;AAFD,AAAA,OAAO,CAAsB;ECmCrC,IAAI,EAAgB,SAA4B,GDjCvC;;AAFD,AAAA,OAAO,CAAsB;ECmCrC,IAAI,EAAgB,GAA4B,GDjCvC;;AAFD,AAAA,QAAQ,CAAqB;ECmCrC,IAAI,EAAgB,SAA4B,GDjCvC;;AAFD,AAAA,QAAQ,CAAqB;ECmCrC,IAAI,EAAgB,SAA4B,GDjCvC;;AAFD,AAAA,QAAQ,CAAqB;ECmCrC,IAAI,EAAgB,IAA4B,GDjCvC;;AAOD,AAAA,SAAS,CAAc;ECsB/B,WAAW,EAAE,QAA4B,GDpBhC;;AAFD,AAAA,SAAS,CAAc;ECsB/B,WAAW,EAAE,SAA4B,GDpBhC;;AAFD,AAAA,SAAS,CAAc;ECsB/B,WAAW,EAAE,GAA4B,GDpBhC;;AAFD,AAAA,SAAS,CAAc;ECsB/B,WAAW,EAAE,SAA4B,GDpBhC;;AAFD,AAAA,SAAS,CAAc;ECsB/B,WAAW,EAAE,SAA4B,GDpBhC;;AAFD,AAAA,SAAS,CAAc;ECsB/B,WAAW,EAAE,GAA4B,GDpBhC;;AAFD,AAAA,SAAS,CAAc;ECsB/B,WAAW,EAAE,SAA4B,GDpBhC;;AAFD,AAAA,SAAS,CAAc;ECsB/B,WAAW,EAAE,SAA4B,GDpBhC;;AAFD,AAAA,SAAS,CAAc;ECsB/B,WAAW,EAAE,GAA4B,GDpBhC;;AAFD,AAAA,UAAU,CAAa;ECsB/B,WAAW,EAAE,SAA4B,GDpBhC;;AAFD,AAAA,UAAU,CAAa;ECsB/B,WAAW,EAAE,SAA4B,GDpBhC;;A1BHP,MAAM,EAAE,SAAS,EAAE,KAAK;E0B1BtB,AAAA,OAAO,CAAO;IACZ,UAAU,EAAE,CAAC;IACb,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,IAAI,GAChB;EACD,AAAA,YAAY,CAAO;IACjB,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,IAAI,GACZ;EAGC,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,QAA4B;IAKtC,SAAS,EAAE,QAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAA4B;IAKtC,SAAS,EAAE,GAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAA4B;IAKtC,SAAS,EAAE,GAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAA4B;IAKtC,SAAS,EAAE,GAA4B,GDhChC;EAFD,AAAA,UAAU,CAAU;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,UAAU,CAAU;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,UAAU,CAAU;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAA4B;IAKtC,SAAS,EAAE,IAA4B,GDhChC;EAKC,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAA8C,IAAI,GDrC9C;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,QAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,GAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,GAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,GAA4B,GDrCxC;EAFD,AAAA,WAAW,CAAkB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,WAAW,CAAkB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,WAAW,CAAkB;ICuCrC,KAAK,EAAgB,IAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAA8C,IAAI,GDjC7C;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,QAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,GAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,GAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,GAA4B,GDjCvC;EAFD,AAAA,WAAW,CAAkB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,WAAW,CAAkB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,WAAW,CAAkB;ICmCrC,IAAI,EAAgB,IAA4B,GDjCvC;EAOD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,EAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,QAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,GAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,GAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,GAA4B,GDpBhC;EAFD,AAAA,aAAa,CAAU;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,aAAa,CAAU;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;;A1BHP,MAAM,EAAE,SAAS,EAAE,KAAK;E0B1BtB,AAAA,OAAO,CAAO;IACZ,UAAU,EAAE,CAAC;IACb,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,IAAI,GAChB;EACD,AAAA,YAAY,CAAO;IACjB,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,IAAI,GACZ;EAGC,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,QAA4B;IAKtC,SAAS,EAAE,QAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAA4B;IAKtC,SAAS,EAAE,GAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAA4B;IAKtC,SAAS,EAAE,GAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAA4B;IAKtC,SAAS,EAAE,GAA4B,GDhChC;EAFD,AAAA,UAAU,CAAU;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,UAAU,CAAU;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,UAAU,CAAU;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAA4B;IAKtC,SAAS,EAAE,IAA4B,GDhChC;EAKC,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAA8C,IAAI,GDrC9C;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,QAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,GAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,GAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,GAA4B,GDrCxC;EAFD,AAAA,WAAW,CAAkB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,WAAW,CAAkB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,WAAW,CAAkB;ICuCrC,KAAK,EAAgB,IAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAA8C,IAAI,GDjC7C;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,QAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,GAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,GAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,GAA4B,GDjCvC;EAFD,AAAA,WAAW,CAAkB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,WAAW,CAAkB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,WAAW,CAAkB;ICmCrC,IAAI,EAAgB,IAA4B,GDjCvC;EAOD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,EAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,QAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,GAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,GAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,GAA4B,GDpBhC;EAFD,AAAA,aAAa,CAAU;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,aAAa,CAAU;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;;A1BHP,MAAM,EAAE,SAAS,EAAE,KAAK;E0B1BtB,AAAA,OAAO,CAAO;IACZ,UAAU,EAAE,CAAC;IACb,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,IAAI,GAChB;EACD,AAAA,YAAY,CAAO;IACjB,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,IAAI,GACZ;EAGC,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,QAA4B;IAKtC,SAAS,EAAE,QAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAA4B;IAKtC,SAAS,EAAE,GAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAA4B;IAKtC,SAAS,EAAE,GAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAA4B;IAKtC,SAAS,EAAE,GAA4B,GDhChC;EAFD,AAAA,UAAU,CAAU;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,UAAU,CAAU;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,UAAU,CAAU;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAA4B;IAKtC,SAAS,EAAE,IAA4B,GDhChC;EAKC,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAA8C,IAAI,GDrC9C;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,QAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,GAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,GAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,GAA4B,GDrCxC;EAFD,AAAA,WAAW,CAAkB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,WAAW,CAAkB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,WAAW,CAAkB;ICuCrC,KAAK,EAAgB,IAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAA8C,IAAI,GDjC7C;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,QAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,GAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,GAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,GAA4B,GDjCvC;EAFD,AAAA,WAAW,CAAkB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,WAAW,CAAkB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,WAAW,CAAkB;ICmCrC,IAAI,EAAgB,IAA4B,GDjCvC;EAOD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,EAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,QAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,GAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,GAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,GAA4B,GDpBhC;EAFD,AAAA,aAAa,CAAU;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,aAAa,CAAU;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;;A1BHP,MAAM,EAAE,SAAS,EAAE,MAAM;E0B1BvB,AAAA,OAAO,CAAO;IACZ,UAAU,EAAE,CAAC;IACb,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,IAAI,GAChB;EACD,AAAA,YAAY,CAAO;IACjB,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,IAAI,GACZ;EAGC,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,QAA4B;IAKtC,SAAS,EAAE,QAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAA4B;IAKtC,SAAS,EAAE,GAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAA4B;IAKtC,SAAS,EAAE,GAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,SAAS,CAAW;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAA4B;IAKtC,SAAS,EAAE,GAA4B,GDhChC;EAFD,AAAA,UAAU,CAAU;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,UAAU,CAAU;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAA4B;IAKtC,SAAS,EAAE,SAA4B,GDhChC;EAFD,AAAA,UAAU,CAAU;IC6B1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAA4B;IAKtC,SAAS,EAAE,IAA4B,GDhChC;EAKC,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAA8C,IAAI,GDrC9C;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,QAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,GAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,GAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICuCrC,KAAK,EAAgB,GAA4B,GDrCxC;EAFD,AAAA,WAAW,CAAkB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,WAAW,CAAkB;ICuCrC,KAAK,EAAgB,SAA4B,GDrCxC;EAFD,AAAA,WAAW,CAAkB;ICuCrC,KAAK,EAAgB,IAA4B,GDrCxC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAA8C,IAAI,GDjC7C;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,QAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,GAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,GAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,UAAU,CAAmB;ICmCrC,IAAI,EAAgB,GAA4B,GDjCvC;EAFD,AAAA,WAAW,CAAkB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,WAAW,CAAkB;ICmCrC,IAAI,EAAgB,SAA4B,GDjCvC;EAFD,AAAA,WAAW,CAAkB;ICmCrC,IAAI,EAAgB,IAA4B,GDjCvC;EAOD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,EAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,QAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,GAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,GAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,YAAY,CAAW;ICsB/B,WAAW,EAAE,GAA4B,GDpBhC;EAFD,AAAA,aAAa,CAAU;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;EAFD,AAAA,aAAa,CAAU;ICsB/B,WAAW,EAAE,SAA4B,GDpBhC;;AWvDX,AAAA,MAAM,CAAC;EACL,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,IAAI;EACf,aAAa,EvCqIJ,IAAI,GuChHd;EAxBD,AAKE,MALI,CAKJ,EAAE;EALJ,AAME,MANI,CAMJ,EAAE,CAAC;IACD,OAAO,EvCuUqB,OAAM;IuCtUlC,cAAc,EAAE,GAAG;IACnB,UAAU,EvC4JC,GAAG,CuC5JkB,KAAK,CvCgGb,OAAO,GuC/FhC;EAVH,AAYQ,MAZF,CAYJ,KAAK,CAAC,EAAE,CAAC;IACP,cAAc,EAAE,MAAM;IACtB,aAAa,EAAE,GAAyB,CAAC,KAAK,CvC2FtB,OAAO,GuC1FhC;EAfH,AAiBU,MAjBJ,CAiBJ,KAAK,GAAG,KAAK,CAAC;IACZ,UAAU,EAAE,GAAyB,CAAC,KAAK,CvCuFnB,OAAO,GuCtFhC;EAnBH,AAqBE,MArBI,CAqBJ,MAAM,CAAC;IACL,gBAAgB,EvCoEX,IAAI,GuCnEV;;AAQH,AACE,SADO,CACP,EAAE;AADJ,AAEE,SAFO,CAEP,EAAE,CAAC;EACD,OAAO,EvC6SqB,MAAK,GuC5SlC;;AAQH,AAAA,eAAe,CAAC;EACd,MAAM,EvCyHO,GAAG,CuCzHY,KAAK,CvC6DP,OAAO,GuChDlC;EAdD,AAGE,eAHa,CAGb,EAAE;EAHJ,AAIE,eAJa,CAIb,EAAE,CAAC;IACD,MAAM,EvCqHK,GAAG,CuCrHc,KAAK,CvCyDT,OAAO,GuCxDhC;EANH,AASI,eATW,CAQb,KAAK,CACH,EAAE;EATN,AAUI,eAVW,CAQb,KAAK,CAEH,EAAE,CAAC;IACD,mBAAmB,EAAE,GAAyB,GAC/C;;AASL,AACQ,cADM,CACZ,KAAK,CAAC,EAAE,AAAA,YAAa,CAAA,AAAA,GAAG,EAAE;EACxB,gBAAgB,EzCde,mBAAe,GyCe/C;;AAQH,AACQ,YADI,CACV,KAAK,CAAC,EAAE,ApCtE3B,MAA4B,CAAC;EoCwEN,gBAAgB,EvCab,oBAAI,GGrFY;;AoBLvB,AACE,aADW;AAAb,AAEI,aAFS,GAET,EAAE;AAFN,AAGI,aAHS,GAGT,EAAE,CAAC;EACH,gBAAgB,EvBsFb,oBAAI,GuBrFR;;AAKH,AAGE,YAHU,CAGV,aAAa,ApBRlC,MAA4B,CAAC;EoBUJ,gBAAgB,EAJD,oBAAuB,GpBNrB;EoBKvB,AAOQ,YAPI,CAGV,aAAa,ApBRd,MAAQ,GoBYD,EAAE;EAPV,AAQQ,YARI,CAGV,aAAa,ApBRd,MAAQ,GoBaD,EAAE,CAAC;IACH,gBAAgB,EARH,oBAAuB,GASrC;;AApBP,AACE,cADY;AAAd,AAEI,cAFU,GAEV,EAAE;AAFN,AAGI,cAHU,GAGV,EAAE,CAAC;EACH,gBAAgB,EzBIa,OAAO,GyBHrC;;AAKH,AAGE,YAHU,CAGV,cAAc,ApBRnC,MAA4B,CAAC;EoBUJ,gBAAgB,EAJD,OAAuB,GpBNrB;EoBKvB,AAOQ,YAPI,CAGV,cAAc,ApBRhB,MAAS,GoBYD,EAAE;EAPV,AAQQ,YARI,CAGV,cAAc,ApBRhB,MAAS,GoBaD,EAAE,CAAC;IACH,gBAAgB,EARH,OAAuB,GASrC;;AApBP,AACE,WADS;AAAX,AAEI,WAFO,GAEP,EAAE;AAFN,AAGI,WAHO,GAGP,EAAE,CAAC;EACH,gBAAgB,EzBKa,OAAO,GyBJrC;;AAKH,AAGE,YAHU,CAGV,WAAW,ApBRhC,MAA4B,CAAC;EoBUJ,gBAAgB,EAJD,OAAuB,GpBNrB;EoBKvB,AAOQ,YAPI,CAGV,WAAW,ApBRd,MAAU,GoBYD,EAAE;EAPV,AAQQ,YARI,CAGV,WAAW,ApBRd,MAAU,GoBaD,EAAE,CAAC;IACH,gBAAgB,EARH,OAAuB,GASrC;;AApBP,AACE,cADY;AAAd,AAEI,cAFU,GAEV,EAAE;AAFN,AAGI,cAHU,GAGV,EAAE,CAAC;EACH,gBAAgB,EzBMa,OAAO,GyBLrC;;AAKH,AAGE,YAHU,CAGV,cAAc,ApBRnC,MAA4B,CAAC;EoBUJ,gBAAgB,EAJD,OAAuB,GpBNrB;EoBKvB,AAOQ,YAPI,CAGV,cAAc,ApBRlB,MAAW,GoBYD,EAAE;EAPV,AAQQ,YARI,CAGV,cAAc,ApBRlB,MAAW,GoBaD,EAAE,CAAC;IACH,gBAAgB,EARH,OAAuB,GASrC;;AApBP,AACE,aADW;AAAb,AAEI,aAFS,GAET,EAAE;AAFN,AAGI,aAHS,GAGT,EAAE,CAAC;EACH,gBAAgB,EzBOa,OAAO,GyBNrC;;AAKH,AAGE,YAHU,CAGV,aAAa,ApBRlC,MAA4B,CAAC;EoBUJ,gBAAgB,EAJD,OAAuB,GpBNrB;EoBKvB,AAOQ,YAPI,CAGV,aAAa,ApBRlB,MAAY,GoBYD,EAAE;EAPV,AAQQ,YARI,CAGV,aAAa,ApBRlB,MAAY,GoBaD,EAAE,CAAC;IACH,gBAAgB,EARH,OAAuB,GASrC;;AgBgFT,AACE,cADY,CACZ,EAAE,CAAC;EACD,KAAK,EvCbA,IAAI;EuCcT,gBAAgB,EvCFQ,OAAO,GuCGhC;;AAGH,AACE,cADY,CACZ,EAAE,CAAC;EACD,KAAK,EvCPmB,OAAO;EuCQ/B,gBAAgB,EvCNQ,OAAO,GuCOhC;;AAGH,AAAA,cAAc,CAAC;EACb,KAAK,EvC1BE,IAAI;EuC2BX,gBAAgB,EvCfU,OAAO,GuC0BlC;EAbD,AAIE,cAJY,CAIZ,EAAE;EAJJ,AAKE,cALY,CAKZ,EAAE;EALJ,AAMQ,cANM,CAMZ,KAAK,CAAC,EAAE,CAAC;IACP,YAAY,EvChCP,IAAI,GuCiCV;EARH,AAUE,cAVY,AAUZ,eAAgB,CAAC;IACf,MAAM,EAAE,CAAC,GACV;;AAWH,AAAA,iBAAiB,CAAC;EAChB,OAAO,EAAE,KAAK;EACd,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,IAAI;EAChB,kBAAkB,EAAE,wBAAwB,GAM7C;EAVD,AAOE,iBAPe,AAOf,eAAgB,CAAC;IACf,MAAM,EAAE,CAAC,GACV;;ACjJH,AAAA,aAAa,CAAC;EACZ,OAAO,EAAE,KAAK;EACd,KAAK,EAAE,IAAI;EAGX,OAAO,ExCoZwB,MAAK,CADL,OAAM;EwClZrC,SAAS,ExC+OM,IAAI;EwC9OnB,WAAW,ExCmZoB,IAAI;EwClZnC,KAAK,ExC6FqB,OAAO;EwC5FjC,gBAAgB,ExC+ET,IAAI;EwC7EX,gBAAgB,EAAE,IAAI;EACtB,eAAe,EAAE,WAAW;EAC5B,MAAM,ExCsJO,GAAG,CwCtJgB,KAAK,CxC4E9B,mBAAI;EwCvET,aAAa,ExCwSQ,OAAM;ECjTzB,UAAU,EDgbiB,YAAY,CAAC,WAAW,CAAC,KAAI,EAAE,UAAU,CAAC,WAAW,CAAC,KAAI,GwC/X1F;EA1DD,AA4BE,aA5BW,AA4BX,YAAa,CAAC;IACZ,gBAAgB,EAAE,WAAW;IAC7B,MAAM,EAAE,CAAC,GACV;EA/BH,AlBuCE,akBvCW,AlBuCX,MAAO,CAAC;IACN,KAAK,EtB6DmB,OAAO;IsB5D/B,gBAAgB,EtB+CX,IAAI;IsB9CT,YAAY,EtB+XiB,OAA4B;IsB9XzD,OAAO,EAAE,IAAI,GAEd;EkB7CH,AAqCE,aArCW,AAqCX,aAAc,CAAC;IACb,KAAK,ExCgEmB,OAAO;IwC9D/B,OAAO,EAAE,CAAC,GACX;EAzCH,AAgDE,aAhDW,AAgDX,SAAU,EAhDZ,AAiDE,aAjDW,CAiDX,AAAA,QAAE,AAAA,EAAU;IACV,gBAAgB,ExCqDQ,OAAO;IwCnD/B,OAAO,EAAE,CAAC,GACX;EArDH,AAuDE,aAvDW,AAuDX,SAAU,CAAC;IACT,MAAM,ExCkZuB,WAAW,GwCjZzC;;AAGH,AACE,MADI,AAAA,aAAa,AACjB,IAAM,EAAA,AAAA,AAAA,IAAC,AAAA,EAAM,IAAK,EAAA,AAAA,AAAA,QAAC,AAAA,GAAW;EAE5B,MAAM,EAAE,mBAAgD,GACzD;;AAJH,AAME,MANI,AAAA,aAAa,AAMjB,MAAO,AAAA,WAAW,CAAC;EAMjB,KAAK,ExC6BmB,OAAO;EwC5B/B,gBAAgB,ExCeX,IAAI,GwCdV;;AAIH,AAAA,kBAAkB;AAClB,AAAA,mBAAmB,CAAC;EAClB,OAAO,EAAE,KAAK,GACf;;AASD,AAAA,eAAe,CAAC;EACd,WAAW,EAAE,sBAA0D;EACvE,cAAc,EAAE,sBAA0D;EAC1E,aAAa,EAAE,CAAC,GACjB;;AAED,AAAA,kBAAkB,CAAC;EACjB,WAAW,EAAE,uBAA6D;EAC1E,cAAc,EAAE,uBAA6D;EAC7E,SAAS,ExCmJM,OAAO,GwClJvB;;AAED,AAAA,kBAAkB,CAAC;EACjB,WAAW,EAAE,uBAA6D;EAC1E,cAAc,EAAE,uBAA6D;EAC7E,SAAS,ExC8IM,QAAO,GwC7IvB;;AASD,AAAA,gBAAgB,CAAC;EACf,WAAW,ExCqSoB,MAAK;EwCpSpC,cAAc,ExCoSiB,MAAK;EwCnSpC,aAAa,EAAE,CAAC;EAChB,SAAS,ExC8HM,IAAI,GwC7HpB;;AAQD,AAAA,oBAAoB,CAAC;EACnB,WAAW,ExCwRoB,MAAK;EwCvRpC,cAAc,ExCuRiB,MAAK;EwCtRpC,aAAa,EAAE,CAAC;EAChB,WAAW,ExCsRoB,IAAI;EwCrRnC,MAAM,EAAE,iBAAiB;EACzB,YAAY,ExC6BC,GAAG,CwC7BsB,CAAC,GAOxC;EAbD,AAQE,oBARkB,AAQlB,gBAAiB,EKrFnB,AL6EA,eK7Ee,GL6Ef,oBAAoB,AK7EF,aAAa;EAC/B,AL4EA,eK5Ee,GL4Ef,oBAAoB,AK5EF,kBAAkB;EACpC,AL2EA,eK3Ee,GAAG,gBAAgB,GL2ElC,oBAAoB,AK3EiB,IAAI,EL2EzC,AASE,oBATkB,AASlB,gBAAiB,EK3FnB,ALkFA,eKlFe,GLkFf,oBAAoB,AKlFF,aAAa;EAC/B,ALiFA,eKjFe,GLiFf,oBAAoB,AKjFF,kBAAkB;EACpC,ALgFA,eKhFe,GAAG,gBAAgB,GLgFlC,oBAAoB,AKhFiB,IAAI,CLyFrB;IAChB,aAAa,EAAE,CAAC;IAChB,YAAY,EAAE,CAAC,GAChB;;AAYH,AAAA,gBAAgB,EKrGhB,ALqGA,eKrGe,GAAG,aAAa;AAC/B,ALoGA,eKpGe,GAAG,kBAAkB;AACpC,ALmGA,eKnGe,GAAG,gBAAgB,GAAG,IAAI,CLmGxB;EACf,OAAO,ExCuRwB,OAAM,CADN,MAAK;EwCrRpC,SAAS,ExC6FM,QAAO;EyBzPpB,aAAa,EzB8TQ,MAAK,GwChK7B;;AAED,AACE,MADI,AAAA,gBAAgB,AACpB,IAAM,EAAA,AAAA,AAAA,IAAC,AAAA,EAAM,IAAK,EAAA,AAAA,AAAA,QAAC,AAAA,IK5GrB,AL2GA,eK3Ge,GL2Gf,MAAM,AK3GY,aAAa,AL4G7B,IAAM,EAAA,AAAA,AAAA,IAAC,AAAA,EAAM,IAAK,EAAA,AAAA,AAAA,QAAC,AAAA;AK3GrB,AL0GA,eK1Ge,GL0Gf,MAAM,AK1GY,kBAAkB,AL2GlC,IAAM,EAAA,AAAA,AAAA,IAAC,AAAA,EAAM,IAAK,EAAA,AAAA,AAAA,QAAC,AAAA;AK1GrB,ALyGA,eKzGe,GAAG,gBAAgB,GLyGlC,MAAM,AKzG+B,IAAI,AL0GvC,IAAM,EAAA,AAAA,AAAA,IAAC,AAAA,EAAM,IAAK,EAAA,AAAA,AAAA,QAAC,AAAA,GAAW;EAC5B,MAAM,ExCuRuB,SAA+D,GwCtR7F;;AAGH,AAAA,gBAAgB,EKtHhB,ALsHA,eKtHe,GAAG,aAAa;AAC/B,ALqHA,eKrHe,GAAG,kBAAkB;AACpC,ALoHA,eKpHe,GAAG,gBAAgB,GAAG,IAAI,CLoHxB;EACf,OAAO,ExC8QwB,OAAM,CADN,MAAM;EwC5QrC,SAAS,ExCgFM,OAAO;EyBxPpB,aAAa,EzB6TQ,MAAK,GwCnJ7B;;AAED,AACE,MADI,AAAA,gBAAgB,AACpB,IAAM,EAAA,AAAA,AAAA,IAAC,AAAA,EAAM,IAAK,EAAA,AAAA,AAAA,QAAC,AAAA,IK7HrB,AL4HA,eK5He,GL4Hf,MAAM,AK5HY,aAAa,AL6H7B,IAAM,EAAA,AAAA,AAAA,IAAC,AAAA,EAAM,IAAK,EAAA,AAAA,AAAA,QAAC,AAAA;AK5HrB,AL2HA,eK3He,GL2Hf,MAAM,AK3HY,kBAAkB,AL4HlC,IAAM,EAAA,AAAA,AAAA,IAAC,AAAA,EAAM,IAAK,EAAA,AAAA,AAAA,QAAC,AAAA;AK3HrB,AL0HA,eK1He,GAAG,gBAAgB,GL0HlC,MAAM,AK1H+B,IAAI,AL2HvC,IAAM,EAAA,AAAA,AAAA,IAAC,AAAA,EAAM,IAAK,EAAA,AAAA,AAAA,QAAC,AAAA,GAAW;EAC5B,MAAM,ExC0QuB,UAA+D,GwCzQ7F;;AASH,AAAA,WAAW,CAAC;EACV,aAAa,ExCjDJ,IAAI,GwCkDd;;AAED,AAAA,UAAU,CAAC;EACT,OAAO,EAAE,KAAK;EACd,UAAU,ExC+Pe,OAAM,GwC9PhC;;AAOD,AAAA,WAAW,CAAC;EACV,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,KAAK;EACd,aAAa,ExCuPa,MAAK,GwC/OhC;EAXD,AAMI,WANO,AAKT,SAAU,CACR,iBAAiB,CAAC;IAChB,KAAK,ExCrGiB,OAAO;IwCsG7B,MAAM,ExC8PqB,WAAW,GwC7PvC;;AAIL,AAAA,iBAAiB,CAAC;EAChB,YAAY,ExC6Oc,OAAO;EwC5OjC,aAAa,EAAE,CAAC;EAChB,MAAM,EAAE,OAAO,GAChB;;AAED,AAAA,iBAAiB,CAAC;EAChB,QAAQ,EAAE,QAAQ;EAClB,UAAU,ExCuOgB,OAAM;EwCtOhC,WAAW,ExCqOe,QAAO,GwChOlC;EARD,AAKE,iBALe,AAKf,WAAY,CAAC;IACX,QAAQ,EAAE,MAAM,GACjB;;AAIH,AAAA,kBAAkB,CAAC;EACjB,OAAO,EAAE,YAAY,GAStB;EAVD,AAGE,kBAHgB,CAGhB,iBAAiB,CAAC;IAChB,cAAc,EAAE,MAAM,GACvB;EALH,AAOI,kBAPc,GAOd,kBAAkB,CAAC;IACnB,WAAW,ExCyNc,OAAM,GwCxNhC;;AAQH,AAAA,sBAAsB,CAAC;EACrB,UAAU,ExCuMe,OAAM,GwCtMhC;;AAED,AAAA,qBAAqB;AACrB,AAAA,qBAAqB;AACrB,AAAA,oBAAoB,CAAC;EACnB,aAAa,EAAE,OAAsB;EACrC,iBAAiB,EAAE,SAAS;EAC5B,mBAAmB,EAAE,MAAM,CAAC,KAAK,CAAC,SAAmB;EACrD,eAAe,EAAE,QAAmB,CAAC,QAAmB,GACzD;;AAGD,AlBhQE,YkBgQU,ClBhQV,sBAAsB;AkBgQxB,AlB/PE,YkB+PU,ClB/PV,mBAAmB;AkB+PrB,AlB9PE,YkB8PU,ClB9PV,eAAe;AkB8PjB,AlB7PE,YkB6PU,ClB7PV,iBAAiB;AkB6PnB,AlB5PE,YkB4PU,ClB5PV,eAAe,CAAC;EACd,KAAK,ExBC0B,OAAO,GwBAvC;;AkB0PH,AlBvPE,YkBuPU,ClBvPV,aAAa,CAAC;EACZ,YAAY,ExBJmB,OAAO,GwBSvC;;AkBiPH,AlB9OE,YkB8OU,ClB9OV,kBAAkB,CAAC;EACjB,KAAK,ExBb0B,OAAO;EwBctC,YAAY,ExBdmB,OAAO;EwBetC,gBAAgB,EAAE,OAAoB,GACvC;;AkB0OH,AAGE,YAHU,CAGV,qBAAqB,CAAC;EACpB,gBAAgB,ExCtMR,uPAA+H,GwCuMxI;;AAGH,AlBxQE,YkBwQU,ClBxQV,sBAAsB;AkBwQxB,AlBvQE,YkBuQU,ClBvQV,mBAAmB;AkBuQrB,AlBtQE,YkBsQU,ClBtQV,eAAe;AkBsQjB,AlBrQE,YkBqQU,ClBrQV,iBAAiB;AkBqQnB,AlBpQE,YkBoQU,ClBpQV,eAAe,CAAC;EACd,KAAK,ExBG0B,OAAO,GwBFvC;;AkBkQH,AlB/PE,YkB+PU,ClB/PV,aAAa,CAAC;EACZ,YAAY,ExBFmB,OAAO,GwBOvC;;AkByPH,AlBtPE,YkBsPU,ClBtPV,kBAAkB,CAAC;EACjB,KAAK,ExBX0B,OAAO;EwBYtC,YAAY,ExBZmB,OAAO;EwBatC,gBAAgB,EAAE,KAAoB,GACvC;;AkBkPH,AAGE,YAHU,CAGV,qBAAqB,CAAC;EACpB,gBAAgB,ExC9MR,gUAA+H,GwC+MxI;;AAGH,AlBhRE,WkBgRS,ClBhRT,sBAAsB;AkBgRxB,AlB/QE,WkB+QS,ClB/QT,mBAAmB;AkB+QrB,AlB9QE,WkB8QS,ClB9QT,eAAe;AkB8QjB,AlB7QE,WkB6QS,ClB7QT,iBAAiB;AkB6QnB,AlB5QE,WkB4QS,ClB5QT,eAAe,CAAC;EACd,KAAK,ExBI0B,OAAO,GwBHvC;;AkB0QH,AlBvQE,WkBuQS,ClBvQT,aAAa,CAAC;EACZ,YAAY,ExBDmB,OAAO,GwBMvC;;AkBiQH,AlB9PE,WkB8PS,ClB9PT,kBAAkB,CAAC;EACjB,KAAK,ExBV0B,OAAO;EwBWtC,YAAY,ExBXmB,OAAO;EwBYtC,gBAAgB,EAAE,OAAoB,GACvC;;AkB0PH,AAGE,WAHS,CAGT,oBAAoB,CAAC;EACnB,gBAAgB,ExCtNR,iSAA+H,GwCuNxI;;AAaH,AAAA,YAAY,CAAC;EACX,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,QAAQ;EACnB,WAAW,EAAE,MAAM,GAuFpB;EA1FD,AAQE,YARU,CAQV,WAAW,CAAC;IACV,KAAK,EAAE,IAAI,GACZ;EtC3PC,MAAM,EAAE,SAAS,EAAE,KAAK;IsCiP5B,AAcI,YAdQ,CAcR,KAAK,CAAC;MACJ,OAAO,EAAE,IAAI;MACb,WAAW,EAAE,MAAM;MACnB,eAAe,EAAE,MAAM;MACvB,aAAa,EAAE,CAAC,GACjB;IAnBL,AAsBI,YAtBQ,CAsBR,WAAW,CAAC;MACV,OAAO,EAAE,IAAI;MACb,IAAI,EAAE,QAAQ;MACd,SAAS,EAAE,QAAQ;MACnB,WAAW,EAAE,MAAM;MACnB,aAAa,EAAE,CAAC,GACjB;IA5BL,AA+BI,YA/BQ,CA+BR,aAAa,CAAC;MACZ,OAAO,EAAE,YAAY;MACrB,KAAK,EAAE,IAAI;MACX,cAAc,EAAE,MAAM,GACvB;IAnCL,AAsCI,YAtCQ,CAsCR,oBAAoB,CAAC;MACnB,OAAO,EAAE,YAAY,GACtB;IAxCL,AA0CI,YA1CQ,CA0CR,YAAY,CAAC;MACX,KAAK,EAAE,IAAI,GACZ;IA5CL,AA8CI,YA9CQ,CA8CR,mBAAmB,CAAC;MAClB,aAAa,EAAE,CAAC;MAChB,cAAc,EAAE,MAAM,GACvB;IAjDL,AAqDI,YArDQ,CAqDR,WAAW,CAAC;MACV,OAAO,EAAE,IAAI;MACb,WAAW,EAAE,MAAM;MACnB,eAAe,EAAE,MAAM;MACvB,KAAK,EAAE,IAAI;MACX,UAAU,EAAE,CAAC;MACb,aAAa,EAAE,CAAC,GACjB;IA5DL,AA6DI,YA7DQ,CA6DR,iBAAiB,CAAC;MAChB,YAAY,EAAE,CAAC,GAChB;IA/DL,AAgEI,YAhEQ,CAgER,iBAAiB,CAAC;MAChB,QAAQ,EAAE,QAAQ;MAClB,UAAU,EAAE,CAAC;MACb,YAAY,ExC2FU,OAAM;MwC1F5B,WAAW,EAAE,CAAC,GACf;IArEL,AAwEI,YAxEQ,CAwER,eAAe,CAAC;MACd,OAAO,EAAE,IAAI;MACb,WAAW,EAAE,MAAM;MACnB,eAAe,EAAE,MAAM;MACvB,YAAY,EAAE,CAAC,GAChB;IA7EL,AA8EI,YA9EQ,CA8ER,yBAAyB,CAAC;MACxB,QAAQ,EAAE,MAAM;MAChB,OAAO,EAAE,YAAY;MACrB,YAAY,ExC6EU,OAAM;MwC5E5B,cAAc,EAAE,WAAW,GAC5B;IAnFL,AAsFkB,YAtFN,CAsFR,aAAa,CAAC,sBAAsB,CAAC;MACnC,GAAG,EAAE,CAAC,GACP;;AC3XL,AAAA,IAAI,CAAC;EACH,OAAO,EAAE,YAAY;EACrB,WAAW,EzCwPQ,MAAM;EyCvPzB,WAAW,EzCkWoB,IAAI;EyCjWnC,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,MAAM;EACnB,cAAc,EAAE,MAAM;EACtB,WAAW,EAAE,IAAI;EACjB,MAAM,EzC2JO,GAAG,CyC3JgB,KAAK,CAAC,WAAW;EzBoEjD,OAAO,EhBwRwB,MAAK,CADL,IAAI;EgBtRnC,SAAS,EhBwKM,IAAI;EyBvPjB,aAAa,EzB4TQ,OAAM;ECjTzB,UAAU,ED0YiB,GAAG,CAAC,IAAG,CAAC,WAAW,GyChXnD;EAnCD,AtCcI,IsCdA,AtCclD,MAAyD,EsCdX,AtCeI,IsCfA,AtCelD,MAAyD,CAAC;IsCDR,eAAe,EAAE,IAAI,GtCGpB;EsCjBL,AAgBE,IAhBE,AAgBF,MAAO,EAhBT,AAiBE,IAjBE,AAiBF,MAAO,CAAC;IACN,OAAO,EAAE,CAAC;IACV,UAAU,EzCqVmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CFlWP,uBAAO,G2CcvC;EApBH,AAuBE,IAvBE,AAuBF,SAAU,EAvBZ,AAwBE,IAxBE,AAwBF,SAAU,CAAC;IACT,MAAM,EzCibuB,WAAW;IyChbxC,OAAO,EAAE,GAAG,GAEb;EA5BH,AA8BE,IA9BE,AA8BF,OAAQ,EA9BV,AA+BE,IA/BE,AA+BF,OAAQ,CAAC;IACP,gBAAgB,EAAE,IAAI,GAEvB;;AAIH,AAAA,CAAC,AAAA,IAAI,AAAA,SAAS;AACd,AAAmB,QAAX,CAAA,AAAA,QAAC,AAAA,EAAU,CAAC,AAAA,IAAI,CAAC;EACvB,cAAc,EAAE,IAAI,GACrB;;AAOD,AAAA,YAAY,CAAC;EzB7CX,KAAK,EhBqFE,IAAI;EgBpFX,gBAAgB,ElBEiB,OAAO;EkBDxC,YAAY,ElBCqB,OAAO,G2C4CzC;EAFD,AtC5CI,YsC4CQ,AtC5C7B,MAA4B,CAAC;IaMR,KAAK,EhB8EA,IAAI;IgB7ET,gBAAgB,EAXE,OAAwB;IAY1C,YAAY,EAXE,OAAoB,GbGb;EsC4CzB,AzBlCE,YyBkCU,AzBlCf,MAAY,EyBkCT,AzBjCE,YyBiCU,AzBjCf,MAAY,CAAC;IAKJ,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,ClBdQ,sBAAO,GkBgBvC;EyB0BH,AzBvBE,YyBuBU,AzBvBf,SAAe,EyBuBZ,AzBtBE,YyBsBU,AzBtBf,SAAe,CAAC;IACT,gBAAgB,ElBrBe,OAAO;IkBsBtC,YAAY,ElBtBmB,OAAO,GkBuBvC;EyBmBH,AzBjBE,YyBiBU,AzBjBf,OAAa,EyBiBV,AzBhBE,YyBgBU,AzBhBf,OAAa;EACR,AAAQ,KAAH,GyBeP,YAAY,AzBfP,gBAAsB,CAAC;IACxB,KAAK,EhBsDA,IAAI;IgBrDT,gBAAgB,EAnCE,OAAwB;IAoC1C,gBAAgB,EAAE,IAAI;IACtB,YAAY,EApCE,OAAoB,GAsCnC;;AyBYH,AAAA,cAAc,CAAC;EzBhDb,KAAK,EhBiGqB,OAAO;EgBhGjC,gBAAgB,EhBoFT,IAAI;EgBnFX,YAAY,EhB4WmB,IAAI,GyC5TpC;EAFD,AtC/CI,csC+CU,AtC/C/B,MAA4B,CAAC;IaMR,KAAK,EhB0FmB,OAAO;IgBzF/B,gBAAgB,EAXE,OAAwB;IAY1C,YAAY,EAXE,OAAoB,GbGb;EsC+CzB,AzBrCE,cyBqCY,AzBrCjB,MAAY,EyBqCT,AzBpCE,cyBoCY,AzBpCjB,MAAY,CAAC;IAKJ,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,ChB6VM,wBAAI,GgB3VlC;EyB6BH,AzB1BE,cyB0BY,AzB1BjB,SAAe,EyB0BZ,AzBzBE,cyByBY,AzBzBjB,SAAe,CAAC;IACT,gBAAgB,EhB6DX,IAAI;IgB5DT,YAAY,EhBqViB,IAAI,GgBpVlC;EyBsBH,AzBpBE,cyBoBY,AzBpBjB,OAAa,EyBoBV,AzBnBE,cyBmBY,AzBnBjB,OAAa;EACR,AAAQ,KAAH,GyBkBP,cAAc,AzBlBT,gBAAsB,CAAC;IACxB,KAAK,EhBkEmB,OAAO;IgBjE/B,gBAAgB,EAnCE,OAAwB;IAoC1C,gBAAgB,EAAE,IAAI;IACtB,YAAY,EApCE,OAAoB,GAsCnC;;AyBeH,AAAA,SAAS,CAAC;EzBnDR,KAAK,EhBqFE,IAAI;EgBpFX,gBAAgB,ElBIiB,OAAO;EkBHxC,YAAY,ElBGqB,OAAO,G2CgDzC;EAFD,AtClDI,SsCkDK,AtClD1B,MAA4B,CAAC;IaMR,KAAK,EhB8EA,IAAI;IgB7ET,gBAAgB,EAXE,OAAwB;IAY1C,YAAY,EAXE,OAAoB,GbGb;EsCkDzB,AzBxCE,SyBwCO,AzBxCZ,MAAY,EyBwCT,AzBvCE,SyBuCO,AzBvCZ,MAAY,CAAC;IAKJ,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,ClBZQ,uBAAO,GkBcvC;EyBgCH,AzB7BE,SyB6BO,AzB7BZ,SAAe,EyB6BZ,AzB5BE,SyB4BO,AzB5BZ,SAAe,CAAC;IACT,gBAAgB,ElBnBe,OAAO;IkBoBtC,YAAY,ElBpBmB,OAAO,GkBqBvC;EyByBH,AzBvBE,SyBuBO,AzBvBZ,OAAa,EyBuBV,AzBtBE,SyBsBO,AzBtBZ,OAAa;EACR,AAAQ,KAAH,GyBqBP,SAAS,AzBrBJ,gBAAsB,CAAC;IACxB,KAAK,EhBsDA,IAAI;IgBrDT,gBAAgB,EAnCE,OAAwB;IAoC1C,gBAAgB,EAAE,IAAI;IACtB,YAAY,EApCE,OAAoB,GAsCnC;;AyBkBH,AAAA,YAAY,CAAC;EzBtDX,KAAK,EhBqFE,IAAI;EgBpFX,gBAAgB,ElBGiB,OAAO;EkBFxC,YAAY,ElBEqB,OAAO,G2CoDzC;EAFD,AtCrDI,YsCqDQ,AtCrD7B,MAA4B,CAAC;IaMR,KAAK,EhB8EA,IAAI;IgB7ET,gBAAgB,EAXE,OAAwB;IAY1C,YAAY,EAXE,OAAoB,GbGb;EsCqDzB,AzB3CE,YyB2CU,AzB3Cf,MAAY,EyB2CT,AzB1CE,YyB0CU,AzB1Cf,MAAY,CAAC;IAKJ,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,ClBbQ,sBAAO,GkBevC;EyBmCH,AzBhCE,YyBgCU,AzBhCf,SAAe,EyBgCZ,AzB/BE,YyB+BU,AzB/Bf,SAAe,CAAC;IACT,gBAAgB,ElBpBe,OAAO;IkBqBtC,YAAY,ElBrBmB,OAAO,GkBsBvC;EyB4BH,AzB1BE,YyB0BU,AzB1Bf,OAAa,EyB0BV,AzBzBE,YyByBU,AzBzBf,OAAa;EACR,AAAQ,KAAH,GyBwBP,YAAY,AzBxBP,gBAAsB,CAAC;IACxB,KAAK,EhBsDA,IAAI;IgBrDT,gBAAgB,EAnCE,OAAwB;IAoC1C,gBAAgB,EAAE,IAAI;IACtB,YAAY,EApCE,OAAoB,GAsCnC;;AyBqBH,AAAA,YAAY,CAAC;EzBzDX,KAAK,EhBqFE,IAAI;EgBpFX,gBAAgB,ElBKiB,OAAO;EkBJxC,YAAY,ElBIqB,OAAO,G2CqDzC;EAFD,AtCxDI,YsCwDQ,AtCxD7B,MAA4B,CAAC;IaMR,KAAK,EhB8EA,IAAI;IgB7ET,gBAAgB,EAXE,OAAwB;IAY1C,YAAY,EAXE,OAAoB,GbGb;EsCwDzB,AzB9CE,YyB8CU,AzB9Cf,MAAY,EyB8CT,AzB7CE,YyB6CU,AzB7Cf,MAAY,CAAC;IAKJ,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,ClBXQ,uBAAO,GkBavC;EyBsCH,AzBnCE,YyBmCU,AzBnCf,SAAe,EyBmCZ,AzBlCE,YyBkCU,AzBlCf,SAAe,CAAC;IACT,gBAAgB,ElBlBe,OAAO;IkBmBtC,YAAY,ElBnBmB,OAAO,GkBoBvC;EyB+BH,AzB7BE,YyB6BU,AzB7Bf,OAAa,EyB6BV,AzB5BE,YyB4BU,AzB5Bf,OAAa;EACR,AAAQ,KAAH,GyB2BP,YAAY,AzB3BP,gBAAsB,CAAC;IACxB,KAAK,EhBsDA,IAAI;IgBrDT,gBAAgB,EAnCE,OAAwB;IAoC1C,gBAAgB,EAAE,IAAI;IACtB,YAAY,EApCE,OAAoB,GAsCnC;;AyBwBH,AAAA,WAAW,CAAC;EzB5DV,KAAK,EhBqFE,IAAI;EgBpFX,gBAAgB,ElBMiB,OAAO;EkBLxC,YAAY,ElBKqB,OAAO,G2CuDzC;EAFD,AtC3DI,WsC2DO,AtC3D5B,MAA4B,CAAC;IaMR,KAAK,EhB8EA,IAAI;IgB7ET,gBAAgB,EAXE,OAAwB;IAY1C,YAAY,EAXE,OAAoB,GbGb;EsC2DzB,AzBjDE,WyBiDS,AzBjDd,MAAY,EyBiDT,AzBhDE,WyBgDS,AzBhDd,MAAY,CAAC;IAKJ,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,ClBVQ,sBAAO,GkBYvC;EyByCH,AzBtCE,WyBsCS,AzBtCd,SAAe,EyBsCZ,AzBrCE,WyBqCS,AzBrCd,SAAe,CAAC;IACT,gBAAgB,ElBjBe,OAAO;IkBkBtC,YAAY,ElBlBmB,OAAO,GkBmBvC;EyBkCH,AzBhCE,WyBgCS,AzBhCd,OAAa,EyBgCV,AzB/BE,WyB+BS,AzB/Bd,OAAa;EACR,AAAQ,KAAH,GyB8BP,WAAW,AzB9BN,gBAAsB,CAAC;IACxB,KAAK,EhBsDA,IAAI;IgBrDT,gBAAgB,EAnCE,OAAwB;IAoC1C,gBAAgB,EAAE,IAAI;IACtB,YAAY,EApCE,OAAoB,GAsCnC;;AyB6BH,AAAA,oBAAoB,CAAC;EzBzBnB,KAAK,ElBrC4B,OAAO;EkBsCxC,gBAAgB,EAAE,IAAI;EACtB,gBAAgB,EAAE,WAAW;EAC7B,YAAY,ElBxCqB,OAAO,G2CgEzC;EAFD,AtChEI,oBsCgEgB,AtChErC,MAA4B,CAAC;Ia6CR,KAAK,EAP2C,IAAI;IAQpD,gBAAgB,ElB5Ce,OAAO;IkB6CtC,YAAY,ElB7CmB,OAAO,GKFjB;EsCgEzB,AzBdE,oByBckB,AzBdvB,MAAY,EyBcT,AzBbE,oByBakB,AzBbvB,MAAY,CAAC;IACN,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,ClBlDU,sBAAO,GkBmDvC;EyBWH,AzBTE,oByBSkB,AzBTvB,SAAe,EyBSZ,AzBRE,oByBQkB,AzBRvB,SAAe,CAAC;IACT,KAAK,ElBvD0B,OAAO;IkBwDtC,gBAAgB,EAAE,WAAW,GAC9B;EyBKH,AzBHE,oByBGkB,AzBHvB,OAAa,EyBGV,AzBFE,oByBEkB,AzBFvB,OAAa;EACR,AAAQ,KAAH,GyBCP,oBAAoB,AzBDf,gBAAsB,CAAC;IACxB,KAAK,EA1B2C,IAAI;IA2BpD,gBAAgB,ElB/De,OAAO;IkBgEtC,YAAY,ElBhEmB,OAAO,GkBiEvC;;AyBAH,AAAA,sBAAsB,CAAC;EzB5BrB,KAAK,EhBsU0B,IAAI;EgBrUnC,gBAAgB,EAAE,IAAI;EACtB,gBAAgB,EAAE,WAAW;EAC7B,YAAY,EhBmUmB,IAAI,GyCxSpC;EAFD,AtCnEI,sBsCmEkB,AtCnEvC,MAA4B,CAAC;Ia6CR,KAAK,EAP2C,IAAI;IAQpD,gBAAgB,EhB+Ta,IAAI;IgB9TjC,YAAY,EhB8TiB,IAAI,GG7WZ;EsCmEzB,AzBjBE,sByBiBoB,AzBjBzB,MAAY,EyBiBT,AzBhBE,sByBgBoB,AzBhBzB,MAAY,CAAC;IACN,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,ChByTQ,wBAAI,GgBxTlC;EyBcH,AzBZE,sByBYoB,AzBZzB,SAAe,EyBYZ,AzBXE,sByBWoB,AzBXzB,SAAe,CAAC;IACT,KAAK,EhBoTwB,IAAI;IgBnTjC,gBAAgB,EAAE,WAAW,GAC9B;EyBQH,AzBNE,sByBMoB,AzBNzB,OAAa,EyBMV,AzBLE,sByBKoB,AzBLzB,OAAa;EACR,AAAQ,KAAH,GyBIP,sBAAsB,AzBJjB,gBAAsB,CAAC;IACxB,KAAK,EA1B2C,IAAI;IA2BpD,gBAAgB,EhB4Sa,IAAI;IgB3SjC,YAAY,EhB2SiB,IAAI,GgB1SlC;;AyBGH,AAAA,iBAAiB,CAAC;EzB/BhB,KAAK,ElBnC4B,OAAO;EkBoCxC,gBAAgB,EAAE,IAAI;EACtB,gBAAgB,EAAE,WAAW;EAC7B,YAAY,ElBtCqB,OAAO,G2CoEzC;EAFD,AtCtEI,iBsCsEa,AtCtElC,MAA4B,CAAC;Ia6CR,KAAK,EAP2C,IAAI;IAQpD,gBAAgB,ElB1Ce,OAAO;IkB2CtC,YAAY,ElB3CmB,OAAO,GKJjB;EsCsEzB,AzBpBE,iByBoBe,AzBpBpB,MAAY,EyBoBT,AzBnBE,iByBmBe,AzBnBpB,MAAY,CAAC;IACN,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,ClBhDU,uBAAO,GkBiDvC;EyBiBH,AzBfE,iByBee,AzBfpB,SAAe,EyBeZ,AzBdE,iByBce,AzBdpB,SAAe,CAAC;IACT,KAAK,ElBrD0B,OAAO;IkBsDtC,gBAAgB,EAAE,WAAW,GAC9B;EyBWH,AzBTE,iByBSe,AzBTpB,OAAa,EyBSV,AzBRE,iByBQe,AzBRpB,OAAa;EACR,AAAQ,KAAH,GyBOP,iBAAiB,AzBPZ,gBAAsB,CAAC;IACxB,KAAK,EA1B2C,IAAI;IA2BpD,gBAAgB,ElB7De,OAAO;IkB8DtC,YAAY,ElB9DmB,OAAO,GkB+DvC;;AyBMH,AAAA,oBAAoB,CAAC;EzBlCnB,KAAK,ElBpC4B,OAAO;EkBqCxC,gBAAgB,EAAE,IAAI;EACtB,gBAAgB,EAAE,WAAW;EAC7B,YAAY,ElBvCqB,OAAO,G2CwEzC;EAFD,AtCzEI,oBsCyEgB,AtCzErC,MAA4B,CAAC;Ia6CR,KAAK,EAP2C,IAAI;IAQpD,gBAAgB,ElB3Ce,OAAO;IkB4CtC,YAAY,ElB5CmB,OAAO,GKHjB;EsCyEzB,AzBvBE,oByBuBkB,AzBvBvB,MAAY,EyBuBT,AzBtBE,oByBsBkB,AzBtBvB,MAAY,CAAC;IACN,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,ClBjDU,sBAAO,GkBkDvC;EyBoBH,AzBlBE,oByBkBkB,AzBlBvB,SAAe,EyBkBZ,AzBjBE,oByBiBkB,AzBjBvB,SAAe,CAAC;IACT,KAAK,ElBtD0B,OAAO;IkBuDtC,gBAAgB,EAAE,WAAW,GAC9B;EyBcH,AzBZE,oByBYkB,AzBZvB,OAAa,EyBYV,AzBXE,oByBWkB,AzBXvB,OAAa;EACR,AAAQ,KAAH,GyBUP,oBAAoB,AzBVf,gBAAsB,CAAC;IACxB,KAAK,EA1B2C,IAAI;IA2BpD,gBAAgB,ElB9De,OAAO;IkB+DtC,YAAY,ElB/DmB,OAAO,GkBgEvC;;AyBSH,AAAA,oBAAoB,CAAC;EzBrCnB,KAAK,ElBlC4B,OAAO;EkBmCxC,gBAAgB,EAAE,IAAI;EACtB,gBAAgB,EAAE,WAAW;EAC7B,YAAY,ElBrCqB,OAAO,G2CyEzC;EAFD,AtC5EI,oBsC4EgB,AtC5ErC,MAA4B,CAAC;Ia6CR,KAAK,EAP2C,IAAI;IAQpD,gBAAgB,ElBzCe,OAAO;IkB0CtC,YAAY,ElB1CmB,OAAO,GKLjB;EsC4EzB,AzB1BE,oByB0BkB,AzB1BvB,MAAY,EyB0BT,AzBzBE,oByByBkB,AzBzBvB,MAAY,CAAC;IACN,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,ClB/CU,uBAAO,GkBgDvC;EyBuBH,AzBrBE,oByBqBkB,AzBrBvB,SAAe,EyBqBZ,AzBpBE,oByBoBkB,AzBpBvB,SAAe,CAAC;IACT,KAAK,ElBpD0B,OAAO;IkBqDtC,gBAAgB,EAAE,WAAW,GAC9B;EyBiBH,AzBfE,oByBekB,AzBfvB,OAAa,EyBeV,AzBdE,oByBckB,AzBdvB,OAAa;EACR,AAAQ,KAAH,GyBaP,oBAAoB,AzBbf,gBAAsB,CAAC;IACxB,KAAK,EA1B2C,IAAI;IA2BpD,gBAAgB,ElB5De,OAAO;IkB6DtC,YAAY,ElB7DmB,OAAO,GkB8DvC;;AyBYH,AAAA,mBAAmB,CAAC;EzBxClB,KAAK,ElBjC4B,OAAO;EkBkCxC,gBAAgB,EAAE,IAAI;EACtB,gBAAgB,EAAE,WAAW;EAC7B,YAAY,ElBpCqB,OAAO,G2C2EzC;EAFD,AtC/EI,mBsC+Ee,AtC/EpC,MAA4B,CAAC;Ia6CR,KAAK,EAP2C,IAAI;IAQpD,gBAAgB,ElBxCe,OAAO;IkByCtC,YAAY,ElBzCmB,OAAO,GKNjB;EsC+EzB,AzB7BE,mByB6BiB,AzB7BtB,MAAY,EyB6BT,AzB5BE,mByB4BiB,AzB5BtB,MAAY,CAAC;IACN,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,ClB9CU,sBAAO,GkB+CvC;EyB0BH,AzBxBE,mByBwBiB,AzBxBtB,SAAe,EyBwBZ,AzBvBE,mByBuBiB,AzBvBtB,SAAe,CAAC;IACT,KAAK,ElBnD0B,OAAO;IkBoDtC,gBAAgB,EAAE,WAAW,GAC9B;EyBoBH,AzBlBE,mByBkBiB,AzBlBtB,OAAa,EyBkBV,AzBjBE,mByBiBiB,AzBjBtB,OAAa;EACR,AAAQ,KAAH,GyBgBP,mBAAmB,AzBhBd,gBAAsB,CAAC;IACxB,KAAK,EA1B2C,IAAI;IA2BpD,gBAAgB,ElB3De,OAAO;IkB4DtC,YAAY,ElB5DmB,OAAO,GkB6DvC;;AyBsBH,AAAA,SAAS,CAAC;EACR,WAAW,EzC4JQ,MAAM;EyC3JzB,KAAK,E3CzF4B,OAAO;E2C0FxC,aAAa,EAAE,CAAC,GA6BjB;EAhCD,AAKE,SALO,EAAT,AAME,SANO,AAMP,OAAQ,EANV,AAOE,SAPO,AAOP,OAAQ,EAPV,AAQE,SARO,AAQP,SAAU,CAAC;IACT,gBAAgB,EAAE,WAAW,GAE9B;EAXH,AAYE,SAZO,EAAT,AAaE,SAbO,AAaP,MAAO,EAbT,AAcE,SAdO,AAcP,OAAQ,CAAC;IACP,YAAY,EAAE,WAAW,GAC1B;EAhBH,AtCzFI,SsCyFK,AtCzF1B,MAA4B,CAAC;IsC2GR,YAAY,EAAE,WAAW,GtC3GJ;EsCyFzB,AtC/EI,SsC+EK,AtC/EvD,MAAyD,EsC+EX,AtC9EI,SsC8EK,AtC9EvD,MAAyD,CAAC;IsCmGR,KAAK,EzC2Ee,OAAwB;IyC1E5C,eAAe,EzC2EK,SAAS;IyC1E7B,gBAAgB,EAAE,WAAW,GtCnG5B;EsC4EL,AAyBE,SAzBO,AAyBP,SAAU,CAAC;IACT,KAAK,EzCjBmB,OAAO,GyCsBhC;IA/BH,AtC/EI,SsC+EK,AAyBP,SAAU,AtCxG1D,MAAyD,EsC+EX,AtC9EI,SsC8EK,AAyBP,SAAU,AtCvG1D,MAAyD,CAAC;MsC2GN,eAAe,EAAE,IAAI,GtCzGtB;;AsCmHL,AAAA,OAAO,EG/CP,AH+CA,aG/Ca,GAAG,IAAI,CH+CZ;EzBxDN,OAAO,EhB6TwB,OAAM,CADN,MAAM;EgB3TrC,SAAS,EhByKM,OAAO;EyBxPpB,aAAa,EzB6TQ,MAAK,GyCpL7B;;AACD,AAAA,OAAO,EGpDP,AHoDA,aGpDa,GAAG,IAAI,CHoDZ;EzB5DN,OAAO,EhB0TwB,OAAM,CADN,MAAK;EgBxTpC,SAAS,EhB0KM,QAAO;EyBzPpB,aAAa,EzB8TQ,MAAK,GyCjL7B;;AAOD,AAAA,UAAU,CAAC;EACT,OAAO,EAAE,KAAK;EACd,KAAK,EAAE,IAAI,GACZ;;AAGD,AAAa,UAAH,GAAG,UAAU,CAAC;EACtB,UAAU,EzCkPqB,MAAK,GyCjPrC;;AAGD,AAGE,KAHG,CAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,CAGN,UAAa;AAFb,AAEE,KAFG,CAAA,AAAA,IAAC,CAAK,OAAO,AAAZ,CAEN,UAAa;AADb,AACE,KADG,CAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,CACN,UAAa,CAAC;EACV,KAAK,EAAE,IAAI,GACZ;;ACxKH,AAAA,KAAK,CAAC;EACJ,OAAO,EAAE,CAAC;EzCcN,UAAU,ED2TS,OAAO,CAAC,KAAI,CAAC,MAAM,G0CnU3C;EAPD,AAIE,KAJG,AAIH,KAAM,CAAC;IACL,OAAO,EAAE,CAAC,GACX;;AAGH,AAAA,SAAS,CAAC;EACR,OAAO,EAAE,IAAI,GAId;EALD,AAEE,SAFO,AAEP,KAAM,CAAC;IACL,OAAO,EAAE,KAAK,GACf;;AAGH,AACE,EADA,AACA,SAAU,AAAA,KAAK,CAAC;EACd,OAAO,EAAE,SAAS,GACnB;;AAGH,AACE,KADG,AACH,SAAU,AAAA,KAAK,CAAC;EACd,OAAO,EAAE,eAAe,GACzB;;AAGH,AAAA,WAAW,CAAC;EACV,QAAQ,EAAE,QAAQ;EAClB,MAAM,EAAE,CAAC;EACT,QAAQ,EAAE,MAAM;EzChBZ,UAAU,ED4TS,MAAM,CAAC,KAAI,CAAC,IAAI,G0C1SxC;;AChCD,AAAA,OAAO;AACP,AAAA,SAAS,CAAC;EACR,QAAQ,EAAE,QAAQ,GACnB;;AAED,AAEE,gBAFc,AAEd,OAAQ,CAAC;EACP,OAAO,EAAE,YAAY;EACrB,KAAK,EAAE,CAAC;EACR,MAAM,EAAE,CAAC;EACT,WAAW,E3C2TU,KAAI;E2C1TzB,cAAc,EAAE,MAAM;EACtB,OAAO,EAAE,EAAE;EACX,UAAU,E3CwTW,KAAI,C2CxTA,KAAK;EAC9B,YAAY,E3CuTS,KAAI,C2CvTE,KAAK,CAAC,WAAW;EAC5C,WAAW,E3CsTU,KAAI,C2CtTC,KAAK,CAAC,WAAW,GAC5C;;AAZH,AAeE,gBAfc,AAed,MAAO,CAAC;EACN,OAAO,EAAE,CAAC,GACX;;AAGH,AACE,OADK,CACL,gBAAgB,AACd,OAAQ,CAAC;EACP,UAAU,EAAE,CAAC;EACb,aAAa,E3CySM,KAAI,C2CzSK,KAAK,GAClC;;AAKL,AAAA,cAAc,CAAC;EACb,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,IAAI;EACT,IAAI,EAAE,CAAC;EACP,OAAO,E3CwiBmB,IAAI;E2CviB9B,OAAO,EAAE,IAAI;EACb,KAAK,EAAE,IAAI;EACX,SAAS,E3CugBsB,KAAK;E2CtgBpC,OAAO,E3CugBwB,MAAK,C2CvgBP,CAAC;EAC9B,MAAM,E3CugByB,QAAO,C2CvgBT,CAAC,CAAC,CAAC;EAChC,SAAS,E3C6MM,IAAI;E2C5MnB,KAAK,E3C2DqB,OAAO;E2C1DjC,UAAU,EAAE,IAAI;EAChB,UAAU,EAAE,IAAI;EAChB,gBAAgB,E3C4CT,IAAI;E2C3CX,eAAe,EAAE,WAAW;EAC5B,MAAM,E3CqHO,GAAG,C2CrHe,KAAK,C3C2C7B,mBAAI;EyB3FT,aAAa,EzB4TQ,OAAM,G2CzQ9B;;AAGD,AAAA,iBAAiB,CAAC;EtBrDhB,MAAM,EAAE,GAAG;EACX,MAAM,EAAE,MAAe,CAAC,CAAC;EACzB,QAAQ,EAAE,MAAM;EAChB,gBAAgB,ErBqGU,OAAO,G2CjDlC;;AAKD,AAAA,cAAc,CAAC;EACb,OAAO,EAAE,KAAK;EACd,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,GAAG,C3CggBmB,MAAM;E2C/frC,KAAK,EAAE,IAAI;EACX,WAAW,E3C0LQ,MAAM;E2CzLzB,KAAK,E3CmCqB,OAAO;E2ClCjC,UAAU,EAAE,OAAO;EACnB,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,IAAI;EAChB,MAAM,EAAE,CAAC,GAyBV;EAnCD,AxC7CI,cwC6CU,AxC7C5D,MAAyD,EwC6CX,AxC5CI,cwC4CU,AxC5C5D,MAAyD,CAAC;IwCyDR,KAAK,E3C8ewB,OAAsB;I2C7enD,eAAe,EAAE,IAAI;IACrB,gBAAgB,E3C8BQ,OAAO,GGvF9B;EwC0CL,AAkBE,cAlBY,AAkBZ,OAAQ,EAlBV,AAmBE,cAnBY,AAmBZ,OAAQ,CAAC;IACP,KAAK,E3CSA,IAAI;I2CRT,eAAe,EAAE,IAAI;IACrB,gBAAgB,E7C3Ee,OAAO,G6C4EvC;EAvBH,AAyBE,cAzBY,AAyBZ,SAAU,EAzBZ,AA0BE,cA1BY,AA0BZ,SAAU,CAAC;IACT,KAAK,E3CgBmB,OAAO;I2Cf/B,MAAM,E3CmXuB,WAAW;I2ClXxC,gBAAgB,EAAE,WAAW,GAK9B;;AAIH,AAEI,KAFC,GAED,cAAc,CAAC;EACf,OAAO,EAAE,KAAK,GACf;;AAJH,AAOI,KAPC,GAOD,CAAC,CAAC;EACF,OAAO,EAAE,CAAC,GACX;;AAOH,AAAA,oBAAoB,CAAC;EACnB,KAAK,EAAE,CAAC;EACR,IAAI,EAAE,IAAI,GACX;;AAED,AAAA,mBAAmB,CAAC;EAClB,KAAK,EAAE,IAAI;EACX,IAAI,EAAE,CAAC,GACR;;AAGD,AAAA,gBAAgB,CAAC;EACf,OAAO,EAAE,KAAK;EACd,OAAO,E3C+awB,MAAK,CAiBL,MAAM;E2C/brC,aAAa,EAAE,CAAC;EAChB,SAAS,E3CuHM,QAAO;E2CtHtB,KAAK,E3C3BqB,OAAO;E2C4BjC,WAAW,EAAE,MAAM,GACpB;;AAGD,AAAA,kBAAkB,CAAC;EACjB,QAAQ,EAAE,KAAK;EACf,GAAG,EAAE,CAAC;EACN,KAAK,EAAE,CAAC;EACR,MAAM,EAAE,CAAC;EACT,IAAI,EAAE,CAAC;EACP,OAAO,E3C4bmB,GAAG,G2C3b9B;;AAMD,AAEE,OAFK,CAEL,cAAc,CAAC;EACb,GAAG,EAAE,IAAI;EACT,MAAM,EAAE,IAAI;EACZ,aAAa,E3CsZgB,QAAO,G2CrZrC;;AC5JH,AAAA,UAAU;AACV,AAAA,mBAAmB,CAAC;EAClB,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,WAAW;EACpB,cAAc,EAAE,MAAM,GAyBvB;EA7BD,AAMI,UANM,GAMN,IAAI;EALR,AAKI,mBALe,GAKf,IAAI,CAAC;IACL,QAAQ,EAAE,QAAQ;IAClB,IAAI,EAAE,QAAQ,GAYf;IApBH,AAMI,UANM,GAMN,IAAI,AzCCzB,MAA4B;IyCNX,AAKI,mBALe,GAKf,IAAI,AzCCzB,MAA4B,CAAC;MyCMN,OAAO,EAAE,CAAC,GzCNS;IyCPzB,AAMI,UANM,GAMN,IAAI,AASL,MAAQ,EAfX,AAMI,UANM,GAMN,IAAI,AAUL,OAAS,EAhBZ,AAMI,UANM,GAMN,IAAI,AAWL,OAAS;IAhBZ,AAKI,mBALe,GAKf,IAAI,AASL,MAAQ;IAdX,AAKI,mBALe,GAKf,IAAI,AAUL,OAAS;IAfZ,AAKI,mBALe,GAKf,IAAI,AAWL,OAAS,CAAC;MACP,OAAO,EAAE,CAAC,GACX;EAnBL,AAuBS,UAvBC,CAuBR,IAAI,GAAG,IAAI;EAvBb,AAwBS,UAxBC,CAwBR,IAAI,GAAG,UAAU;EAxBnB,AAyBe,UAzBL,CAyBR,UAAU,GAAG,IAAI;EAzBnB,AA0Be,UA1BL,CA0BR,UAAU,GAAG,UAAU;EAzBzB,AAsBS,mBAtBU,CAsBjB,IAAI,GAAG,IAAI;EAtBb,AAuBS,mBAvBU,CAuBjB,IAAI,GAAG,UAAU;EAvBnB,AAwBe,mBAxBI,CAwBjB,UAAU,GAAG,IAAI;EAxBnB,AAyBe,mBAzBI,CAyBjB,UAAU,GAAG,UAAU,CAAC;IACtB,WAAW,E5C2IA,IAAG,G4C1If;;AAIH,AAAA,YAAY,CAAC;EACX,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,UAAU,GAK5B;EAPD,AAIE,YAJU,CAIV,YAAY,CAAC;IACX,KAAK,EAAE,IAAI,GACZ;;AAGH,AAAa,UAAH,GAAG,IAAI,AAAA,IAAK,CAAA,AAAA,YAAY,CAAC,IAAK,CAAA,AAAA,WAAW,CAAC,IAAK,CAAA,AAAA,gBAAgB,EAAE;EACzE,aAAa,EAAE,CAAC,GACjB;;AAGD,AAAa,UAAH,GAAG,IAAI,AAAA,YAAY,CAAC;EAC5B,WAAW,EAAE,CAAC,GAKf;EAND,AAAa,UAAH,GAAG,IAAI,AAAA,YAAY,AAG3B,IAAM,CAAA,AAAA,WAAW,CAAC,IAAK,CAAA,AAAA,gBAAgB,EAAE;InBnCvC,0BAA0B,EmBoCG,CAAC;InBnC9B,uBAAuB,EmBmCM,CAAC,GAC/B;;AAGH,AAAa,UAAH,GAAG,IAAI,AAAA,WAAW,AAAA,IAAK,CAAA,AAAA,YAAY;AAC7C,AAAa,UAAH,GAAG,gBAAgB,AAAA,IAAK,CAAA,AAAA,YAAY,EAAE;EnB3B5C,yBAAyB,EmB4BC,CAAC;EnB3B3B,sBAAsB,EmB2BI,CAAC,GAC9B;;AAGD,AAAa,UAAH,GAAG,UAAU,CAAC;EACtB,KAAK,EAAE,IAAI,GACZ;;AACD,AAA6D,UAAnD,GAAG,UAAU,AAAA,IAAK,CAAA,AAAA,YAAY,CAAC,IAAK,CAAA,AAAA,WAAW,IAAI,IAAI,CAAC;EAChE,aAAa,EAAE,CAAC,GACjB;;AACD,AACI,UADM,GAAG,UAAU,AAAA,YAAY,AAAA,IAAK,CAAA,AAAA,WAAW,IAC/C,IAAI,AAAA,WAAW;AADnB,AAEI,UAFM,GAAG,UAAU,AAAA,YAAY,AAAA,IAAK,CAAA,AAAA,WAAW,IAE/C,gBAAgB,CAAC;EnBtDjB,0BAA0B,EmBuDG,CAAC;EnBtD9B,uBAAuB,EmBsDM,CAAC,GAC/B;;AAEH,AAAuD,UAA7C,GAAG,UAAU,AAAA,WAAW,AAAA,IAAK,CAAA,AAAA,YAAY,IAAI,IAAI,AAAA,YAAY,CAAC;EnB5CpE,yBAAyB,EmB6CC,CAAC;EnB5C3B,sBAAsB,EmB4CI,CAAC,GAC9B;;AAGD,AAAW,UAAD,CAAC,gBAAgB,AAAA,OAAO;AAClC,AAAgB,UAAN,AAAA,KAAK,CAAC,gBAAgB,CAAC;EAC/B,OAAO,EAAE,CAAC,GACX;;AAeD,AAAO,IAAH,GAAG,sBAAsB,CAAC;EAC5B,aAAa,EAAE,OAAoB;EACnC,YAAY,EAAE,OAAoB,GAKnC;EAPD,AAAO,IAAH,GAAG,sBAAsB,AAI3B,OAAQ,CAAC;IACP,WAAW,EAAE,CAAC,GACf;;AAGH,AAAU,OAAH,GAAG,sBAAsB,EAjBhC,AAiBU,aAjBG,GAAG,IAAI,GAiBV,sBAAsB,CAAC;EAC/B,aAAa,EAAE,QAAuB;EACtC,YAAY,EAAE,QAAuB,GACtC;;AAED,AAAU,OAAH,GAAG,sBAAsB,EArBhC,AAqBU,aArBG,GAAG,IAAI,GAqBV,sBAAsB,CAAC;EAC/B,aAAa,EAAE,QAAuB;EACtC,YAAY,EAAE,QAAuB,GACtC;;AAmBD,AAAA,mBAAmB,CAAC;EAClB,OAAO,EAAE,WAAW;EACpB,cAAc,EAAE,MAAM;EACtB,WAAW,EAAE,UAAU;EACvB,eAAe,EAAE,MAAM,GAcxB;EAlBD,AAME,mBANiB,CAMjB,IAAI;EANN,AAOE,mBAPiB,CAOjB,UAAU,CAAC;IACT,KAAK,EAAE,IAAI,GACZ;EATH,AAWW,mBAXQ,GAWf,IAAI,GAAG,IAAI;EAXf,AAYW,mBAZQ,GAYf,IAAI,GAAG,UAAU;EAZrB,AAaiB,mBAbE,GAaf,UAAU,GAAG,IAAI;EAbrB,AAciB,mBAdE,GAcf,UAAU,GAAG,UAAU,CAAC;IACxB,UAAU,E5CoBC,IAAG;I4CnBd,WAAW,EAAE,CAAC,GACf;;AAGH,AAAsB,mBAAH,GAAG,IAAI,AACxB,IAAM,CAAA,AAAA,YAAY,CAAC,IAAK,CAAA,AAAA,WAAW,EAAE;EACnC,aAAa,EAAE,CAAC,GACjB;;AAHH,AAAsB,mBAAH,GAAG,IAAI,AAIxB,YAAa,AAAA,IAAK,CAAA,AAAA,WAAW,EAAE;EnBtI7B,0BAA0B,EmBuII,CAAC;EnBtI/B,yBAAyB,EmBsIK,CAAC,GAChC;;AANH,AAAsB,mBAAH,GAAG,IAAI,AAOxB,WAAY,AAAA,IAAK,CAAA,AAAA,YAAY,EAAE;EnBvJ7B,uBAAuB,EmBwJI,CAAC;EnBvJ5B,sBAAsB,EmBuJK,CAAC,GAC7B;;AAEH,AAAsE,mBAAnD,GAAG,UAAU,AAAA,IAAK,CAAA,AAAA,YAAY,CAAC,IAAK,CAAA,AAAA,WAAW,IAAI,IAAI,CAAC;EACzE,aAAa,EAAE,CAAC,GACjB;;AACD,AACI,mBADe,GAAG,UAAU,AAAA,YAAY,AAAA,IAAK,CAAA,AAAA,WAAW,IACxD,IAAI,AAAA,WAAW;AADnB,AAEI,mBAFe,GAAG,UAAU,AAAA,YAAY,AAAA,IAAK,CAAA,AAAA,WAAW,IAExD,gBAAgB,CAAC;EnBlJjB,0BAA0B,EmBmJI,CAAC;EnBlJ/B,yBAAyB,EmBkJK,CAAC,GAChC;;AAEH,AAAgE,mBAA7C,GAAG,UAAU,AAAA,WAAW,AAAA,IAAK,CAAA,AAAA,YAAY,IAAI,IAAI,AAAA,YAAY,CAAC;EnBpK7E,uBAAuB,EmBqKE,CAAC;EnBpK1B,sBAAsB,EmBoKG,CAAC,GAC7B;;CAeD,AAAA,AAGI,WAHH,CAAY,SAAS,AAArB,IACG,IAAI,CAEJ,KAAK,CAAA,AAAA,IAAC,CAAK,OAAO,AAAZ;CAHV,AAAA,AAII,WAJH,CAAY,SAAS,AAArB,IACG,IAAI,CAGJ,KAAK,CAAA,AAAA,IAAC,CAAK,UAAU,AAAf;CAJV,AAAA,AAGI,WAHH,CAAY,SAAS,AAArB,IAEG,UAAU,GAAG,IAAI,CACjB,KAAK,CAAA,AAAA,IAAC,CAAK,OAAO,AAAZ;CAHV,AAAA,AAII,WAJH,CAAY,SAAS,AAArB,IAEG,UAAU,GAAG,IAAI,CAEjB,KAAK,CAAA,AAAA,IAAC,CAAK,UAAU,AAAf,EAAiB;EACrB,QAAQ,EAAE,QAAQ;EAClB,IAAI,EAAE,gBAAa;EACnB,cAAc,EAAE,IAAI,GACrB;;ACnML,AAAA,YAAY,CAAC;EACX,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,IAAI;EACb,KAAK,EAAE,IAAI,GAkBZ;EArBD,AAKE,YALU,CAKV,aAAa,CAAC;IAGZ,QAAQ,EAAE,QAAQ;IAClB,OAAO,EAAE,CAAC;IACV,IAAI,EAAE,QAAQ;IAGd,KAAK,EAAE,EAAE;IACT,aAAa,EAAE,CAAC,GAMjB;IApBH,AAKE,YALU,CAKV,aAAa,A1C4Cd,MAAU,E0CjDX,AAKE,YALU,CAKV,aAAa,A1C6Cd,OAAW,E0ClDZ,AAKE,YALU,CAKV,aAAa,A1C8Cd,MAAU,CAAC;M0CjCN,OAAO,EAAE,CAAC,G1CmCX;;A0C9BL,AAAA,kBAAkB;AAClB,AAAA,gBAAgB;AAChB,AAAa,YAAD,CAAC,aAAa,CAAC;EAEzB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,eAAe,EAAE,MAAM,GAKxB;EAXD,AAQE,kBARgB,AAQlB,IAAQ,CAAA,AAAA,YAAY,CAAC,IAAK,CAAA,AAAA,WAAW;EAPrC,AAOE,gBAPc,AAOhB,IAAQ,CAAA,AAAA,YAAY,CAAC,IAAK,CAAA,AAAA,WAAW;EANrC,AAAa,YAAD,CAAC,aAAa,AAM1B,IAAQ,CAAA,AAAA,YAAY,CAAC,IAAK,CAAA,AAAA,WAAW,EAAE;IpB/BnC,aAAa,EoBgCU,CAAC,GACzB;;AAGH,AAAA,kBAAkB;AAClB,AAAA,gBAAgB,CAAC;EACf,WAAW,EAAE,MAAM;EACnB,cAAc,EAAE,MAAM,GACvB;;AAwBD,AAAA,kBAAkB,CAAC;EACjB,OAAO,E7C0VwB,MAAK,CADL,OAAM;E6CxVrC,aAAa,EAAE,CAAC;EAChB,SAAS,E7CoLM,IAAI;E6CnLnB,WAAW,E7CwLQ,MAAM;E6CvLzB,WAAW,E7CuVoB,IAAI;E6CtVnC,KAAK,E7CiCqB,OAAO;E6ChCjC,UAAU,EAAE,MAAM;EAClB,gBAAgB,E7CiCU,OAAO;E6ChCjC,MAAM,E7C4FO,GAAG,C6C5FgB,KAAK,C7CkB9B,mBAAI;EyB3FT,aAAa,EzB4TQ,OAAM,G6C7N9B;EA/BD,AAaE,kBAbgB,AAahB,gBAAiB;EAvBnB,AAUA,eAVe,GAUf,kBAAkB;EATlB,AASA,eATe,GAAG,gBAAgB,GASlC,kBAAkB,AATmB,IAAI,CAsBrB;IAChB,OAAO,E7CoWsB,OAAM,CADN,MAAK;I6ClWlC,SAAS,E7C0KI,QAAO;IyBzPpB,aAAa,EzB8TQ,MAAK,G6C7O3B;EAjBH,AAkBE,kBAlBgB,AAkBhB,gBAAiB;EAjCnB,AAeA,eAfe,GAef,kBAAkB;EAdlB,AAcA,eAde,GAAG,gBAAgB,GAclC,kBAAkB,AAdmB,IAAI,CAgCrB;IAChB,OAAO,E7CkWsB,OAAM,CADN,MAAM;I6ChWnC,SAAS,E7CoKI,OAAO;IyBxPpB,aAAa,EzB6TQ,MAAK,G6CvO3B;EAtBH,AA0BE,kBA1BgB,CA0BhB,KAAK,CAAA,AAAA,IAAC,CAAK,OAAO,AAAZ;EA1BR,AA2BE,kBA3BgB,CA2BhB,KAAK,CAAA,AAAA,IAAC,CAAK,UAAU,AAAf,EAAiB;IACrB,UAAU,EAAE,CAAC,GACd;;AASH,AAAa,YAAD,CAAC,aAAa,AAAA,IAAK,CAAA,AAAA,WAAW;AAC1C,AAAA,kBAAkB,AAAA,IAAK,CAAA,AAAA,WAAW;AAClC,AAAoC,gBAApB,AAAA,IAAK,CAAA,AAAA,WAAW,IAAI,IAAI;AACxC,AAAiD,gBAAjC,AAAA,IAAK,CAAA,AAAA,WAAW,IAAI,UAAU,GAAG,IAAI;AACrD,AAAoC,gBAApB,AAAA,IAAK,CAAA,AAAA,WAAW,IAAI,gBAAgB;AACpD,AAAqC,gBAArB,AAAA,IAAK,CAAA,AAAA,YAAY,IAAI,IAAI,AAAA,IAAK,CAAA,AAAA,WAAW,CAAC,IAAK,CAAA,AAAA,gBAAgB;AAC/E,AAAmE,gBAAnD,AAAA,IAAK,CAAA,AAAA,YAAY,IAAI,UAAU,AAAA,IAAK,CAAA,AAAA,WAAW,IAAI,IAAI,CAAC;EpB/FpE,0BAA0B,EoBgGC,CAAC;EpB/F5B,uBAAuB,EoB+FI,CAAC,GAC/B;;AACD,AAAA,kBAAkB,AAAA,IAAK,CAAA,AAAA,WAAW,EAAE;EAClC,YAAY,EAAE,CAAC,GAChB;;AACD,AAAa,YAAD,CAAC,aAAa,AAAA,IAAK,CAAA,AAAA,YAAY;AAC3C,AAAA,kBAAkB,AAAA,IAAK,CAAA,AAAA,YAAY;AACnC,AAAqC,gBAArB,AAAA,IAAK,CAAA,AAAA,YAAY,IAAI,IAAI;AACzC,AAAkD,gBAAlC,AAAA,IAAK,CAAA,AAAA,YAAY,IAAI,UAAU,GAAG,IAAI;AACtD,AAAqC,gBAArB,AAAA,IAAK,CAAA,AAAA,YAAY,IAAI,gBAAgB;AACrD,AAAoC,gBAApB,AAAA,IAAK,CAAA,AAAA,WAAW,IAAI,IAAI,AAAA,IAAK,CAAA,AAAA,YAAY;AACzD,AAAmE,gBAAnD,AAAA,IAAK,CAAA,AAAA,WAAW,IAAI,UAAU,AAAA,IAAK,CAAA,AAAA,YAAY,IAAI,IAAI,CAAC;EpB7FpE,yBAAyB,EoB8FC,CAAC;EpB7F3B,sBAAsB,EoB6FI,CAAC,GAC9B;;AACD,AAAgB,aAAH,GAAG,kBAAkB,AAAA,IAAK,CAAA,AAAA,YAAY,EAAE;EACnD,WAAW,EAAE,CAAC,GACf;;AAMD,AAAA,gBAAgB,CAAC;EACf,QAAQ,EAAE,QAAQ;EAGlB,SAAS,EAAE,CAAC;EACZ,WAAW,EAAE,MAAM,GAqCpB;EA1CD,AASI,gBATY,GASZ,IAAI,CAAC;IACL,QAAQ,EAAE,QAAQ;IAElB,IAAI,EAAE,CAAC,GAUR;IAtBH,AAcM,gBAdU,GASZ,IAAI,GAKF,IAAI,CAAC;MACL,WAAW,E7CmBF,IAAG,G6ClBb;IAhBL,AASI,gBATY,GASZ,IAAI,A1C3FP,MAAU,E0CkFX,AASI,gBATY,GASZ,IAAI,A1C1FP,OAAW,E0CiFZ,AASI,gBATY,GASZ,IAAI,A1CzFP,MAAU,CAAC;M0CoGN,OAAO,EAAE,CAAC,G1ClGX;E0C8EL,AA0BM,gBA1BU,AAyBd,IAAM,CAAA,AAAA,WAAW,IACb,IAAI;EA1BV,AA2BM,gBA3BU,AAyBd,IAAM,CAAA,AAAA,WAAW,IAEb,UAAU,CAAC;IACX,YAAY,E7CMH,IAAG,G6CLb;EA7BL,AAgCM,gBAhCU,AA+Bd,IAAM,CAAA,AAAA,YAAY,IACd,IAAI;EAhCV,AAiCM,gBAjCU,AA+Bd,IAAM,CAAA,AAAA,YAAY,IAEd,UAAU,CAAC;IACX,OAAO,EAAE,CAAC;IACV,WAAW,E7CDF,IAAG,G6CMb;IAxCL,AAgCM,gBAhCU,AA+Bd,IAAM,CAAA,AAAA,YAAY,IACd,IAAI,A1ClHT,MAAU,E0CkFX,AAgCM,gBAhCU,AA+Bd,IAAM,CAAA,AAAA,YAAY,IACd,IAAI,A1CjHT,OAAW,E0CiFZ,AAgCM,gBAhCU,AA+Bd,IAAM,CAAA,AAAA,YAAY,IACd,IAAI,A1ChHT,MAAU;I0CgFX,AAiCM,gBAjCU,AA+Bd,IAAM,CAAA,AAAA,YAAY,IAEd,UAAU,A1CnHf,MAAU;I0CkFX,AAiCM,gBAjCU,AA+Bd,IAAM,CAAA,AAAA,YAAY,IAEd,UAAU,A1ClHf,OAAW;I0CiFZ,AAiCM,gBAjCU,AA+Bd,IAAM,CAAA,AAAA,YAAY,IAEd,UAAU,A1CjHf,MAAU,CAAC;M0CsHJ,OAAO,EAAE,CAAC,G1CpHb;;A2C9CL,AAAA,eAAe,CAAC;EACd,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,WAAW;EACpB,UAAU,EAAE,MAA0B;EACtC,YAAY,E9CmcY,MAAM;E8Clc9B,YAAY,E9CmcY,IAAI;E8Clc5B,MAAM,EAAE,OAAO,GAChB;;AAED,AAAA,qBAAqB,CAAC;EACpB,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,EAAE;EACX,OAAO,EAAE,CAAC,GA8BX;EAjCD,AAKc,qBALO,AAKnB,QAAS,GAAG,yBAAyB,CAAC;IACpC,KAAK,E9CoEA,IAAI;I8CnET,gBAAgB,EhDfe,OAAO,GgDiBvC;EATH,AAWY,qBAXS,AAWnB,MAAO,GAAG,yBAAyB,CAAC;IAElC,UAAU,E9Cmc8B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAtY5C,IAAI,EAsYmD,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CFxdtC,OAAO,GgDsBvC;EAdH,AAgBa,qBAhBQ,AAgBnB,OAAQ,GAAG,yBAAyB,CAAC;IACnC,KAAK,E9CyDA,IAAI;I8CxDT,gBAAgB,E9CicyB,OAA4B,G8C/btE;EApBH,AAuBM,qBAvBe,AAsBnB,SAAU,GACN,yBAAyB,CAAC;IAC1B,MAAM,E9CoaqB,WAAW;I8CnatC,gBAAgB,E9CgEM,OAAO,G8C/D9B;EA1BL,AA4BM,qBA5Be,AAsBnB,SAAU,GAMN,2BAA2B,CAAC;IAC5B,KAAK,E9C2DiB,OAAO;I8C1D7B,MAAM,E9C8ZqB,WAAW,G8C7ZvC;;AAQL,AAAA,yBAAyB,CAAC;EACxB,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,OAA0D;EAC/D,IAAI,EAAE,CAAC;EACP,OAAO,EAAE,KAAK;EACd,KAAK,E9CsZ+B,IAAI;E8CrZxC,MAAM,E9CqZ8B,IAAI;E8CpZxC,cAAc,EAAE,IAAI;EACpB,WAAW,EAAE,IAAI;EACjB,gBAAgB,E9CoZoB,IAAI;E8CnZxC,iBAAiB,EAAE,SAAS;EAC5B,mBAAmB,EAAE,aAAa;EAClC,eAAe,E9CkZqB,GAAG,CAAC,GAAG,G8ChZ5C;;AAMD,AACE,gBADc,CACd,yBAAyB,CAAC;ErB5ExB,aAAa,EzB4TQ,OAAM,G8C9O5B;;AAHH,AAKkC,gBALlB,CAKd,qBAAqB,AAAA,QAAQ,GAAG,yBAAyB,CAAC;EACxD,gBAAgB,E9ChBR,wMAA+H,G8CiBxI;;AAPH,AASwC,gBATxB,CASd,qBAAqB,AAAA,cAAc,GAAG,yBAAyB,CAAC;EAC9D,gBAAgB,EhD7Ee,OAAO;EgD8EtC,gBAAgB,E9CrBR,qJAA+H,G8CuBxI;;AAOH,AACE,aADW,CACX,yBAAyB,CAAC;EACxB,aAAa,E9C6YK,GAAG,G8C5YtB;;AAHH,AAKkC,aALrB,CAKX,qBAAqB,AAAA,QAAQ,GAAG,yBAAyB,CAAC;EACxD,gBAAgB,E9CpCR,kJAA+H,G8CqCxI;;AASH,AAAA,wBAAwB,CAAC;EACvB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM,GASvB;EAXD,AAIE,wBAJsB,CAItB,eAAe,CAAC;IACd,aAAa,E9C4VS,OAAM,G8CvV7B;IAVH,AAOM,wBAPkB,CAItB,eAAe,GAGX,eAAe,CAAC;MAChB,WAAW,EAAE,CAAC,GACf;;AAWL,AAAA,cAAc,CAAC;EACb,OAAO,EAAE,YAAY;EACrB,SAAS,EAAE,IAAI;EAEf,MAAM,EAAE,mBAAgD;EACxD,OAAO,E9C0W0B,QAAO,C8C1WN,OAA6D,C9C0W9D,QAAO,CADP,OAAM;E8CxWvC,WAAW,E9CmRoB,IAAI;E8ClRnC,KAAK,E9CnCqB,OAAO;E8CoCjC,cAAc,EAAE,MAAM;EACtB,UAAU,EhDzIuB,OAAO,CE8D9B,mKAA+H,C8C2ElF,SAAS,CAAC,KAAK,C9CqWrC,OAAM,C8CrWyD,MAAM;EACtG,eAAe,E9C4Wa,GAAG,CAAC,IAAI;E8C3WpC,MAAM,E9CuBO,GAAG,C8CvBoB,KAAK,C9CnDlC,mBAAI;EyB3FT,aAAa,EzB4TQ,OAAM;E8C3K7B,eAAe,EAAE,IAAI;EACrB,kBAAkB,EAAE,IAAI,GA4BzB;EA3CD,AAiBE,cAjBY,AAiBZ,MAAO,CAAC;IACN,YAAY,E9C2WmB,OAA4B;I8C1W3D,OAAO,EAAE,IAAI,GAYd;IA/BH,AAsBI,cAtBU,AAiBZ,MAAO,AAKL,WAAY,CAAC;MAMX,KAAK,E9CxDiB,OAAO;M8CyD7B,gBAAgB,E9CtEb,IAAI,G8CuER;EA9BL,AAiCE,cAjCY,AAiCZ,SAAU,CAAC;IACT,KAAK,E9C7DmB,OAAO;I8C8D/B,MAAM,E9CsSuB,WAAW;I8CrSxC,gBAAgB,E9C9DQ,OAAO,G8C+DhC;EArCH,AAwCE,cAxCY,AAwCZ,YAAa,CAAC;IACZ,OAAO,EAAE,CAAC,GACX;;AAGH,AAAA,iBAAiB,CAAC;EAChB,WAAW,E9CiUsB,QAAO;E8ChUxC,cAAc,E9CgUmB,QAAO;E8C/TxC,SAAS,E9CiVmB,GAAG,G8C3UhC;;AAOD,AAAA,YAAY,CAAC;EACX,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,YAAY;EACrB,SAAS,EAAE,IAAI;EACf,MAAM,E9CkUuB,MAAM;E8CjUnC,aAAa,EAAE,CAAC;EAChB,MAAM,EAAE,OAAO,GAChB;;AAED,AAAA,kBAAkB,CAAC;EACjB,SAAS,E9C6ToB,KAAK;E8C5TlC,SAAS,EAAE,IAAI;EACf,MAAM,E9C0TuB,MAAM;E8CzTnC,MAAM,EAAE,CAAC;EACT,MAAM,EAAE,gBAAkB;EAC1B,OAAO,EAAE,CAAC,GAKX;;AAED,AAAA,oBAAoB,CAAC;EACnB,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,CAAC;EACN,KAAK,EAAE,CAAC;EACR,IAAI,EAAE,CAAC;EACP,OAAO,EAAE,CAAC;EACV,MAAM,E9C0SuB,MAAM;E8CzSnC,OAAO,E9C6SmB,MAAK,CACL,IAAI;E8C7S9B,WAAW,E9C8Se,GAAG;E8C7S7B,KAAK,E9CxHqB,OAAO;E8CyHjC,cAAc,EAAE,IAAI;EACpB,WAAW,EAAE,IAAI;EACjB,gBAAgB,E9CxIT,IAAI;E8CyIX,MAAM,E9C9DO,GAAG,C8C8DkB,KAAK,C9CxIhC,mBAAI;EyB3FT,aAAa,EzB4TQ,OAAM,G8C1D9B;EA5CD,AAkBI,oBAlBgB,AAkBhB,KAAO,CAAA,AAAA,EAAE,CAAC,OAAO,CAAO;IACtB,OAAO,E9C8SL,gBAAgB,G8C7SnB;EApBL,AAuBE,oBAvBkB,AAuBlB,QAAS,CAAC;IACR,QAAQ,EAAE,QAAQ;IAClB,GAAG,E9C1EQ,IAAG;I8C2Ed,KAAK,E9C3EM,IAAG;I8C4Ed,MAAM,E9C5EK,IAAG;I8C6Ed,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,KAAK;IACd,MAAM,E9CkRqB,MAAM;I8CjRjC,OAAO,E9CqRiB,MAAK,CACL,IAAI;I8CrR5B,WAAW,E9CsRa,GAAG;I8CrR3B,KAAK,E9ChJmB,OAAO;I8CiJ/B,gBAAgB,E9C/IQ,OAAO;I8CgJ/B,MAAM,E9CpFK,GAAG,C8CoFoB,KAAK,C9C9JlC,mBAAI;IyB3FT,aAAa,EqB0PU,CAAC,C9CkEH,OAAM,CAAN,OAAM,C8ClEoD,CAAC,GACjF;EArCH,AAwCI,oBAxCgB,AAwChB,KAAO,CAAA,AAAA,EAAE,CAAC,QAAQ,CAAO;IACvB,OAAO,E9C2RL,QAAQ,G8C1RX;;AC/PL,AAAA,IAAI,CAAC;EACH,OAAO,EAAE,IAAI;EACb,YAAY,EAAE,CAAC;EACf,aAAa,EAAE,CAAC;EAChB,UAAU,EAAE,IAAI,GACjB;;AAED,AAAA,SAAS,CAAC;EACR,OAAO,EAAE,KAAK;EACd,OAAO,E/C0mBuB,KAAI,CAAC,GAAG,G+C/lBvC;EAbD,A5CQI,S4CRK,A5CQvD,MAAyD,E4CRX,A5CSI,S4CTK,A5CSvD,MAAyD,CAAC;I4CJR,eAAe,EAAE,IAAI,G5CMpB;E4CXL,AASE,SATO,AASP,SAAU,CAAC;IACT,KAAK,E/CsFmB,OAAO;I+CrF/B,MAAM,E/CybuB,WAAW,G+CxbzC;;AAQH,AAAA,SAAS,CAAC;EACR,aAAa,E/CwIA,GAAG,C+CxIsB,KAAK,C/C2lBC,IAAI,G+CzjBjD;EAnCD,AAGE,SAHO,CAGP,SAAS,CAAC;IACR,aAAa,E/CqIF,IAAG,G+CpIf;EALH,AAOE,SAPO,CAOP,SAAS,CAAC;IACR,MAAM,E/CiIK,GAAG,C+CjIiB,KAAK,CAAC,WAAW;ItB9BhD,uBAAuB,EzBsTF,OAAM;IyBrT3B,sBAAsB,EzBqTD,OAAM,G+C5Q5B;IApBH,AAOE,SAPO,CAOP,SAAS,A5CnBzD,MAAyD,E4CYX,AAOE,SAPO,CAOP,SAAS,A5ClBzD,MAAyD,CAAC;M4CuBN,YAAY,E/CiEU,OAAO,CAAP,OAAO,CA+gBW,IAAI,GGrmB7C;I4CSL,AAOE,SAPO,CAOP,SAAS,AAQP,SAAU,CAAC;MACT,KAAK,E/C4DiB,OAAO;M+C3D7B,gBAAgB,EAAE,WAAW;MAC7B,YAAY,EAAE,WAAW,GAC1B;EAnBL,AAsBE,SAtBO,CAsBP,SAAS,AAAA,OAAO;EAtBlB,AAuBiB,SAvBR,CAuBP,SAAS,AAAA,KAAK,CAAC,SAAS,CAAC;IACvB,KAAK,E/CmDmB,OAAO;I+ClD/B,gBAAgB,E/CqCX,IAAI;I+CpCT,YAAY,E/CwkB8B,IAAI,CAAJ,IAAI,CApiBzC,IAAI,G+CnCV;EA3BH,AA6BE,SA7BO,CA6BP,cAAc,CAAC;IAEb,UAAU,E/C0GC,IAAG;IyB/Jd,uBAAuB,EsBuDI,CAAC;ItBtD5B,sBAAsB,EsBsDK,CAAC,GAC7B;;AAQH,AACE,UADQ,CACR,SAAS,CAAC;EtBvER,aAAa,EzB4TQ,OAAM,G+CnP5B;;AAHH,AAKE,UALQ,CAKR,SAAS,AAAA,OAAO;AALlB,AAMiB,UANP,CAMR,SAAS,AAAA,KAAK,CAAC,SAAS,CAAC;EACvB,KAAK,E/CaA,IAAI;E+CZT,MAAM,EAAE,OAAO;EACf,gBAAgB,EjDvEe,OAAO,GiDwEvC;;AAQH,AACE,SADO,CACP,SAAS,CAAC;EACR,IAAI,EAAE,QAAQ;EACd,UAAU,EAAE,MAAM,GACnB;;AAGH,AACE,cADY,CACZ,SAAS,CAAC;EACR,IAAI,EAAE,QAAQ;EACd,UAAU,EAAE,MAAM,GACnB;;AAQH,AACI,YADQ,GACR,SAAS,CAAC;EACV,OAAO,EAAE,IAAI,GACd;;AAHH,AAII,YAJQ,GAIR,OAAO,CAAC;EACR,OAAO,EAAE,KAAK,GACf;;ACpGH,AAAA,OAAO,CAAC;EACN,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,OAAO,EhDwkB2B,MAAa,CAjdtC,IAAI,GgDtHd;;AAOD,AAAA,aAAa,CAAC;EACZ,OAAO,EAAE,YAAY;EACrB,WAAW,EAAE,MAAM;EACnB,cAAc,EAAE,MAAM;EACtB,YAAY,EhD2GH,IAAI;EgD1Gb,SAAS,EhD0NM,OAAO;EgDzNtB,WAAW,EAAE,OAAO;EACpB,WAAW,EAAE,MAAM,GAKpB;EAZD,A7CTI,a6CSS,A7CT3D,MAAyD,E6CSX,A7CRI,a6CQS,A7CR3D,MAAyD,CAAC;I6CkBR,eAAe,EAAE,IAAI,G7ChBpB;;A6CyBL,AAAA,WAAW,CAAC;EACV,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,YAAY,EAAE,CAAC;EACf,aAAa,EAAE,CAAC;EAChB,UAAU,EAAE,IAAI,GAMjB;EAXD,AAOE,WAPS,CAOT,SAAS,CAAC;IACR,aAAa,EAAE,CAAC;IAChB,YAAY,EAAE,CAAC,GAChB;;AAQH,AAAA,YAAY,CAAC;EACX,OAAO,EAAE,YAAY;EACrB,WAAW,EAAK,OAAO;EACvB,cAAc,EAAE,OAAO,GACxB;;AASD,AAAA,eAAe,CAAC;EACd,UAAU,EAAE,UAAU;EACtB,OAAO,EhDihB4B,OAAM,CADN,OAAM;EgD/gBzC,SAAS,EhD0KM,OAAO;EgDzKtB,WAAW,EAAE,CAAC;EACd,UAAU,EAAE,WAAW;EACvB,MAAM,EhDoFO,GAAG,CgDpFM,KAAK,CAAC,WAAW;EvBjFrC,aAAa,EzB4TQ,OAAM,GgDrO9B;EAZD,A7C3DI,e6C2DW,A7C3D7D,MAAyD,E6C2DX,A7C1DI,e6C0DW,A7C1D7D,MAAyD,CAAC;I6CoER,eAAe,EAAE,IAAI,G7ClEpB;;A6CwEL,AAAA,oBAAoB,CAAC;EACnB,OAAO,EAAE,YAAY;EACrB,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,KAAK;EACb,cAAc,EAAE,MAAM;EACtB,OAAO,EAAE,EAAE;EACX,UAAU,EAAE,uBAAuB;EACnC,eAAe,EAAE,SAAS,GAC3B;;AAID,AAAA,oBAAoB,CAAC;EACnB,QAAQ,EAAE,QAAQ;EAClB,IAAI,EhD+BK,IAAI,GgD9Bd;;AACD,AAAA,qBAAqB,CAAC;EACpB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EhD2BI,IAAI,GgD1Bd;;A9C7CG,MAAM,EAAE,SAAS,EAAE,KAAK;E8CiD5B,AAQU,kBARQ,CAOV,WAAW,CACT,cAAc,CAAC;IACb,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,IAAI,GACZ;EAXX,AAcU,kBAdQ,GAcR,UAAU,CAAC;IACX,aAAa,EAAE,CAAC;IAChB,YAAY,EAAE,CAAC,GAChB;;A9C/EL,MAAM,EAAE,SAAS,EAAE,KAAK;E8C8D5B,AAKI,kBALc,CAKH;IAgBP,cAAc,EAAE,GAAG;IACnB,SAAS,EAAE,MAAM;IACjB,WAAW,EAAE,MAAM,GA6BtB;IApDL,AAyBQ,kBAzBU,CAyBV,WAAW,CAAC;MACV,cAAc,EAAE,GAAG,GAMpB;MAhCT,AA4BU,kBA5BQ,CAyBV,WAAW,CAGT,SAAS,CAAC;QACR,aAAa,EAAE,KAAK;QACpB,YAAY,EAAE,KAAK,GACpB;IA/BX,AAmCU,kBAnCQ,GAmCR,UAAU,CAAC;MACX,OAAO,EAAE,IAAI;MACb,SAAS,EAAE,MAAM;MACjB,WAAW,EAAE,MAAM,GACpB;IAvCT,AA0CQ,kBA1CU,CA0CV,gBAAgB,CAAC;MACf,OAAO,EAAE,eAAe;MACxB,KAAK,EAAE,IAAI,GACZ;IA7CT,AAgDQ,kBAhDU,CAgDV,eAAe,CAAC;MACd,OAAO,EAAE,IAAI,GACd;;A9CnGL,MAAM,EAAE,SAAS,EAAE,KAAK;E8CsDxB,AAGM,qBAHF,CAEA,WAAW,CACT,cAAc,CAAC;IACb,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,IAAI,GACZ;EANP,AASM,qBATF,GASE,UAAU,CAAC;IACX,aAAa,EAAE,CAAC;IAChB,YAAY,EAAE,CAAC,GAChB;;A9C/EL,MAAM,EAAE,SAAS,EAAE,KAAK;E8CmExB,AAAA,qBAAI,CAAO;IAgBP,cAAc,EAAE,GAAG;IACnB,SAAS,EAAE,MAAM;IACjB,WAAW,EAAE,MAAM,GA6BtB;IA/CD,AAoBI,qBApBA,CAoBA,WAAW,CAAC;MACV,cAAc,EAAE,GAAG,GAMpB;MA3BL,AAuBM,qBAvBF,CAoBA,WAAW,CAGT,SAAS,CAAC;QACR,aAAa,EAAE,KAAK;QACpB,YAAY,EAAE,KAAK,GACpB;IA1BP,AA8BM,qBA9BF,GA8BE,UAAU,CAAC;MACX,OAAO,EAAE,IAAI;MACb,SAAS,EAAE,MAAM;MACjB,WAAW,EAAE,MAAM,GACpB;IAlCL,AAqCI,qBArCA,CAqCA,gBAAgB,CAAC;MACf,OAAO,EAAE,eAAe;MACxB,KAAK,EAAE,IAAI,GACZ;IAxCL,AA2CI,qBA3CA,CA2CA,eAAe,CAAC;MACd,OAAO,EAAE,IAAI,GACd;;A9CnGL,MAAM,EAAE,SAAS,EAAE,KAAK;E8CsDxB,AAGM,qBAHF,CAEA,WAAW,CACT,cAAc,CAAC;IACb,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,IAAI,GACZ;EANP,AASM,qBATF,GASE,UAAU,CAAC;IACX,aAAa,EAAE,CAAC;IAChB,YAAY,EAAE,CAAC,GAChB;;A9C/EL,MAAM,EAAE,SAAS,EAAE,KAAK;E8CmExB,AAAA,qBAAI,CAAO;IAgBP,cAAc,EAAE,GAAG;IACnB,SAAS,EAAE,MAAM;IACjB,WAAW,EAAE,MAAM,GA6BtB;IA/CD,AAoBI,qBApBA,CAoBA,WAAW,CAAC;MACV,cAAc,EAAE,GAAG,GAMpB;MA3BL,AAuBM,qBAvBF,CAoBA,WAAW,CAGT,SAAS,CAAC;QACR,aAAa,EAAE,KAAK;QACpB,YAAY,EAAE,KAAK,GACpB;IA1BP,AA8BM,qBA9BF,GA8BE,UAAU,CAAC;MACX,OAAO,EAAE,IAAI;MACb,SAAS,EAAE,MAAM;MACjB,WAAW,EAAE,MAAM,GACpB;IAlCL,AAqCI,qBArCA,CAqCA,gBAAgB,CAAC;MACf,OAAO,EAAE,eAAe;MACxB,KAAK,EAAE,IAAI,GACZ;IAxCL,AA2CI,qBA3CA,CA2CA,eAAe,CAAC;MACd,OAAO,EAAE,IAAI,GACd;;A9CnGL,MAAM,EAAE,SAAS,EAAE,MAAM;E8CsDzB,AAGM,qBAHF,CAEA,WAAW,CACT,cAAc,CAAC;IACb,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,IAAI,GACZ;EANP,AASM,qBATF,GASE,UAAU,CAAC;IACX,aAAa,EAAE,CAAC;IAChB,YAAY,EAAE,CAAC,GAChB;;A9C/EL,MAAM,EAAE,SAAS,EAAE,MAAM;E8CmEzB,AAAA,qBAAI,CAAO;IAgBP,cAAc,EAAE,GAAG;IACnB,SAAS,EAAE,MAAM;IACjB,WAAW,EAAE,MAAM,GA6BtB;IA/CD,AAoBI,qBApBA,CAoBA,WAAW,CAAC;MACV,cAAc,EAAE,GAAG,GAMpB;MA3BL,AAuBM,qBAvBF,CAoBA,WAAW,CAGT,SAAS,CAAC;QACR,aAAa,EAAE,KAAK;QACpB,YAAY,EAAE,KAAK,GACpB;IA1BP,AA8BM,qBA9BF,GA8BE,UAAU,CAAC;MACX,OAAO,EAAE,IAAI;MACb,SAAS,EAAE,MAAM;MACjB,WAAW,EAAE,MAAM,GACpB;IAlCL,AAqCI,qBArCA,CAqCA,gBAAgB,CAAC;MACf,OAAO,EAAE,eAAe;MACxB,KAAK,EAAE,IAAI,GACZ;IAxCL,AA2CI,qBA3CA,CA2CA,eAAe,CAAC;MACd,OAAO,EAAE,IAAI,GACd;;AA7CL,AAAA,qBAAI,CAAO;EAgBP,cAAc,EAAE,GAAG;EACnB,SAAS,EAAE,MAAM;EACjB,WAAW,EAAE,MAAM,GA6BtB;EA/CD,AAGM,qBAHF,CAEA,WAAW,CACT,cAAc,CAAC;IACb,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,IAAI,GACZ;EANP,AASM,qBATF,GASE,UAAU,CAAC;IACX,aAAa,EAAE,CAAC;IAChB,YAAY,EAAE,CAAC,GAChB;EAZL,AAoBI,qBApBA,CAoBA,WAAW,CAAC;IACV,cAAc,EAAE,GAAG,GAMpB;IA3BL,AAuBM,qBAvBF,CAoBA,WAAW,CAGT,SAAS,CAAC;MACR,aAAa,EAAE,KAAK;MACpB,YAAY,EAAE,KAAK,GACpB;EA1BP,AA8BM,qBA9BF,GA8BE,UAAU,CAAC;IACX,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,MAAM;IACjB,WAAW,EAAE,MAAM,GACpB;EAlCL,AAqCI,qBArCA,CAqCA,gBAAgB,CAAC;IACf,OAAO,EAAE,eAAe;IACxB,KAAK,EAAE,IAAI,GACZ;EAxCL,AA2CI,qBA3CA,CA2CA,eAAe,CAAC;IACd,OAAO,EAAE,IAAI,GACd;;AAYT,AACE,aADW,CACX,aAAa;AADf,AAEE,aAFW,CAEX,eAAe,CAAC;EACd,KAAK,EhDxFA,kBAAI,GgD6FV;EARH,AACE,aADW,CACX,aAAa,A7CjK7D,MAAyD,E6CgKX,AACE,aADW,CACX,aAAa,A7ChK7D,MAAyD;E6C+JX,AAEE,aAFW,CAEX,eAAe,A7ClK/D,MAAyD;E6CgKX,AAEE,aAFW,CAEX,eAAe,A7CjK/D,MAAyD,CAAC;I6CqKN,KAAK,EhD3FF,kBAAI,GGxER;;A6C6JL,AAWI,aAXS,CAUX,WAAW,CACT,SAAS,CAAC;EACR,KAAK,EhDjGF,kBAAI,GgD0GR;EArBL,AAWI,aAXS,CAUX,WAAW,CACT,SAAS,A7C3K3D,MAAyD,E6CgKX,AAWI,aAXS,CAUX,WAAW,CACT,SAAS,A7C1K3D,MAAyD,CAAC;I6C8KJ,KAAK,EhDpGJ,kBAAI,GGxER;E6C6JL,AAWI,aAXS,CAUX,WAAW,CACT,SAAS,AAOP,SAAU,CAAC;IACT,KAAK,EhDxGJ,kBAAI,GgDyGN;;AApBP,AAuBY,aAvBC,CAUX,WAAW,CAaT,KAAK,GAAG,SAAS;AAvBrB,AAwBc,aAxBD,CAUX,WAAW,CAcT,OAAO,GAAG,SAAS;AAxBvB,AAyBI,aAzBS,CAUX,WAAW,CAeT,SAAS,AAAA,KAAK;AAzBlB,AA0BI,aA1BS,CAUX,WAAW,CAgBT,SAAS,AAAA,OAAO,CAAC;EACf,KAAK,EhDhHF,kBAAI,GgDiHR;;AA5BL,AA+BE,aA/BW,CA+BX,eAAe,CAAC;EACd,YAAY,EhDrHP,kBAAI,GgDsHV;;AAjCH,AAmCE,aAnCW,CAmCX,oBAAoB,CAAC;EACnB,gBAAgB,EhDyZkB,mPAAuP,GgDxZ1R;;AArCH,AAuCE,aAvCW,CAuCX,YAAY,CAAC;EACX,KAAK,EhD7HA,kBAAI,GgD8HV;;AAIH,AACE,eADa,CACb,aAAa;AADf,AAEE,eAFa,CAEb,eAAe,CAAC;EACd,KAAK,EhDtIA,KAAI,GgD2IV;EARH,AACE,eADa,CACb,aAAa,A7C9M7D,MAAyD,E6C6MX,AACE,eADa,CACb,aAAa,A7C7M7D,MAAyD;E6C4MX,AAEE,eAFa,CAEb,eAAe,A7C/M/D,MAAyD;E6C6MX,AAEE,eAFa,CAEb,eAAe,A7C9M/D,MAAyD,CAAC;I6CkNN,KAAK,EhDzIF,KAAI,GGvER;;A6C0ML,AAWI,eAXW,CAUb,WAAW,CACT,SAAS,CAAC;EACR,KAAK,EhD/IF,wBAAI,GgDwJR;EArBL,AAWI,eAXW,CAUb,WAAW,CACT,SAAS,A7CxN3D,MAAyD,E6C6MX,AAWI,eAXW,CAUb,WAAW,CACT,SAAS,A7CvN3D,MAAyD,CAAC;I6C2NJ,KAAK,EhDlJJ,yBAAI,GGvER;E6C0ML,AAWI,eAXW,CAUb,WAAW,CACT,SAAS,AAOP,SAAU,CAAC;IACT,KAAK,EhDtJJ,yBAAI,GgDuJN;;AApBP,AAuBY,eAvBG,CAUb,WAAW,CAaT,KAAK,GAAG,SAAS;AAvBrB,AAwBc,eAxBC,CAUb,WAAW,CAcT,OAAO,GAAG,SAAS;AAxBvB,AAyBI,eAzBW,CAUb,WAAW,CAeT,SAAS,AAAA,KAAK;AAzBlB,AA0BI,eA1BW,CAUb,WAAW,CAgBT,SAAS,AAAA,OAAO,CAAC;EACf,KAAK,EhD9JF,KAAI,GgD+JR;;AA5BL,AA+BE,eA/Ba,CA+Bb,eAAe,CAAC;EACd,YAAY,EhDnKP,wBAAI,GgDoKV;;AAjCH,AAmCE,eAnCa,CAmCb,oBAAoB,CAAC;EACnB,gBAAgB,EhDqWoB,yPAAyP,GgDpW9R;;AArCH,AAuCE,eAvCa,CAuCb,YAAY,CAAC;EACX,KAAK,EhD3KA,wBAAI,GgD4KV;;ACtQH,AAAA,KAAK,CAAC;EACJ,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,gBAAgB,EjDsFT,IAAI;EiDrFX,MAAM,EjD8rBmB,GAAG,CiD9rBD,KAAK,CnDLC,IAAI;E2BAnC,aAAa,EzB4TQ,OAAM,GiDrT9B;;AAED,AAAA,WAAW,CAAC;EAGV,IAAI,EAAE,QAAQ;EACd,OAAO,EjDorBkB,OAAO,GiDnrBjC;;AAED,AAAA,WAAW,CAAC;EACV,aAAa,EjDirBY,OAAM,GiDhrBhC;;AAED,AAAA,cAAc,CAAC;EACb,UAAU,EAAI,SAAkB;EAChC,aAAa,EAAE,CAAC,GACjB;;AAED,AAAA,UAAU,AAAA,WAAW,CAAC;EACpB,aAAa,EAAE,CAAC,GACjB;;AAED,A9CvBI,U8CuBM,A9CvB3B,MAA4B,CAAC;E8CyBR,eAAe,EAAE,IAAI,G9CzBA;;A8CuBzB,AAKI,UALM,GAKN,UAAU,CAAC;EACX,WAAW,EjD8pBY,OAAO,GiD7pB/B;;AAGH,AAEI,KAFC,GACD,WAAW,AAAA,YAAY,CACvB,gBAAgB,AAAA,YAAY,CAAC;ExBnC7B,uBAAuB,EzBsTF,OAAM;EyBrT3B,sBAAsB,EzBqTD,OAAM,GiDjR1B;;AAJL,AAQI,KARC,GAOD,WAAW,AAAA,WAAW,CACtB,gBAAgB,AAAA,WAAW,CAAC;ExB3B5B,0BAA0B,EzBwSL,OAAM;EyBvS3B,yBAAyB,EzBuSJ,OAAM,GiD3Q1B;;AASL,AAAA,YAAY,CAAC;EACX,OAAO,EjDuoBkB,OAAM,CADN,OAAO;EiDroBhC,aAAa,EAAE,CAAC;EAChB,gBAAgB,EjD6CU,OAAO;EiD5CjC,aAAa,EjDqoBY,GAAG,CiDroBM,KAAK,CnD9DN,IAAI,GmDmEtC;EATD,AAME,YANU,AAMV,YAAa,CAAC;IxBhEZ,aAAa,EzBssBU,mBAAoD,CAApD,mBAAoD,CiDroBA,CAAC,CAAC,CAAC,GAC/E;;AAGH,AAAA,YAAY,CAAC;EACX,OAAO,EjD4nBkB,OAAM,CADN,OAAO;EiD1nBhC,gBAAgB,EjDmCU,OAAO;EiDlCjC,UAAU,EjD2nBe,GAAG,CiD3nBG,KAAK,CnDxEH,IAAI,GmD6EtC;EARD,AAKE,YALU,AAKV,WAAY,CAAC;IxB1EX,aAAa,EwB2EU,CAAC,CAAC,CAAC,CjD2nBH,mBAAoD,CAApD,mBAAoD,GiD1nB5E;;AAQH,AAAA,iBAAiB,CAAC;EAChB,YAAY,EAAI,SAAkB;EAClC,aAAa,EjD4mBY,QAAM;EiD3mB/B,WAAW,EAAI,SAAkB;EACjC,aAAa,EAAE,CAAC,GACjB;;AAED,AAAA,kBAAkB,CAAC;EACjB,YAAY,EAAI,SAAkB;EAClC,WAAW,EAAI,SAAkB,GAClC;;AAOD,AAAA,aAAa,CAAC;EhCtGZ,gBAAgB,EnBSiB,OAAO;EmBRxC,YAAY,EnBQqB,OAAO,GmD+FzC;EAFD,AhCnGE,agCmGW,ChCnGX,YAAY;EgCmGd,AhClGE,agCkGW,ChClGX,YAAY,CAAC;IACX,gBAAgB,EAAE,WAAW,GAC9B;;AgCmGH,AAAA,aAAa,CAAC;EhCzGZ,gBAAgB,EnBUiB,OAAO;EmBTxC,YAAY,EnBSqB,OAAO,GmDiGzC;EAFD,AhCtGE,agCsGW,ChCtGX,YAAY;EgCsGd,AhCrGE,agCqGW,ChCrGX,YAAY,CAAC;IACX,gBAAgB,EAAE,WAAW,GAC9B;;AgCsGH,AAAA,UAAU,CAAC;EhC5GT,gBAAgB,EnBWiB,OAAO;EmBVxC,YAAY,EnBUqB,OAAO,GmDmGzC;EAFD,AhCzGE,UgCyGQ,ChCzGR,YAAY;EgCyGd,AhCxGE,UgCwGQ,ChCxGR,YAAY,CAAC;IACX,gBAAgB,EAAE,WAAW,GAC9B;;AgCyGH,AAAA,aAAa,CAAC;EhC/GZ,gBAAgB,EnBYiB,OAAO;EmBXxC,YAAY,EnBWqB,OAAO,GmDqGzC;EAFD,AhC5GE,agC4GW,ChC5GX,YAAY;EgC4Gd,AhC3GE,agC2GW,ChC3GX,YAAY,CAAC;IACX,gBAAgB,EAAE,WAAW,GAC9B;;AgC4GH,AAAA,YAAY,CAAC;EhClHX,gBAAgB,EnBaiB,OAAO;EmBZxC,YAAY,EnBYqB,OAAO,GmDuGzC;EAFD,AhC/GE,YgC+GU,ChC/GV,YAAY;EgC+Gd,AhC9GE,YgC8GU,ChC9GV,YAAY,CAAC;IACX,gBAAgB,EAAE,WAAW,GAC9B;;AgCiHH,AAAA,qBAAqB,CAAC;EhC7GpB,gBAAgB,EAAE,WAAW;EAC7B,YAAY,EnBFqB,OAAO,GmDgHzC;;AACD,AAAA,uBAAuB,CAAC;EhChHtB,gBAAgB,EAAE,WAAW;EAC7B,YAAY,EjByWmB,IAAI,GiDxPpC;;AACD,AAAA,kBAAkB,CAAC;EhCnHjB,gBAAgB,EAAE,WAAW;EAC7B,YAAY,EnBAqB,OAAO,GmDoHzC;;AACD,AAAA,qBAAqB,CAAC;EhCtHpB,gBAAgB,EAAE,WAAW;EAC7B,YAAY,EnBDqB,OAAO,GmDwHzC;;AACD,AAAA,qBAAqB,CAAC;EhCzHpB,gBAAgB,EAAE,WAAW;EAC7B,YAAY,EnBCqB,OAAO,GmDyHzC;;AACD,AAAA,oBAAoB,CAAC;EhC5HnB,gBAAgB,EAAE,WAAW;EAC7B,YAAY,EnBEqB,OAAO,GmD2HzC;;AAMD,AAAA,aAAa,CAAC;EhC3HZ,KAAK,EAAE,yBAAqB,GgC6H7B;EAFD,AhCzHE,agCyHW,ChCzHX,YAAY;EgCyHd,AhCxHE,agCwHW,ChCxHX,YAAY,CAAC;IACX,gBAAgB,EAAE,WAAW;IAC7B,YAAY,EAAE,wBAAoB,GACnC;EgCqHH,AhCpHE,agCoHW,ChCpHX,YAAY;EgCoHd,AhCnHE,agCmHW,ChCnHX,YAAY;EgCmHd,AhClHE,agCkHW,ChClHX,WAAW;EgCkHb,AhCjHE,agCiHW,ChCjHX,gBAAgB,CAAC;IACf,KAAK,EAAE,IAAI,GACZ;EgC+GH,AhC9GE,agC8GW,ChC9GX,UAAU;EgC8GZ,AhC7GE,agC6GW,ChC7GX,UAAU;EgC6GZ,AhC5GE,agC4GW,ChC5GX,cAAc;EgC4GhB,AhC3GmB,agC2GN,ChC3GX,gBAAgB,CAAC,kBAAkB,CAAC;IAClC,KAAK,EAAE,yBAAqB,GAC7B;EgCyGH,AhCxGE,agCwGW,ChCxGX,UAAU,AdrB1D,MAAyD,E8C6HX,AhCxGE,agCwGW,ChCxGX,UAAU,AdpB1D,MAAyD,CAAC;IcsBN,KAAK,EjBmDF,IAAI,GGvER;;A8CkIL,AAAA,gBAAgB,CAAC;EACf,OAAO,EAAE,CAAC;EACV,aAAa,EAAE,CAAC;EAChB,WAAW,EAAE,CAAC,GACf;;AAGD,AAAA,SAAS,CAAC;ExB5JN,aAAa,EzBssBU,mBAAoD,GiDviB9E;;AACD,AAAA,iBAAiB,CAAC;EAChB,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,CAAC;EACN,KAAK,EAAE,CAAC;EACR,MAAM,EAAE,CAAC;EACT,IAAI,EAAE,CAAC;EACP,OAAO,EjDsiBkB,OAAO,GiDriBjC;;AAKD,AAAA,aAAa,CAAC;ExBtKV,uBAAuB,EzBgsBA,mBAAoD;EyB/rB3E,sBAAsB,EzB+rBC,mBAAoD,GiDxhB9E;;AACD,AAAA,gBAAgB,CAAC;ExB3Jb,0BAA0B,EzBkrBH,mBAAoD;EyBjrB3E,yBAAyB,EzBirBF,mBAAoD,GiDrhB9E;;A/C7HG,MAAM,EAAE,SAAS,EAAE,KAAK;E+CmI1B,AAAA,UAAU,CAAC;IACT,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,QAAQ,GAapB;IAfD,AAIE,UAJQ,CAIR,KAAK,CAAC;MACJ,OAAO,EAAE,IAAI;MACb,IAAI,EAAE,KAAK;MACX,cAAc,EAAE,MAAM,GAOvB;MAdH,AAIE,UAJQ,CAIR,KAAK,AAQH,IAAM,CAAA,AAAA,YAAY,EAAE;QAAE,WAAW,EjD2gBX,KAA6B,GiD3gBK;MAZ5D,AAIE,UAJQ,CAIR,KAAK,AASH,IAAM,CAAA,AAAA,WAAW,EAAE;QAAE,YAAY,EjD0gBX,KAA6B,GiD1gBK;;A/ChJ1D,MAAM,EAAE,SAAS,EAAE,KAAK;E+C2J1B,AAAA,WAAW,CAAC;IACV,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,QAAQ,GA2CpB;IA7CD,AAIE,WAJS,CAIT,KAAK,CAAC;MACJ,IAAI,EAAE,KAAK,GAuCZ;MA5CH,AAOM,WAPK,CAIT,KAAK,GAGD,KAAK,CAAC;QACN,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,CAAC,GACf;MAVL,AAIE,WAJS,CAIT,KAAK,AAUD,YAAa,CAAC;QxBhNlB,0BAA0B,EwBiNS,CAAC;QxBhNpC,uBAAuB,EwBgNY,CAAC,GAQ/B;QAvBP,AAiBQ,WAjBG,CAIT,KAAK,AAUD,YAAa,CAGX,aAAa,CAAC;UACZ,uBAAuB,EAAE,CAAC,GAC3B;QAnBT,AAoBQ,WApBG,CAIT,KAAK,AAUD,YAAa,CAMX,gBAAgB,CAAC;UACf,0BAA0B,EAAE,CAAC,GAC9B;MAtBT,AAIE,WAJS,CAIT,KAAK,AAoBD,WAAY,CAAC;QxB5MjB,yBAAyB,EwB6MS,CAAC;QxB5MnC,sBAAsB,EwB4MY,CAAC,GAQ9B;QAjCP,AA2BQ,WA3BG,CAIT,KAAK,AAoBD,WAAY,CAGV,aAAa,CAAC;UACZ,sBAAsB,EAAE,CAAC,GAC1B;QA7BT,AA8BQ,WA9BG,CAIT,KAAK,AAoBD,WAAY,CAMV,gBAAgB,CAAC;UACf,yBAAyB,EAAE,CAAC,GAC7B;MAhCT,AAIE,WAJS,CAIT,KAAK,AA+BD,IAAM,CAAA,AAAA,YAAY,CAAC,IAAK,CAAA,AAAA,WAAW,EAAE;QACnC,aAAa,EAAE,CAAC,GAMjB;QA1CP,AAsCQ,WAtCG,CAIT,KAAK,AA+BD,IAAM,CAAA,AAAA,YAAY,CAAC,IAAK,CAAA,AAAA,WAAW,EAGjC,aAAa;QAtCrB,AAuCQ,WAvCG,CAIT,KAAK,AA+BD,IAAM,CAAA,AAAA,YAAY,CAAC,IAAK,CAAA,AAAA,WAAW,EAIjC,gBAAgB,CAAC;UACf,aAAa,EAAE,CAAC,GACjB;;A/CpMP,MAAM,EAAE,SAAS,EAAE,KAAK;E+CiN1B,AAAA,aAAa,CAAC;IACZ,YAAY,EjD0cY,CAAC;IiDzczB,UAAU,EjD0cc,OAAO,GiDnchC;IATD,AAIE,aAJW,CAIX,KAAK,CAAC;MACJ,OAAO,EAAE,YAAY;MACrB,KAAK,EAAE,IAAI;MACX,aAAa,EjDsbQ,OAAM,GiDrb5B;;ACjRL,AAAA,WAAW,CAAC;EACV,OAAO,ElDy4BuB,OAAM,CACN,IAAI;EkDz4BlC,aAAa,ElD0IJ,IAAI;EkDzIb,UAAU,EAAE,IAAI;EAChB,gBAAgB,ElDyGU,OAAO;EyBzG/B,aAAa,EzB4TQ,OAAM,GkDzT9B;EAPD,AvBCE,WuBDS,AvBCV,OAAS,CAAC;IACP,OAAO,EAAE,KAAK;IACd,OAAO,EAAE,EAAE;IACX,KAAK,EAAE,IAAI,GACZ;;AuBIH,AAAA,gBAAgB,CAAC;EACf,KAAK,EAAE,IAAI,GA2BZ;EA5BD,AAII,gBAJY,GAIZ,gBAAgB,AAAA,QAAQ,CAAC;IACzB,OAAO,EAAE,YAAY;IACrB,aAAa,ElD63Be,MAAK;IkD53BjC,YAAY,ElD43BgB,MAAK;IkD33BjC,KAAK,ElD2FmB,OAAO;IkD1F/B,OAAO,EAAE,GAAwB,GAClC;EAVH,AAkBI,gBAlBY,GAkBZ,gBAAgB,AAAA,MAAM,AAAA,QAAQ,CAAC;IAC/B,eAAe,EAAE,SAAS,GAC3B;EApBH,AAqBI,gBArBY,GAqBZ,gBAAgB,AAAA,MAAM,AAAA,QAAQ,CAAC;IAC/B,eAAe,EAAE,IAAI,GACtB;EAvBH,AAyBE,gBAzBc,AAyBd,OAAQ,CAAC;IACP,KAAK,ElDyEmB,OAAO,GkDxEhC;;ACpCH,AAAA,WAAW,CAAC;EACV,OAAO,EAAE,IAAI;EAEb,YAAY,EAAE,CAAC;EACf,UAAU,EAAE,IAAI;E1BAd,aAAa,EzB4TQ,OAAM,GmD1T9B;;AAED,AAEI,UAFM,AACR,YAAa,CACX,UAAU,CAAC;EACT,WAAW,EAAE,CAAC;E1BoBhB,yBAAyB,EzBiSJ,OAAM;EyBhS3B,sBAAsB,EzBgSD,OAAM,GmDnT1B;;AALL,AAQI,UARM,AAOR,WAAY,CACV,UAAU,CAAC;E1BCX,0BAA0B,EzB+SL,OAAM;EyB9S3B,uBAAuB,EzB8SF,OAAM,GmD9S1B;;AAVL,AAaW,UAbD,AAaR,OAAQ,CAAC,UAAU,CAAC;EAClB,OAAO,EAAE,CAAC;EACV,KAAK,EnDuEA,IAAI;EmDtET,gBAAgB,ErDZe,OAAO;EqDatC,YAAY,ErDbmB,OAAO,GqDcvC;;AAlBH,AAoBa,UApBH,AAoBR,SAAU,CAAC,UAAU,CAAC;EACpB,KAAK,EnD+EmB,OAAO;EmD9E/B,cAAc,EAAE,IAAI;EACpB,MAAM,EnDibuB,WAAW;EmDhbxC,gBAAgB,EnD8DX,IAAI;EmD7DT,YAAY,EnDmoBuB,IAAI,GmDloBxC;;AAGH,AAAA,UAAU,CAAC;EACT,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,KAAK;EACd,OAAO,EnDsmB6B,MAAK,CADL,OAAM;EmDpmB1C,WAAW,EAAE,IAAI;EACjB,WAAW,EnDymByB,IAAI;EmDxmBxC,KAAK,ErD/B4B,OAAO;EqDgCxC,gBAAgB,EnDkDT,IAAI;EmDjDX,MAAM,EnD4HO,GAAG,CmD5HiB,KAAK,CnD2mBD,IAAI,GmDnmB1C;EAhBD,AhDjBI,UgDiBM,AhDjBxD,MAAyD,EgDiBX,AhDhBI,UgDgBM,AhDhBxD,MAAyD,CAAC;IgD2BR,KAAK,EnDmJe,OAAwB;ImDlJ5C,eAAe,EAAE,IAAI;IACrB,gBAAgB,EnD2DQ,OAAO;ImD1D/B,YAAY,EnDymBuB,IAAI,GGroBtC;;AgDqCL,AjCzDE,ciCyDY,CjCzDZ,UAAU,CAAC;EACT,OAAO,ElB8oB2B,OAAM,CADN,MAAM;EkB5oBxC,SAAS,ElBuPI,OAAO,GkBtPrB;;AiCsDH,AjClDM,ciCkDQ,CjCpDZ,UAAU,AACR,YAAa,CACX,UAAU,CAAC;EOqBb,yBAAyB,EzBkSJ,MAAK;EyBjS1B,sBAAsB,EzBiSD,MAAK,GkBrTvB;;AiCgDP,AjC7CM,ciC6CQ,CjCpDZ,UAAU,AAMR,WAAY,CACV,UAAU,CAAC;EOEb,0BAA0B,EzBgTL,MAAK;EyB/S1B,uBAAuB,EzB+SF,MAAK,GkBhTvB;;AiC+CP,AjC7DE,ciC6DY,CjC7DZ,UAAU,CAAC;EACT,OAAO,ElB4oB2B,OAAM,CADN,MAAK;EkB1oBvC,SAAS,ElBwPI,QAAO,GkBvPrB;;AiC0DH,AjCtDM,ciCsDQ,CjCxDZ,UAAU,AACT,YAAc,CACX,UAAU,CAAC;EOqBb,yBAAyB,EzBmSJ,MAAK;EyBlS1B,sBAAsB,EzBkSD,MAAK,GkBtTvB;;AiCoDP,AjCjDM,ciCiDQ,CjCxDZ,UAAU,AAMT,WAAa,CACV,UAAU,CAAC;EOEb,0BAA0B,EzBiTL,MAAK;EyBhT1B,uBAAuB,EzBgTF,MAAK,GkBjTvB;;AkCZP,AAAA,MAAM,CAAC;EACL,OAAO,EAAE,YAAY;EACrB,OAAO,EpDqwBqB,MAAK,CADL,KAAI;EoDnwBhC,SAAS,EpDiwBmB,GAAG;EoDhwB/B,WAAW,EpDwPM,IAAI;EoDvPrB,WAAW,EAAE,CAAC;EACd,KAAK,EpDmFE,IAAI;EoDlFX,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,MAAM;EACnB,cAAc,EAAE,QAAQ;E3BVtB,aAAa,EzB4TQ,OAAM,GoD3S9B;EAhBD,AAaE,MAbI,AAaJ,MAAO,CAAC;IACN,OAAO,EAAE,IAAI,GACd;;AAIH,AAAK,IAAD,CAAC,MAAM,CAAC;EACV,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,IAAI,GACV;;AAID,AjDXI,CiDWH,AAAA,MAAM,AjDXrD,MAAyD,EiDWX,AjDVI,CiDUH,AAAA,MAAM,AjDVrD,MAAyD,CAAC;EiDYR,KAAK,EpD6DA,IAAI;EoD5DT,eAAe,EAAE,IAAI;EACrB,MAAM,EAAE,OAAO,GjDZd;;AiDqBL,AAAA,WAAW,CAAC;EACV,aAAa,EpDiuBe,KAAI;EoDhuBhC,YAAY,EpDguBgB,KAAI;EyB1wB9B,aAAa,EzB6wBa,KAAK,GoDjuBlC;;AAMD,AAAA,cAAc,CAAC;E/CnDb,gBAAgB,EPyGiB,OAAO,GsDpDzC;EAFD,AjDlCI,ciDkCU,C/CjDZ,AAAA,IAAE,AAAA,CFelD,MAAyD,EiDkCX,AjDjCI,ciDiCU,C/CjDZ,AAAA,IAAE,AAAA,CFgBlD,MAAyD,CAAC;IEdN,gBAAgB,EAAE,OAAmB,GFgBtC;;AiDmCL,AAAA,cAAc,CAAC;E/CvDb,gBAAgB,EPSiB,OAAO,GsDgDzC;EAFD,AjDtCI,ciDsCU,C/CrDb,AAAA,IAAG,AAAA,CFelD,MAAyD,EiDsCX,AjDrCI,ciDqCU,C/CrDb,AAAA,IAAG,AAAA,CFgBlD,MAAyD,CAAC;IEdN,gBAAgB,EAAE,OAAmB,GFgBtC;;AiDuCL,AAAA,cAAc,CAAC;E/C3Db,gBAAgB,EPUiB,OAAO,GsDmDzC;EAFD,AjD1CI,ciD0CU,C/CzDd,AAAA,IAAI,AAAA,CFelD,MAAyD,EiD0CX,AjDzCI,ciDyCU,C/CzDd,AAAA,IAAI,AAAA,CFgBlD,MAAyD,CAAC;IEdN,gBAAgB,EAAE,OAAmB,GFgBtC;;AiD2CL,AAAA,WAAW,CAAC;E/C/DV,gBAAgB,EPWiB,OAAO,GsDsDzC;EAFD,AjD9CI,WiD8CO,C/C7DZ,AAAA,IAAK,AAAA,CFelD,MAAyD,EiD8CX,AjD7CI,WiD6CO,C/C7DZ,AAAA,IAAK,AAAA,CFgBlD,MAAyD,CAAC;IEdN,gBAAgB,EAAE,OAAmB,GFgBtC;;AiD+CL,AAAA,cAAc,CAAC;E/CnEb,gBAAgB,EPYiB,OAAO,GsDyDzC;EAFD,AjDlDI,ciDkDU,C/CjEhB,AAAA,IAAM,AAAA,CFelD,MAAyD,EiDkDX,AjDjDI,ciDiDU,C/CjEhB,AAAA,IAAM,AAAA,CFgBlD,MAAyD,CAAC;IEdN,gBAAgB,EAAE,OAAmB,GFgBtC;;AiDmDL,AAAA,aAAa,CAAC;E/CvEZ,gBAAgB,EPaiB,OAAO,GsD4DzC;EAFD,AjDtDI,aiDsDS,C/CrEhB,AAAA,IAAO,AAAA,CFelD,MAAyD,EiDsDX,AjDrDI,aiDqDS,C/CrEhB,AAAA,IAAO,AAAA,CFgBlD,MAAyD,CAAC;IEdN,gBAAgB,EAAE,OAAmB,GFgBtC;;AkDvBL,AAAA,UAAU,CAAC;EACT,OAAO,ErDwqBwB,IAAI,CqDxqBP,IAAwB;EACpD,aAAa,ErDuqBkB,IAAI;EqDtqBnC,gBAAgB,ErD0GU,OAAO;EyBzG/B,aAAa,EzB6TQ,MAAK,GqDxT7B;EnD+CG,MAAM,EAAE,SAAS,EAAE,KAAK;ImDxD5B,AAAA,UAAU,CAAC;MAOP,OAAO,EAAE,IAAwB,CrDkqBJ,IAAI,GqDhqBpC;;AAED,AAAA,aAAa,CAAC;EACZ,gBAAgB,EAAE,OAA0B,GAC7C;;AAED,AAAA,gBAAgB,CAAC;EACf,aAAa,EAAE,CAAC;EAChB,YAAY,EAAE,CAAC;E5Bbb,aAAa,E4BcQ,CAAC,GACzB;;ACfD,AAAA,MAAM,CAAC;EACL,OAAO,EtDmzBqB,OAAM,CADN,OAAO;EsDjzBnC,aAAa,EtDsIJ,IAAI;EsDrIb,MAAM,EtDkKO,GAAG,CsDlKY,KAAK,CAAC,WAAW;E7BH3C,aAAa,EzB4TQ,OAAM,GsDvT9B;;AAGD,AAAA,cAAc,CAAC;EAEb,KAAK,EAAE,OAAO,GACf;;AAGD,AAAA,WAAW,CAAC;EACV,WAAW,EtD8OM,IAAI,GsD7OtB;;AAOD,AAEE,kBAFgB,CAEhB,MAAM,CAAC;EACL,QAAQ,EAAE,QAAQ;EAClB,GAAG,EtDyxBuB,QAAM;EsDxxBhC,KAAK,EtDuxBqB,QAAO;EsDtxBjC,OAAO,EtDuxBmB,OAAM,CADN,OAAO;EsDrxBjC,KAAK,EAAE,OAAO,GACf;;AAQH,AAAA,cAAc,CAAC;EvCxCb,gBAAgB,EjBUiB,OAAO;EiBTxC,YAAY,EjBuEqB,OAA0B;EiBtE3D,KAAK,EjBoE4B,IAAI,GwD5BtC;EAFD,AvCpCE,cuCoCY,CvCpCZ,EAAE,CAAC;IACD,gBAAgB,EAAE,OAAmB,GACtC;EuCkCH,AvCjCE,cuCiCY,CvCjCZ,WAAW,CAAC;IACV,KAAK,EAAE,OAAwB,GAChC;;AuCkCH,AAAA,WAAW,CAAC;EvC3CV,gBAAgB,EjBWiB,OAAO;EiBVxC,YAAY,EjB2EqB,OAAuB;EiB1ExD,KAAK,EjBwE4B,IAAI,GwD7BtC;EAFD,AvCvCE,WuCuCS,CvCvCT,EAAE,CAAC;IACD,gBAAgB,EAAE,OAAmB,GACtC;EuCqCH,AvCpCE,WuCoCS,CvCpCT,WAAW,CAAC;IACV,KAAK,EAAE,OAAwB,GAChC;;AuCqCH,AAAA,cAAc,CAAC;EvC9Cb,gBAAgB,EjBYiB,OAAO;EiBXxC,YAAY,EjB+EqB,OAA0B;EiB9E3D,KAAK,EjB4E4B,IAAI,GwD9BtC;EAFD,AvC1CE,cuC0CY,CvC1CZ,EAAE,CAAC;IACD,gBAAgB,EAAE,OAAmB,GACtC;EuCwCH,AvCvCE,cuCuCY,CvCvCZ,WAAW,CAAC;IACV,KAAK,EAAE,OAAwB,GAChC;;AuCwCH,AAAA,aAAa,CAAC;EvCjDZ,gBAAgB,EjBaiB,OAAO;EiBZxC,YAAY,EjBmFqB,OAAyB;EiBlF1D,KAAK,EjBgF4B,IAAI,GwD/BtC;EAFD,AvC7CE,auC6CW,CvC7CX,EAAE,CAAC;IACD,gBAAgB,EAAE,OAAmB,GACtC;EuC2CH,AvC1CE,auC0CW,CvC1CX,WAAW,CAAC;IACV,KAAK,EAAE,OAAwB,GAChC;;AwCXH,UAAU,CAAV,oBAAU;EACR,AAAA,IAAI;IAAG,mBAAmB,EvD+0BI,IAAI,CuD/0BW,CAAC;EAC9C,AAAA,EAAE;IAAG,mBAAmB,EAAE,GAAG;;AAI/B,AAAA,SAAS,CAAC;EACR,OAAO,EAAE,IAAI;EACb,QAAQ,EAAE,MAAM;EAChB,SAAS,EvDw0BqB,OAAM;EuDv0BpC,WAAW,EvDs0BmB,IAAI;EuDr0BlC,UAAU,EAAE,MAAM;EAClB,gBAAgB,EvDgGU,OAAO;EyBzG/B,aAAa,EzB4TQ,OAAM,GuDjT9B;;AACD,AAAA,aAAa,CAAC;EACZ,MAAM,EvDg0BwB,IAAI;EuD/zBlC,KAAK,EvD4EE,IAAI;EuD3EX,gBAAgB,EzDPiB,OAAO,GyDQzC;;AAGD,AAAA,qBAAqB,CAAC;E7BYpB,gBAAgB,EAAE,mLAA2H;E6BV7I,eAAe,EvDwzBe,IAAI,CAAJ,IAAI,GuDvzBnC;;AAGD,AAAA,sBAAsB,CAAC;EACrB,SAAS,EAAE,oBAAoB,CvD0zBD,EAAE,CAAC,MAAM,CAAC,QAAQ,GuDzzBjD;;AC/BD,AAAA,MAAM,CAAC;EACL,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,UAAU,GACxB;;AAED,AAAA,WAAW,CAAC;EACV,IAAI,EAAE,CAAC,GACR;;ACHD,AAAA,WAAW,CAAC;EACV,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EAGtB,YAAY,EAAE,CAAC;EACf,aAAa,EAAE,CAAC,GACjB;;AAQD,AAAA,uBAAuB,CAAC;EACtB,KAAK,EAAE,IAAI;EACX,KAAK,EzDsFqB,OAAO;EyDrFjC,UAAU,EAAE,OAAO,GAiBpB;EApBD,AAKE,uBALqB,CAKrB,wBAAwB,CAAC;IACvB,KAAK,EzDiFmB,OAAO,GyDhFhC;EAPH,AtDCI,uBsDDmB,AtDCrE,MAAyD,EsDDX,AtDEI,uBsDFmB,AtDErE,MAAyD,CAAC;IsDSR,KAAK,EzD6EmB,OAAO;IyD5E/B,eAAe,EAAE,IAAI;IACrB,gBAAgB,EzD8EQ,OAAO,GGvF9B;EsDJL,AAgBE,uBAhBqB,AAgBrB,OAAQ,CAAC;IACP,KAAK,EzDsEmB,OAAO;IyDrE/B,gBAAgB,EzDwEQ,OAAO,GyDvEhC;;AAQH,AAAA,gBAAgB,CAAC;EACf,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,QAAQ;EACnB,WAAW,EAAE,MAAM;EACnB,OAAO,EzDgzBwB,OAAM,CADN,OAAO;EyD7yBtC,aAAa,EzDoHA,IAAG;EyDnHhB,gBAAgB,E3D/CiB,OAAO;E2DgDxC,MAAM,EzDkHO,GAAG,CyDlHiB,KAAK,CzDwC/B,oBAAI,GyDQZ;EAzDD,AAWE,gBAXc,AAWd,YAAa,CAAC;IhC/CZ,uBAAuB,EzBsTF,OAAM;IyBrT3B,sBAAsB,EzBqTD,OAAM,GyDrQ5B;EAbH,AAeE,gBAfc,AAed,WAAY,CAAC;IACX,aAAa,EAAE,CAAC;IhCtChB,0BAA0B,EzBwSL,OAAM;IyBvS3B,yBAAyB,EzBuSJ,OAAM,GyDhQ5B;EAlBH,AtD1BI,gBsD0BY,AtD1B9D,MAAyD,EsD0BX,AtDzBI,gBsDyBY,AtDzB9D,MAAyD,CAAC;IsD8CR,eAAe,EAAE,IAAI,GtD5CpB;EsDuBL,AAwBE,gBAxBc,AAwBd,SAAU,EAxBZ,AAyBE,gBAzBc,AAyBd,SAAU,CAAC;IACT,KAAK,EzDoCmB,OAAO;IyDnC/B,MAAM,EzDuYuB,WAAW;IyDtYxC,gBAAgB,E3DnEe,OAAO,G2D4EvC;IArCH,AA+BI,gBA/BY,AAwBd,SAAU,CAOR,wBAAwB,EA/B5B,AA+BI,gBA/BY,AAyBd,SAAU,CAMR,wBAAwB,CAAC;MACvB,KAAK,EAAE,OAAO,GACf;IAjCL,AAkCI,gBAlCY,AAwBd,SAAU,CAUR,qBAAqB,EAlCzB,AAkCI,gBAlCY,AAyBd,SAAU,CASR,qBAAqB,CAAC;MACpB,KAAK,EzD2BiB,OAAO,GyD1B9B;EApCL,AAwCE,gBAxCc,AAwCd,OAAQ,CAAC;IACP,OAAO,EAAE,CAAC;IACV,KAAK,EzDMA,IAAI;IyDLT,gBAAgB,E3D7Ee,OAAO;I2D8EtC,YAAY,E3D9EmB,OAAO,G2D0FvC;IAxDH,AA+CI,gBA/CY,AAwCd,OAAQ,CAON,wBAAwB;IA/C5B,AAgD+B,gBAhDf,AAwCd,OAAQ,CAQN,wBAAwB,GAAG,KAAK;IAhDpC,AAiD+B,gBAjDf,AAwCd,OAAQ,CASN,wBAAwB,GAAG,MAAM,CAAC;MAChC,KAAK,EAAE,OAAO,GACf;IAnDL,AAqDI,gBArDY,AAwCd,OAAQ,CAaN,qBAAqB,CAAC;MACpB,KAAK,EzDqwBsB,OAAmC,GyDpwB/D;;AAUL,AACE,iBADe,CACf,gBAAgB,CAAC;EACf,YAAY,EAAE,CAAC;EACf,WAAW,EAAE,CAAC;EACd,aAAa,EAAE,CAAC,GACjB;;AALH,AAQI,iBARa,AAOf,YAAa,CACX,gBAAgB,AAAA,YAAY,CAAC;EAC3B,UAAU,EAAE,CAAC,GACd;;AAVL,AAcI,iBAda,AAaf,WAAY,CACV,gBAAgB,AAAA,WAAW,CAAC;EAC1B,aAAa,EAAE,CAAC,GACjB;;ArC5HH,AAAA,wBAAwB,CAAG;EACzB,KAAK,EtBqE0B,IAAI;EsBpEnC,gBAAgB,EtBQe,OAAO,GsBPvC;;AAED,AAAA,CAAC,AAAA,wBAAwB;AACzB,AAAA,MAAM,AAAA,wBAAwB,CAAG;EAC/B,KAAK,EtB+D0B,IAAI,GsB/CpC;EAlBD,AAIE,CAJD,AAAA,wBAAwB,CAIvB,wBAAwB;EAH1B,AAGE,MAHI,AAAA,wBAAwB,CAG5B,wBAAwB,CAAC;IACvB,KAAK,EAAE,OAAO,GACf;EANH,AjBYE,CiBZD,AAAA,wBAAwB,AjBYzE,MAAyD,EiBZT,AjBaE,CiBbD,AAAA,wBAAwB,AjBazE,MAAyD;EiBZT,AjBWE,MiBXI,AAAA,wBAAwB,AjBW9E,MAAyD;EiBXT,AjBYE,MiBZI,AAAA,wBAAwB,AjBY9E,MAAyD,CAAC;IiBJN,KAAK,EtBwDwB,IAAI;IsBvDjC,gBAAgB,EAAE,OAAuB,GjBK1C;EiBfH,AAaE,CAbD,AAAA,wBAAwB,AAa9B,OAAe;EAZV,AAYE,MAZI,AAAA,wBAAwB,AAYnC,OAAe,CAAC;IACP,KAAK,EAAE,IAAI;IACX,gBAAgB,EtBkDa,IAAI;IsBjDjC,YAAY,EtBiDiB,IAAI,GsBhDlC;;AAtBH,AAAA,qBAAqB,CAAM;EACzB,KAAK,EtByE0B,IAAI;EsBxEnC,gBAAgB,EtBSe,OAAO,GsBRvC;;AAED,AAAA,CAAC,AAAA,qBAAqB;AACtB,AAAA,MAAM,AAAA,qBAAqB,CAAM;EAC/B,KAAK,EtBmE0B,IAAI,GsBnDpC;EAlBD,AAIE,CAJD,AAAA,qBAAqB,CAIpB,wBAAwB;EAH1B,AAGE,MAHI,AAAA,qBAAqB,CAGzB,wBAAwB,CAAC;IACvB,KAAK,EAAE,OAAO,GACf;EANH,AjBYE,CiBZD,AAAA,qBAAqB,AjBYtE,MAAyD,EiBZT,AjBaE,CiBbD,AAAA,qBAAqB,AjBatE,MAAyD;EiBZT,AjBWE,MiBXI,AAAA,qBAAqB,AjBW3E,MAAyD;EiBXT,AjBYE,MiBZI,AAAA,qBAAqB,AjBY3E,MAAyD,CAAC;IiBJN,KAAK,EtB4DwB,IAAI;IsB3DjC,gBAAgB,EAAE,OAAuB,GjBK1C;EiBfH,AAaE,CAbD,AAAA,qBAAqB,AAa3B,OAAe;EAZV,AAYE,MAZI,AAAA,qBAAqB,AAYhC,OAAe,CAAC;IACP,KAAK,EAAE,IAAI;IACX,gBAAgB,EtBsDa,IAAI;IsBrDjC,YAAY,EtBqDiB,IAAI,GsBpDlC;;AAtBH,AAAA,wBAAwB,CAAG;EACzB,KAAK,EtB6E0B,IAAI;EsB5EnC,gBAAgB,EtBUe,OAAO,GsBTvC;;AAED,AAAA,CAAC,AAAA,wBAAwB;AACzB,AAAA,MAAM,AAAA,wBAAwB,CAAG;EAC/B,KAAK,EtBuE0B,IAAI,GsBvDpC;EAlBD,AAIE,CAJD,AAAA,wBAAwB,CAIvB,wBAAwB;EAH1B,AAGE,MAHI,AAAA,wBAAwB,CAG5B,wBAAwB,CAAC;IACvB,KAAK,EAAE,OAAO,GACf;EANH,AjBYE,CiBZD,AAAA,wBAAwB,AjBYzE,MAAyD,EiBZT,AjBaE,CiBbD,AAAA,wBAAwB,AjBazE,MAAyD;EiBZT,AjBWE,MiBXI,AAAA,wBAAwB,AjBW9E,MAAyD;EiBXT,AjBYE,MiBZI,AAAA,wBAAwB,AjBY9E,MAAyD,CAAC;IiBJN,KAAK,EtBgEwB,IAAI;IsB/DjC,gBAAgB,EAAE,OAAuB,GjBK1C;EiBfH,AAaE,CAbD,AAAA,wBAAwB,AAa9B,OAAe;EAZV,AAYE,MAZI,AAAA,wBAAwB,AAYnC,OAAe,CAAC;IACP,KAAK,EAAE,IAAI;IACX,gBAAgB,EtB0Da,IAAI;IsBzDjC,YAAY,EtByDiB,IAAI,GsBxDlC;;AAtBH,AAAA,uBAAuB,CAAI;EACzB,KAAK,EtBiF0B,IAAI;EsBhFnC,gBAAgB,EtBWe,OAAO,GsBVvC;;AAED,AAAA,CAAC,AAAA,uBAAuB;AACxB,AAAA,MAAM,AAAA,uBAAuB,CAAI;EAC/B,KAAK,EtB2E0B,IAAI,GsB3DpC;EAlBD,AAIE,CAJD,AAAA,uBAAuB,CAItB,wBAAwB;EAH1B,AAGE,MAHI,AAAA,uBAAuB,CAG3B,wBAAwB,CAAC;IACvB,KAAK,EAAE,OAAO,GACf;EANH,AjBYE,CiBZD,AAAA,uBAAuB,AjBYxE,MAAyD,EiBZT,AjBaE,CiBbD,AAAA,uBAAuB,AjBaxE,MAAyD;EiBZT,AjBWE,MiBXI,AAAA,uBAAuB,AjBW7E,MAAyD;EiBXT,AjBYE,MiBZI,AAAA,uBAAuB,AjBY7E,MAAyD,CAAC;IiBJN,KAAK,EtBoEwB,IAAI;IsBnEjC,gBAAgB,EAAE,OAAuB,GjBK1C;EiBfH,AAaE,CAbD,AAAA,uBAAuB,AAa7B,OAAe;EAZV,AAYE,MAZI,AAAA,uBAAuB,AAYlC,OAAe,CAAC;IACP,KAAK,EAAE,IAAI;IACX,gBAAgB,EtB8Da,IAAI;IsB7DjC,YAAY,EtB6DiB,IAAI,GsB5DlC;;AsCvBL,AAAA,iBAAiB,CAAC;EAChB,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,KAAK;EACd,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,CAAC;EACV,QAAQ,EAAE,MAAM,GAoBjB;EAzBD,AAOE,iBAPe,AAOf,QAAS,CAAC;IACR,OAAO,EAAE,KAAK;IACd,OAAO,EAAE,EAAE,GACZ;EAVH,AAYE,iBAZe,CAYf,sBAAsB;EAZxB,AAaE,iBAbe,CAaf,MAAM;EAbR,AAcE,iBAde,CAcf,KAAK;EAdP,AAeE,iBAfe,CAef,MAAM;EAfR,AAgBE,iBAhBe,CAgBf,KAAK,CAAC;IACJ,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,CAAC;IACN,MAAM,EAAE,CAAC;IACT,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE,CAAC,GACV;;AAGH,AACE,uBADqB,AACrB,QAAS,CAAC;EACR,WAAW,EAAE,SAAkB,GAChC;;AAGH,AACE,uBADqB,AACrB,QAAS,CAAC;EACR,WAAW,EAAE,MAAkB,GAChC;;AAGH,AACE,sBADoB,AACpB,QAAS,CAAC;EACR,WAAW,EAAE,GAAiB,GAC/B;;AAGH,AACE,sBADoB,AACpB,QAAS,CAAC;EACR,WAAW,EAAE,IAAiB,GAC/B;;AClDH,AAAA,MAAM,CAAC;EACL,KAAK,EAAE,KAAK;EACZ,SAAS,E3D06BmB,MAAqB;E2Dz6BjD,WAAW,E3D8PM,IAAI;E2D7PrB,WAAW,EAAE,CAAC;EACd,KAAK,E3D0FE,IAAI;E2DzFX,WAAW,E3Dy6BiB,CAAC,CAAC,GAAG,CAAC,CAAC,CAj1B5B,IAAI;E2DvFX,OAAO,EAAE,EAAE,GAQZ;EAfD,AxDoBI,MwDpBE,AxDoBpD,MAAyD,EwDpBX,AxDqBI,MwDrBE,AxDqBpD,MAAyD,CAAC;IwDXR,KAAK,E3DqFA,IAAI;I2DpFT,eAAe,EAAE,IAAI;IACrB,MAAM,EAAE,OAAO;IACf,OAAO,EAAE,GAAG,GxDUX;;AwDAL,AAAA,MAAM,AAAA,MAAM,CAAC;EACX,OAAO,EAAE,CAAC;EACV,MAAM,EAAE,OAAO;EACf,UAAU,EAAE,WAAW;EACvB,MAAM,EAAE,CAAC;EACT,kBAAkB,EAAE,IAAI,GACzB;;ACtBD,AAAA,WAAW,CAAC;EACV,QAAQ,EAAE,MAAM,GACjB;;AAGD,AAAA,MAAM,CAAC;EACL,QAAQ,EAAE,KAAK;EACf,GAAG,EAAE,CAAC;EACN,KAAK,EAAE,CAAC;EACR,MAAM,EAAE,CAAC;EACT,IAAI,EAAE,CAAC;EACP,OAAO,E5DkkBmB,IAAI;E4DjkB9B,OAAO,EAAE,IAAI;EACb,QAAQ,EAAE,MAAM;EAGhB,OAAO,EAAE,CAAC,GAWX;EAtBD,AAiBS,MAjBH,AAiBJ,KAAM,CAAC,aAAa,CAAC;I3DdjB,UAAU,EDiyBc,SAAS,CAAC,IAAG,CAAC,QAAQ;I4DjxBhD,SAAS,EAAE,kBAAkB,GAC9B;EApBH,AAqBS,MArBH,AAqBJ,KAAM,CAAC,aAAa,CAAC;IAAE,SAAS,EAAE,eAAe,GAAI;;AAEvD,AAAY,WAAD,CAAC,MAAM,CAAC;EACjB,UAAU,EAAE,MAAM;EAClB,UAAU,EAAE,IAAI,GACjB;;AAGD,AAAA,aAAa,CAAC;EACZ,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,MAAM,E5D6uBsB,IAAI,G4D5uBjC;;AAGD,AAAA,cAAc,CAAC;EACb,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,gBAAgB,E5D0CT,IAAI;E4DzCX,eAAe,EAAE,WAAW;EAC5B,MAAM,E5DmHO,GAAG,C4DnHoB,KAAK,C5DyClC,kBAAI;EyB3FT,aAAa,EzB6TQ,MAAK;E4DvQ5B,OAAO,EAAE,CAAC,GACX;;AAGD,AAAA,eAAe,CAAC;EACd,QAAQ,EAAE,KAAK;EACf,GAAG,EAAE,CAAC;EACN,KAAK,EAAE,CAAC;EACR,MAAM,EAAE,CAAC;EACT,IAAI,EAAE,CAAC;EACP,OAAO,E5D+gBmB,IAAI;E4D9gB9B,gBAAgB,E5D0BT,IAAI,G4DrBZ;EAZD,AAUE,eAVa,AAUb,KAAM,CAAC;IAAE,OAAO,EAAE,CAAC,GAAK;EAV1B,AAWE,eAXa,AAWb,KAAM,CAAC;IAAE,OAAO,E5D4tBY,GAAE,G4D5tBe;;AAK/C,AAAA,aAAa,CAAC;EACZ,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,eAAe,EAAE,aAAa;EAC9B,OAAO,E5DwtBqB,IAAI;E4DvtBhC,aAAa,E5DsFA,GAAG,C4DtF0B,KAAK,C5D0BrB,OAAO,G4DzBlC;;AAGD,AAAA,YAAY,CAAC;EACX,aAAa,EAAE,CAAC;EAChB,WAAW,E5D2KM,GAAG,G4D1KrB;;AAID,AAAA,WAAW,CAAC;EACV,QAAQ,EAAE,QAAQ;EAGlB,IAAI,EAAE,QAAQ;EACd,OAAO,E5DorBqB,IAAI,G4DnrBjC;;AAGD,AAAA,aAAa,CAAC;EACZ,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,eAAe,EAAE,QAAQ;EACzB,OAAO,E5D4qBqB,IAAI;E4D3qBhC,UAAU,E5D6DG,GAAG,C4D7DuB,KAAK,C5DClB,OAAO,G4DIlC;EAVD,AAQI,aARS,GAQT,IAAK,CAAA,AAAA,YAAY,EAAE;IAAE,WAAW,EAAE,MAAM,GAAK;EARjD,AASI,aATS,GAST,IAAK,CAAA,AAAA,WAAW,EAAE;IAAE,YAAY,EAAE,MAAM,GAAK;;AAIjD,AAAA,wBAAwB,CAAC;EACvB,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,OAAO;EACZ,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,QAAQ,EAAE,MAAM,GACjB;;A1DlEG,MAAM,EAAE,SAAS,EAAE,KAAK;E0DuE1B,AAAA,aAAa,CAAC;IACZ,SAAS,E5D6qBiB,KAAK;I4D5qB/B,MAAM,E5DypBoB,IAAI,C4DzpBO,IAAI,GAC1C;EAMD,AAAA,SAAS,CAAC;IAAE,SAAS,E5DsqBO,KAAK,G4DtqBG;;A1DhFlC,MAAM,EAAE,SAAS,EAAE,KAAK;E0DoF1B,AAAA,SAAS,CAAC;IAAE,SAAS,E5DgqBO,KAAK,G4DhqBG;;AC3ItC,AAAA,QAAQ,CAAC;EACP,QAAQ,EAAE,QAAQ;EAClB,OAAO,E7DmlBmB,IAAI;E6DllB9B,OAAO,EAAE,KAAK;EpDHd,WAAW,EXyCsB,KAAK,EAAE,UAAU;EWvClD,UAAU,EAAE,MAAM;EAClB,WAAW,ET4PQ,MAAM;ES3PzB,cAAc,EAAE,MAAM;EACtB,UAAU,EAAE,IAAI;EAChB,WAAW,ET6PM,GAAG;ES5PpB,UAAU,EAAE,IAAI;EAChB,UAAU,EAAE,KAAK;EACjB,eAAe,EAAE,IAAI;EACrB,WAAW,EAAE,IAAI;EACjB,cAAc,EAAE,IAAI;EACpB,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,MAAM;EAClB,YAAY,EAAE,MAAM;EoDPpB,SAAS,E7DqPM,QAAO;E6DnPtB,SAAS,EAAE,UAAU;EACrB,OAAO,EAAE,CAAC,GA4DX;EAtED,AAYE,QAZM,AAYN,KAAM,CAAC;IAAE,OAAO,E7DitBY,GAAE,G6DjtBQ;EAZxC,AAcE,QAdM,AAcN,YAAa,EAdf,AAeE,QAfM,AAeN,kCAAmC,CAAC;IAClC,OAAO,E7DktBmB,GAAG,C6DltBC,CAAC;IAC/B,UAAU,E7D+sBgB,IAAG,G6DrsB9B;IA3BH,AAmBI,QAnBI,AAcN,YAAa,CAKX,cAAc,AAAA,QAAQ,EAnB1B,AAmBI,QAnBI,AAeN,kCAAmC,CAIjC,cAAc,AAAA,QAAQ,CAAC;MACrB,MAAM,EAAE,CAAC;MACT,IAAI,EAAE,GAAG;MACT,WAAW,E7D4sBa,IAAG;M6D3sB3B,OAAO,EAAE,EAAE;MACX,YAAY,E7D0sBY,GAAG,CAAH,GAAG,C6D1sB6B,CAAC;MACzD,gBAAgB,E7DqEb,IAAI,G6DpER;EA1BL,AA4BE,QA5BM,AA4BN,cAAe,EA5BjB,AA6BE,QA7BM,AA6BN,gCAAiC,CAAC;IAChC,OAAO,EAAE,CAAC,C7DosBgB,GAAG;I6DnsB7B,WAAW,E7DisBe,GAAG,G6DvrB9B;IAzCH,AAiCI,QAjCI,AA4BN,cAAe,CAKb,cAAc,AAAA,QAAQ,EAjC1B,AAiCI,QAjCI,AA6BN,gCAAiC,CAI/B,cAAc,AAAA,QAAQ,CAAC;MACrB,GAAG,EAAE,GAAG;MACR,IAAI,EAAE,CAAC;MACP,UAAU,E7D8rBc,IAAG;M6D7rB3B,OAAO,EAAE,EAAE;MACX,YAAY,E7D4rBY,GAAG,CAAH,GAAG,CAAH,GAAG,C6D5rBkD,CAAC;MAC9E,kBAAkB,E7DuDf,IAAI,G6DtDR;EAxCL,AA0CE,QA1CM,AA0CN,eAAgB,EA1ClB,AA2CE,QA3CM,AA2CN,+BAAgC,CAAC;IAC/B,OAAO,E7DsrBmB,GAAG,C6DtrBC,CAAC;IAC/B,UAAU,E7DmrBgB,GAAG,G6DzqB9B;IAvDH,AA+CI,QA/CI,AA0CN,eAAgB,CAKd,cAAc,AAAA,QAAQ,EA/C1B,AA+CI,QA/CI,AA2CN,+BAAgC,CAI9B,cAAc,AAAA,QAAQ,CAAC;MACrB,GAAG,EAAE,CAAC;MACN,IAAI,EAAE,GAAG;MACT,WAAW,E7DgrBa,IAAG;M6D/qB3B,OAAO,EAAE,EAAE;MACX,YAAY,EAAE,CAAC,C7D8qBS,GAAG,CAAH,GAAG;M6D7qB3B,mBAAmB,E7DyChB,IAAI,G6DxCR;EAtDL,AAwDE,QAxDM,AAwDN,aAAc,EAxDhB,AAyDE,QAzDM,AAyDN,iCAAkC,CAAC;IACjC,OAAO,EAAE,CAAC,C7DwqBgB,GAAG;I6DvqB7B,WAAW,E7DqqBe,IAAG,G6D3pB9B;IArEH,AA6DI,QA7DI,AAwDN,aAAc,CAKZ,cAAc,AAAA,QAAQ,EA7D1B,AA6DI,QA7DI,AAyDN,iCAAkC,CAIhC,cAAc,AAAA,QAAQ,CAAC;MACrB,GAAG,EAAE,GAAG;MACR,KAAK,EAAE,CAAC;MACR,UAAU,E7DkqBc,IAAG;M6DjqB3B,OAAO,EAAE,EAAE;MACX,YAAY,E7DgqBY,GAAG,C6DhqBQ,CAAC,C7DgqBZ,GAAG,CAAH,GAAG;M6D/pB3B,iBAAiB,E7D2Bd,IAAI,G6D1BR;;AAKL,AAAA,cAAc,CAAC;EACb,SAAS,E7DgpBmB,KAAK;E6D/oBjC,OAAO,E7DmpBqB,GAAG,CACH,GAAG;E6DnpB/B,KAAK,E7DiBE,IAAI;E6DhBX,UAAU,EAAE,MAAM;EAClB,gBAAgB,E7DgBT,IAAI;EyB3FT,aAAa,EzB4TQ,OAAM,G6DvO9B;EAfD,AAQE,cARY,AAQZ,QAAS,CAAC;IACR,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,CAAC;IACT,YAAY,EAAE,WAAW;IACzB,YAAY,EAAE,KAAK,GACpB;;ACxFH,AAAA,QAAQ,CAAC;EACP,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,CAAC;EACN,IAAI,EAAE,CAAC;EACP,OAAO,E9DilBmB,IAAI;E8DhlB9B,OAAO,EAAE,KAAK;EACd,SAAS,E9DquB2B,KAAK;E8DpuBzC,OAAO,E9DkuB6B,GAAG;ESxuBvC,WAAW,EXyCsB,KAAK,EAAE,UAAU;EWvClD,UAAU,EAAE,MAAM;EAClB,WAAW,ET4PQ,MAAM;ES3PzB,cAAc,EAAE,MAAM;EACtB,UAAU,EAAE,IAAI;EAChB,WAAW,ET6PM,GAAG;ES5PpB,UAAU,EAAE,IAAI;EAChB,UAAU,EAAE,KAAK;EACjB,eAAe,EAAE,IAAI;EACrB,WAAW,EAAE,IAAI;EACjB,cAAc,EAAE,IAAI;EACpB,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,MAAM;EAClB,YAAY,EAAE,MAAM;EqDJpB,SAAS,E9DkPM,QAAO;E8DhPtB,SAAS,EAAE,UAAU;EACrB,gBAAgB,E9DgFT,IAAI;E8D/EX,eAAe,EAAE,WAAW;EAC5B,MAAM,E9DyJO,GAAG,C8DzJc,KAAK,C9D+E5B,kBAAI;EyB3FT,aAAa,EzB6TQ,MAAK,G8DnM7B;EA9HD,AAuBE,QAvBM,AAuBN,YAAa,EAvBf,AAwBE,QAxBM,AAwBN,kCAAmC,CAAC;IAClC,UAAU,E9D8tBwB,KAAI,G8D3sBvC;IA5CH,AA2BI,QA3BI,AAuBN,YAAa,AAIZ,QAAU,EA3Bb,AA4BI,QA5BI,AAuBN,YAAa,AAKZ,OAAS,EA5BZ,AA2BI,QA3BI,AAwBN,kCAAmC,AAGlC,QAAU,EA3Bb,AA4BI,QA5BI,AAwBN,kCAAmC,AAIlC,OAAS,CAAC;MACP,IAAI,EAAE,GAAG;MACT,mBAAmB,EAAE,CAAC,GACvB;IA/BL,AAiCI,QAjCI,AAuBN,YAAa,AAUZ,QAAU,EAjCb,AAiCI,QAjCI,AAwBN,kCAAmC,AASlC,QAAU,CAAC;MACR,MAAM,E9DwtB0B,KAA4B;M8DvtB5D,WAAW,E9DutBqB,KAA4B;M8DttB5D,gBAAgB,E9DutBgB,mBAAmC,G8DttBpE;IArCL,AAuCI,QAvCI,AAuBN,YAAa,AAgBZ,OAAS,EAvCZ,AAuCI,QAvCI,AAwBN,kCAAmC,AAelC,OAAS,CAAC;MACP,MAAM,EAAI,KAA8B;MACxC,WAAW,E9D8sBqB,KAAI;M8D7sBpC,gBAAgB,E9DoDb,IAAI,G8DnDR;EA3CL,AA8CE,QA9CM,AA8CN,cAAe,EA9CjB,AA+CE,QA/CM,AA+CN,gCAAiC,CAAC;IAChC,WAAW,E9DusBuB,IAAI,G8DprBvC;IAnEH,AAkDI,QAlDI,AA8CN,cAAe,AAId,QAAU,EAlDb,AAmDI,QAnDI,AA8CN,cAAe,AAKd,OAAS,EAnDZ,AAkDI,QAlDI,AA+CN,gCAAiC,AAGhC,QAAU,EAlDb,AAmDI,QAnDI,AA+CN,gCAAiC,AAIhC,OAAS,CAAC;MACP,GAAG,EAAE,GAAG;MACR,iBAAiB,EAAE,CAAC,GACrB;IAtDL,AAwDI,QAxDI,AA8CN,cAAe,AAUd,QAAU,EAxDb,AAwDI,QAxDI,AA+CN,gCAAiC,AAShC,QAAU,CAAC;MACR,IAAI,E9DisB4B,KAA4B;M8DhsB5D,UAAU,E9DgsBsB,KAA4B;M8D/rB5D,kBAAkB,E9DgsBc,mBAAmC,G8D/rBpE;IA5DL,AA8DI,QA9DI,AA8CN,cAAe,AAgBd,OAAS,EA9DZ,AA8DI,QA9DI,AA+CN,gCAAiC,AAehC,OAAS,CAAC;MACP,IAAI,EAAI,KAA8B;MACtC,UAAU,EAAI,KAA8B;MAC5C,kBAAkB,E9D6Bf,IAAI,G8D5BR;EAlEL,AAqEE,QArEM,AAqEN,eAAgB,EArElB,AAsEE,QAtEM,AAsEN,+BAAgC,CAAC;IAC/B,UAAU,E9DgrBwB,IAAI,G8DjpBvC;IAtGH,AAyEI,QAzEI,AAqEN,eAAgB,AAIf,QAAU,EAzEb,AA0EI,QA1EI,AAqEN,eAAgB,AAKf,OAAS,EA1EZ,AAyEI,QAzEI,AAsEN,+BAAgC,AAG/B,QAAU,EAzEb,AA0EI,QA1EI,AAsEN,+BAAgC,AAI/B,OAAS,CAAC;MACP,IAAI,EAAE,GAAG;MACT,gBAAgB,EAAE,CAAC,GACpB;IA7EL,AA+EI,QA/EI,AAqEN,eAAgB,AAUf,QAAU,EA/Eb,AA+EI,QA/EI,AAsEN,+BAAgC,AAS/B,QAAU,CAAC;MACR,GAAG,E9D0qB6B,KAA4B;M8DzqB5D,WAAW,E9DyqBqB,KAA4B;M8DxqB5D,mBAAmB,E9DyqBa,mBAAmC,G8DxqBpE;IAnFL,AAqFI,QArFI,AAqEN,eAAgB,AAgBf,OAAS,EArFZ,AAqFI,QArFI,AAsEN,+BAAgC,AAe/B,OAAS,CAAC;MACP,GAAG,EAAI,KAA8B;MACrC,WAAW,E9DgqBqB,KAAI;M8D/pBpC,mBAAmB,E9DwpBa,OAAuB,G8DvpBxD;IAzFL,AA4FI,QA5FI,AAqEN,eAAgB,CAuBd,cAAc,AAAA,QAAQ,EA5F1B,AA4FI,QA5FI,AAsEN,+BAAgC,CAsB9B,cAAc,AAAA,QAAQ,CAAC;MACrB,QAAQ,EAAE,QAAQ;MAClB,GAAG,EAAE,CAAC;MACN,IAAI,EAAE,GAAG;MACT,OAAO,EAAE,KAAK;MACd,KAAK,EAAE,IAAI;MACX,WAAW,EAAE,KAAK;MAClB,OAAO,EAAE,EAAE;MACX,aAAa,EAAE,GAAG,CAAC,KAAK,C9D4oBQ,OAAuB,G8D3oBxD;EArGL,AAwGE,QAxGM,AAwGN,aAAc,EAxGhB,AAyGE,QAzGM,AAyGN,iCAAkC,CAAC;IACjC,WAAW,E9D6oBuB,KAAI,G8D1nBvC;IA7HH,AA4GI,QA5GI,AAwGN,aAAc,AAIb,QAAU,EA5Gb,AA6GI,QA7GI,AAwGN,aAAc,AAKb,OAAS,EA7GZ,AA4GI,QA5GI,AAyGN,iCAAkC,AAGjC,QAAU,EA5Gb,AA6GI,QA7GI,AAyGN,iCAAkC,AAIjC,OAAS,CAAC;MACP,GAAG,EAAE,GAAG;MACR,kBAAkB,EAAE,CAAC,GACtB;IAhHL,AAkHI,QAlHI,AAwGN,aAAc,AAUb,QAAU,EAlHb,AAkHI,QAlHI,AAyGN,iCAAkC,AASjC,QAAU,CAAC;MACR,KAAK,E9DuoB2B,KAA4B;M8DtoB5D,UAAU,E9DsoBsB,KAA4B;M8DroB5D,iBAAiB,E9DsoBe,mBAAmC,G8DroBpE;IAtHL,AAwHI,QAxHI,AAwGN,aAAc,AAgBb,OAAS,EAxHZ,AAwHI,QAxHI,AAyGN,iCAAkC,AAejC,OAAS,CAAC;MACP,KAAK,EAAI,KAA8B;MACvC,UAAU,EAAI,KAA8B;MAC5C,iBAAiB,E9D7Bd,IAAI,G8D8BR;;AAML,AAAA,cAAc,CAAC;EACb,OAAO,E9D+mB6B,GAAG,CADH,IAAI;E8D7mBxC,aAAa,EAAE,CAAC;EAChB,SAAS,E9DsHM,IAAI;E8DrHnB,gBAAgB,E9D0mBoB,OAAuB;E8DzmB3D,aAAa,E9DkCA,GAAG,C8DlCqB,KAAK,CAAC,OAA6B;ErC7HtE,uBAAuB,EqC8HH,kBAAqD;ErC7HzE,sBAAsB,EqC6HF,kBAAqD,GAM5E;EAZD,AASE,cATY,AASZ,MAAO,CAAC;IACN,OAAO,EAAE,IAAI,GACd;;AAGH,AAAA,gBAAgB,CAAC;EACf,OAAO,E9DomB6B,GAAG,CADH,IAAI,G8DlmBzC;;AAOD,AAAA,QAAQ,AAAA,QAAQ;AAChB,AAAA,QAAQ,AAAA,OAAO,CAAC;EACd,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,KAAK;EACd,KAAK,EAAE,CAAC;EACR,MAAM,EAAE,CAAC;EACT,YAAY,EAAE,WAAW;EACzB,YAAY,EAAE,KAAK,GACpB;;AAED,AAAA,QAAQ,AAAA,QAAQ,CAAC;EACf,OAAO,EAAE,EAAE;EACX,YAAY,E9DqlBwB,IAA4B,G8DplBjE;;AACD,AAAA,QAAQ,AAAA,OAAO,CAAC;EACd,OAAO,EAAE,EAAE;EACX,YAAY,E9D8kBwB,IAAI,G8D7kBzC;;ACzKD,AAAA,SAAS,CAAC;EACR,QAAQ,EAAE,QAAQ,GACnB;;AAED,AAAA,eAAe,CAAC;EACd,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,QAAQ,EAAE,MAAM,GACjB;;AAED,AAAA,cAAc,CAAC;EACb,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,IAAI;EACb,KAAK,EAAE,IAAI,GAOZ;ElDnBC,MAAM,EAAE,oBAAoB;IkDS9B,AAAA,cAAc,CAAC;M9DIT,UAAU,EDw5BgB,SAAS,CAAC,IAAG,CAAC,WAAW;M+Dr5BrD,mBAAmB,EAAE,MAAM;MAC3B,WAAW,EAAE,MAAM,GAEtB;ElDZ0C,SAAC,EAA/B,SAAS,EAAE,oBAAkB;IkDE1C,AAAA,cAAc,CAAC;M9DIT,UAAU,EDw5BgB,SAAS,CAAC,IAAG,CAAC,WAAW;M+Dr5BrD,mBAAmB,EAAE,MAAM;MAC3B,WAAW,EAAE,MAAM,GAEtB;;AAED,AAAA,cAAc,AAAA,OAAO;AACrB,AAAA,mBAAmB;AACnB,AAAA,mBAAmB,CAAC;EAClB,OAAO,EAAE,IAAI,GACd;;AAED,AAAA,mBAAmB;AACnB,AAAA,mBAAmB,CAAC;EAClB,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,CAAC,GACP;;AlD/BC,MAAM,EAAE,oBAAoB;EkDmC5B,AAAA,mBAAmB,AAAA,mBAAmB;EACtC,AAAA,mBAAmB,AAAA,oBAAoB,CAAC;IACtC,SAAS,EAAE,oBAAoB,GAChC;EAED,AAAA,mBAAmB;EACnB,AAAA,OAAO,AAAA,oBAAoB,CAAC;IAC1B,SAAS,EAAE,uBAAuB,GACnC;EAED,AAAA,mBAAmB;EACnB,AAAA,OAAO,AAAA,mBAAmB,CAAC;IACzB,SAAS,EAAE,wBAAwB,GACpC;;AlDzCwC,SAAC,EAA/B,SAAS,EAAE,oBAAkB;EkD4BxC,AAAA,mBAAmB,AAAA,mBAAmB;EACtC,AAAA,mBAAmB,AAAA,oBAAoB,CAAC;IACtC,SAAS,EAAE,oBAAoB,GAChC;EAED,AAAA,mBAAmB;EACnB,AAAA,OAAO,AAAA,oBAAoB,CAAC;IAC1B,SAAS,EAAE,uBAAuB,GACnC;EAED,AAAA,mBAAmB;EACnB,AAAA,OAAO,AAAA,mBAAmB,CAAC;IACzB,SAAS,EAAE,wBAAwB,GACpC;;AAQH,AAAA,sBAAsB;AACtB,AAAA,sBAAsB,CAAC;EACrB,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,CAAC;EACN,MAAM,EAAE,CAAC;EAET,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,eAAe,EAAE,MAAM;EACvB,KAAK,E/Do1BuC,GAAG;E+Dn1B/C,KAAK,E/D0BE,IAAI;E+DzBX,UAAU,EAAE,MAAM;EAClB,OAAO,E/Dk1BqC,GAAE,G+Dv0B/C;EAvBD,A5DtCI,sB4DsCkB,A5DtCpE,MAAyD,E4DsCX,A5DrCI,sB4DqCkB,A5DrCpE,MAAyD;E4DsCX,A5DvCI,sB4DuCkB,A5DvCpE,MAAyD;E4DuCX,A5DtCI,sB4DsCkB,A5DtCpE,MAAyD,CAAC;I4DuDR,KAAK,E/DkBA,IAAI;I+DjBT,eAAe,EAAE,IAAI;IACrB,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,EAAE,G5DxDV;;A4D2DL,AAAA,sBAAsB,CAAC;EACrB,IAAI,EAAE,CAAC,GACR;;AACD,AAAA,sBAAsB,CAAC;EACrB,KAAK,EAAE,CAAC,GACT;;AAGD,AAAA,2BAA2B;AAC3B,AAAA,2BAA2B,CAAC;EAC1B,OAAO,EAAE,YAAY;EACrB,KAAK,E/Dq0BuC,IAAI;E+Dp0BhD,MAAM,E/Do0BsC,IAAI;E+Dn0BhD,UAAU,EAAE,mCAAmC;EAC/C,eAAe,EAAE,SAAS,GAC3B;;AACD,AAAA,2BAA2B,CAAC;EAC1B,gBAAgB,E/D9BN,2LAA+H,G+D+B1I;;AACD,AAAA,2BAA2B,CAAC;EAC1B,gBAAgB,E/DjCN,6LAA+H,G+DkC1I;;AAQD,AAAA,oBAAoB,CAAC;EACnB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,CAAC;EACR,MAAM,EAAE,IAAI;EACZ,IAAI,EAAE,CAAC;EACP,OAAO,EAAE,EAAE;EACX,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,MAAM;EACvB,YAAY,EAAE,CAAC;EAEf,YAAY,E/D8xBgC,GAAG;E+D7xB/C,WAAW,E/D6xBiC,GAAG;E+D5xB/C,UAAU,EAAE,IAAI,GAqCjB;EAjDD,AAcE,oBAdkB,CAclB,EAAE,CAAC;IACD,QAAQ,EAAE,QAAQ;IAClB,IAAI,EAAE,QAAQ;IACd,SAAS,E/D0xBiC,IAAI;I+DzxB9C,MAAM,E/D0xBoC,GAAG;I+DzxB7C,YAAY,E/D0xB8B,GAAG;I+DzxB7C,WAAW,E/DyxB+B,GAAG;I+DxxB7C,WAAW,EAAE,MAAM;IACnB,MAAM,EAAE,OAAO;IACf,gBAAgB,E/DxCX,wBAAI,G+D6DV;IA5CH,AAcE,oBAdkB,CAclB,EAAE,AAYA,QAAS,CAAC;MACR,QAAQ,EAAE,QAAQ;MAClB,GAAG,EAAE,KAAK;MACV,IAAI,EAAE,CAAC;MACP,OAAO,EAAE,YAAY;MACrB,KAAK,EAAE,IAAI;MACX,MAAM,EAAE,IAAI;MACZ,OAAO,EAAE,EAAE,GACZ;IAlCL,AAcE,oBAdkB,CAclB,EAAE,AAqBA,OAAQ,CAAC;MACP,QAAQ,EAAE,QAAQ;MAClB,MAAM,EAAE,KAAK;MACb,IAAI,EAAE,CAAC;MACP,OAAO,EAAE,YAAY;MACrB,KAAK,EAAE,IAAI;MACX,MAAM,EAAE,IAAI;MACZ,OAAO,EAAE,EAAE,GACZ;EA3CL,AA8CE,oBA9CkB,CA8ClB,OAAO,CAAC;IACN,gBAAgB,E/DhEX,IAAI,G+DiEV;;AAQH,AAAA,iBAAiB,CAAC;EAChB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,GAAsC;EAC7C,MAAM,EAAE,IAAI;EACZ,IAAI,EAAE,GAAsC;EAC5C,OAAO,EAAE,EAAE;EACX,WAAW,EAAE,IAAI;EACjB,cAAc,EAAE,IAAI;EACpB,KAAK,E/DjFE,IAAI;E+DkFX,UAAU,EAAE,MAAM,GACnB;;AEjLD,AAAA,eAAe,CAAI;EAAE,cAAc,EAAE,mBAAmB,GAAK;;AAC7D,AAAA,UAAU,CAAS;EAAE,cAAc,EAAE,cAAc,GAAK;;AACxD,AAAA,aAAa,CAAM;EAAE,cAAc,EAAE,iBAAiB,GAAK;;AAC3D,AAAA,aAAa,CAAM;EAAE,cAAc,EAAE,iBAAiB,GAAK;;AAC3D,AAAA,kBAAkB,CAAC;EAAE,cAAc,EAAE,sBAAsB,GAAK;;AAChE,AAAA,eAAe,CAAI;EAAE,cAAc,EAAE,mBAAmB,GAAK;;ACD7D,AAAA,SAAS,CAAC;EACR,gBAAgB,EAAE,OAAoB,GACvC;;A1CHC,AAAA,WAAW,CAAA;EACT,gBAAgB,E1BQe,OAAO,C0BRb,UAAU,GACpC;;AACD,ArBcE,CqBdD,AAAA,WAAW,ArBc5D,MAAyD,EqBdT,ArBeE,CqBfD,AAAA,WAAW,ArBe5D,MAAyD,CAAC;EqBbN,gBAAgB,EAAE,OAAmB,CAAC,UAAU,GrBejD;;AqBpBH,AAAA,WAAW,CAAA;EACT,gBAAgB,E1BSe,OAAO,C0BTb,UAAU,GACpC;;AACD,ArBcE,CqBdD,AAAA,WAAW,ArBc5D,MAAyD,EqBdT,ArBeE,CqBfD,AAAA,WAAW,ArBe5D,MAAyD,CAAC;EqBbN,gBAAgB,EAAE,OAAmB,CAAC,UAAU,GrBejD;;AqBpBH,AAAA,QAAQ,CAAG;EACT,gBAAgB,E1BUe,OAAO,C0BVb,UAAU,GACpC;;AACD,ArBcE,CqBdD,AAAA,QAAQ,ArBczD,MAAyD,EqBdT,ArBeE,CqBfD,AAAA,QAAQ,ArBezD,MAAyD,CAAC;EqBbN,gBAAgB,EAAE,OAAmB,CAAC,UAAU,GrBejD;;AqBpBH,AAAA,WAAW,CAAA;EACT,gBAAgB,E1BWe,OAAO,C0BXb,UAAU,GACpC;;AACD,ArBcE,CqBdD,AAAA,WAAW,ArBc5D,MAAyD,EqBdT,ArBeE,CqBfD,AAAA,WAAW,ArBe5D,MAAyD,CAAC;EqBbN,gBAAgB,EAAE,OAAmB,CAAC,UAAU,GrBejD;;AqBpBH,AAAA,UAAU,CAAC;EACT,gBAAgB,E1BYe,OAAO,C0BZb,UAAU,GACpC;;AACD,ArBcE,CqBdD,AAAA,UAAU,ArBc3D,MAAyD,EqBdT,ArBeE,CqBfD,AAAA,UAAU,ArBe3D,MAAyD,CAAC;EqBbN,gBAAgB,EAAE,OAAmB,CAAC,UAAU,GrBejD;;AqBpBH,AAAA,WAAW,CAAA;EACT,gBAAgB,ExBsGQ,OAAO,CwBtGN,UAAU,GACpC;;AACD,ArBcE,CqBdD,AAAA,WAAW,ArBc5D,MAAyD,EqBdT,ArBeE,CqBfD,AAAA,WAAW,ArBe5D,MAAyD,CAAC;EqBbN,gBAAgB,EAAE,OAAmB,CAAC,UAAU,GrBejD;;AgEnBL,AAAA,SAAS,CAAQ;EAAE,MAAM,EAAE,YAAY,GAAK;;AAC5C,AAAA,aAAa,CAAI;EAAE,UAAU,EAAE,YAAY,GAAK;;AAChD,AAAA,eAAe,CAAE;EAAE,YAAY,EAAE,YAAY,GAAK;;AAClD,AAAA,gBAAgB,CAAC;EAAE,aAAa,EAAE,YAAY,GAAK;;AACnD,AAAA,cAAc,CAAG;EAAE,WAAW,EAAE,YAAY,GAAK;;AAMjD,AAAA,QAAQ,CAAC;E1CVL,aAAa,EzB4TQ,OAAM,GmEhT9B;;AACD,AAAA,YAAY,CAAC;E1CPT,uBAAuB,EzBsTF,OAAM;EyBrT3B,sBAAsB,EzBqTD,OAAM,GmE7S9B;;AACD,AAAA,cAAc,CAAC;E1CHX,0BAA0B,EzB+SL,OAAM;EyB9S3B,uBAAuB,EzB8SF,OAAM,GmE1S9B;;AACD,AAAA,eAAe,CAAC;E1CCZ,0BAA0B,EzBwSL,OAAM;EyBvS3B,yBAAyB,EzBuSJ,OAAM,GmEvS9B;;AACD,AAAA,aAAa,CAAC;E1CKV,yBAAyB,EzBiSJ,OAAM;EyBhS3B,sBAAsB,EzBgSD,OAAM,GmEpS9B;;AAED,AAAA,eAAe,CAAC;EACd,aAAa,EAAE,GAAG,GACnB;;AAED,AAAA,UAAU,CAAC;EACT,aAAa,EAAE,CAAC,GACjB;;ACpCD,AzCCE,SyCDO,AzCCR,OAAS,CAAC;EACP,OAAO,EAAE,KAAK;EACd,OAAO,EAAE,EAAE;EACX,KAAK,EAAE,IAAI,GACZ;;A0CGC,AAAA,OAAO,CAAkB;EAAE,OAAO,EAAE,eAAe,GAAK;;AACxD,AAAA,SAAS,CAAgB;EAAE,OAAO,EAAE,iBAAiB,GAAK;;AAC1D,AAAA,eAAe,CAAU;EAAE,OAAO,EAAE,uBAAuB,GAAK;;AAChE,AAAA,QAAQ,CAAiB;EAAE,OAAO,EAAE,gBAAgB,GAAK;;AACzD,AAAA,QAAQ,CAAiB;EAAE,OAAO,EAAE,gBAAgB,GAAK;;AACzD,AAAA,aAAa,CAAY;EAAE,OAAO,EAAE,qBAAqB,GAAK;;AAC9D,AAAA,OAAO,CAAkB;EAAE,OAAO,EAAE,eAAe,GAAK;;AACxD,AAAA,cAAc,CAAW;EAAE,OAAO,EAAE,sBAAsB,GAAK;;AnEyC/D,MAAM,EAAE,SAAS,EAAE,KAAK;EmEhDxB,AAAA,UAAU,CAAe;IAAE,OAAO,EAAE,eAAe,GAAK;EACxD,AAAA,YAAY,CAAa;IAAE,OAAO,EAAE,iBAAiB,GAAK;EAC1D,AAAA,kBAAkB,CAAO;IAAE,OAAO,EAAE,uBAAuB,GAAK;EAChE,AAAA,WAAW,CAAc;IAAE,OAAO,EAAE,gBAAgB,GAAK;EACzD,AAAA,WAAW,CAAc;IAAE,OAAO,EAAE,gBAAgB,GAAK;EACzD,AAAA,gBAAgB,CAAS;IAAE,OAAO,EAAE,qBAAqB,GAAK;EAC9D,AAAA,UAAU,CAAe;IAAE,OAAO,EAAE,eAAe,GAAK;EACxD,AAAA,iBAAiB,CAAQ;IAAE,OAAO,EAAE,sBAAsB,GAAK;;AnEyC/D,MAAM,EAAE,SAAS,EAAE,KAAK;EmEhDxB,AAAA,UAAU,CAAe;IAAE,OAAO,EAAE,eAAe,GAAK;EACxD,AAAA,YAAY,CAAa;IAAE,OAAO,EAAE,iBAAiB,GAAK;EAC1D,AAAA,kBAAkB,CAAO;IAAE,OAAO,EAAE,uBAAuB,GAAK;EAChE,AAAA,WAAW,CAAc;IAAE,OAAO,EAAE,gBAAgB,GAAK;EACzD,AAAA,WAAW,CAAc;IAAE,OAAO,EAAE,gBAAgB,GAAK;EACzD,AAAA,gBAAgB,CAAS;IAAE,OAAO,EAAE,qBAAqB,GAAK;EAC9D,AAAA,UAAU,CAAe;IAAE,OAAO,EAAE,eAAe,GAAK;EACxD,AAAA,iBAAiB,CAAQ;IAAE,OAAO,EAAE,sBAAsB,GAAK;;AnEyC/D,MAAM,EAAE,SAAS,EAAE,KAAK;EmEhDxB,AAAA,UAAU,CAAe;IAAE,OAAO,EAAE,eAAe,GAAK;EACxD,AAAA,YAAY,CAAa;IAAE,OAAO,EAAE,iBAAiB,GAAK;EAC1D,AAAA,kBAAkB,CAAO;IAAE,OAAO,EAAE,uBAAuB,GAAK;EAChE,AAAA,WAAW,CAAc;IAAE,OAAO,EAAE,gBAAgB,GAAK;EACzD,AAAA,WAAW,CAAc;IAAE,OAAO,EAAE,gBAAgB,GAAK;EACzD,AAAA,gBAAgB,CAAS;IAAE,OAAO,EAAE,qBAAqB,GAAK;EAC9D,AAAA,UAAU,CAAe;IAAE,OAAO,EAAE,eAAe,GAAK;EACxD,AAAA,iBAAiB,CAAQ;IAAE,OAAO,EAAE,sBAAsB,GAAK;;AnEyC/D,MAAM,EAAE,SAAS,EAAE,MAAM;EmEhDzB,AAAA,UAAU,CAAe;IAAE,OAAO,EAAE,eAAe,GAAK;EACxD,AAAA,YAAY,CAAa;IAAE,OAAO,EAAE,iBAAiB,GAAK;EAC1D,AAAA,kBAAkB,CAAO;IAAE,OAAO,EAAE,uBAAuB,GAAK;EAChE,AAAA,WAAW,CAAc;IAAE,OAAO,EAAE,gBAAgB,GAAK;EACzD,AAAA,WAAW,CAAc;IAAE,OAAO,EAAE,gBAAgB,GAAK;EACzD,AAAA,gBAAgB,CAAS;IAAE,OAAO,EAAE,qBAAqB,GAAK;EAC9D,AAAA,UAAU,CAAe;IAAE,OAAO,EAAE,eAAe,GAAK;EACxD,AAAA,iBAAiB,CAAQ;IAAE,OAAO,EAAE,sBAAsB,GAAK;;ACP/D,AAAA,WAAW,CAAc;EAAE,KAAK,EAAE,EAAE,GAAK;;AACzC,AAAA,UAAU,CAAe;EAAE,KAAK,EAAE,CAAC,GAAK;;AACxC,AAAA,eAAe,CAAU;EAAE,KAAK,EAAE,CAAC,GAAK;;AAExC,AAAA,SAAS,CAAqB;EAAE,cAAc,EAAE,cAAc,GAAK;;AACnE,AAAA,YAAY,CAAkB;EAAE,cAAc,EAAE,iBAAiB,GAAK;;AACtE,AAAA,iBAAiB,CAAa;EAAE,cAAc,EAAE,sBAAsB,GAAK;;AAC3E,AAAA,oBAAoB,CAAU;EAAE,cAAc,EAAE,yBAAyB,GAAK;;AAE9E,AAAA,UAAU,CAAkB;EAAE,SAAS,EAAE,eAAe,GAAK;;AAC7D,AAAA,YAAY,CAAgB;EAAE,SAAS,EAAE,iBAAiB,GAAK;;AAC/D,AAAA,kBAAkB,CAAU;EAAE,SAAS,EAAE,uBAAuB,GAAK;;AAErE,AAAA,sBAAsB,CAAY;EAAE,eAAe,EAAE,qBAAqB,GAAK;;AAC/E,AAAA,oBAAoB,CAAc;EAAE,eAAe,EAAE,mBAAmB,GAAK;;AAC7E,AAAA,uBAAuB,CAAW;EAAE,eAAe,EAAE,iBAAiB,GAAK;;AAC3E,AAAA,wBAAwB,CAAU;EAAE,eAAe,EAAE,wBAAwB,GAAK;;AAClF,AAAA,uBAAuB,CAAW;EAAE,eAAe,EAAE,uBAAuB,GAAK;;AAEjF,AAAA,kBAAkB,CAAa;EAAE,WAAW,EAAE,qBAAqB,GAAK;;AACxE,AAAA,gBAAgB,CAAe;EAAE,WAAW,EAAE,mBAAmB,GAAK;;AACtE,AAAA,mBAAmB,CAAY;EAAE,WAAW,EAAE,iBAAiB,GAAK;;AACpE,AAAA,qBAAqB,CAAU;EAAE,WAAW,EAAE,mBAAmB,GAAK;;AACtE,AAAA,oBAAoB,CAAW;EAAE,WAAW,EAAE,kBAAkB,GAAK;;AAErE,AAAA,oBAAoB,CAAY;EAAE,aAAa,EAAE,qBAAqB,GAAK;;AAC3E,AAAA,kBAAkB,CAAc;EAAE,aAAa,EAAE,mBAAmB,GAAK;;AACzE,AAAA,qBAAqB,CAAW;EAAE,aAAa,EAAE,iBAAiB,GAAK;;AACvE,AAAA,sBAAsB,CAAU;EAAE,aAAa,EAAE,wBAAwB,GAAK;;AAC9E,AAAA,qBAAqB,CAAW;EAAE,aAAa,EAAE,uBAAuB,GAAK;;AAC7E,AAAA,sBAAsB,CAAU;EAAE,aAAa,EAAE,kBAAkB,GAAK;;AAExE,AAAA,gBAAgB,CAAc;EAAE,UAAU,EAAE,eAAe,GAAK;;AAChE,AAAA,iBAAiB,CAAa;EAAE,UAAU,EAAE,qBAAqB,GAAK;;AACtE,AAAA,eAAe,CAAe;EAAE,UAAU,EAAE,mBAAmB,GAAK;;AACpE,AAAA,kBAAkB,CAAY;EAAE,UAAU,EAAE,iBAAiB,GAAK;;AAClE,AAAA,oBAAoB,CAAU;EAAE,UAAU,EAAE,mBAAmB,GAAK;;AACpE,AAAA,mBAAmB,CAAW;EAAE,UAAU,EAAE,kBAAkB,GAAK;;ApEWnE,MAAM,EAAE,SAAS,EAAE,KAAK;EoEhDxB,AAAA,cAAc,CAAW;IAAE,KAAK,EAAE,EAAE,GAAK;EACzC,AAAA,aAAa,CAAY;IAAE,KAAK,EAAE,CAAC,GAAK;EACxC,AAAA,kBAAkB,CAAO;IAAE,KAAK,EAAE,CAAC,GAAK;EAExC,AAAA,YAAY,CAAkB;IAAE,cAAc,EAAE,cAAc,GAAK;EACnE,AAAA,eAAe,CAAe;IAAE,cAAc,EAAE,iBAAiB,GAAK;EACtE,AAAA,oBAAoB,CAAU;IAAE,cAAc,EAAE,sBAAsB,GAAK;EAC3E,AAAA,uBAAuB,CAAO;IAAE,cAAc,EAAE,yBAAyB,GAAK;EAE9E,AAAA,aAAa,CAAe;IAAE,SAAS,EAAE,eAAe,GAAK;EAC7D,AAAA,eAAe,CAAa;IAAE,SAAS,EAAE,iBAAiB,GAAK;EAC/D,AAAA,qBAAqB,CAAO;IAAE,SAAS,EAAE,uBAAuB,GAAK;EAErE,AAAA,yBAAyB,CAAS;IAAE,eAAe,EAAE,qBAAqB,GAAK;EAC/E,AAAA,uBAAuB,CAAW;IAAE,eAAe,EAAE,mBAAmB,GAAK;EAC7E,AAAA,0BAA0B,CAAQ;IAAE,eAAe,EAAE,iBAAiB,GAAK;EAC3E,AAAA,2BAA2B,CAAO;IAAE,eAAe,EAAE,wBAAwB,GAAK;EAClF,AAAA,0BAA0B,CAAQ;IAAE,eAAe,EAAE,uBAAuB,GAAK;EAEjF,AAAA,qBAAqB,CAAU;IAAE,WAAW,EAAE,qBAAqB,GAAK;EACxE,AAAA,mBAAmB,CAAY;IAAE,WAAW,EAAE,mBAAmB,GAAK;EACtE,AAAA,sBAAsB,CAAS;IAAE,WAAW,EAAE,iBAAiB,GAAK;EACpE,AAAA,wBAAwB,CAAO;IAAE,WAAW,EAAE,mBAAmB,GAAK;EACtE,AAAA,uBAAuB,CAAQ;IAAE,WAAW,EAAE,kBAAkB,GAAK;EAErE,AAAA,uBAAuB,CAAS;IAAE,aAAa,EAAE,qBAAqB,GAAK;EAC3E,AAAA,qBAAqB,CAAW;IAAE,aAAa,EAAE,mBAAmB,GAAK;EACzE,AAAA,wBAAwB,CAAQ;IAAE,aAAa,EAAE,iBAAiB,GAAK;EACvE,AAAA,yBAAyB,CAAO;IAAE,aAAa,EAAE,wBAAwB,GAAK;EAC9E,AAAA,wBAAwB,CAAQ;IAAE,aAAa,EAAE,uBAAuB,GAAK;EAC7E,AAAA,yBAAyB,CAAO;IAAE,aAAa,EAAE,kBAAkB,GAAK;EAExE,AAAA,mBAAmB,CAAW;IAAE,UAAU,EAAE,eAAe,GAAK;EAChE,AAAA,oBAAoB,CAAU;IAAE,UAAU,EAAE,qBAAqB,GAAK;EACtE,AAAA,kBAAkB,CAAY;IAAE,UAAU,EAAE,mBAAmB,GAAK;EACpE,AAAA,qBAAqB,CAAS;IAAE,UAAU,EAAE,iBAAiB,GAAK;EAClE,AAAA,uBAAuB,CAAO;IAAE,UAAU,EAAE,mBAAmB,GAAK;EACpE,AAAA,sBAAsB,CAAQ;IAAE,UAAU,EAAE,kBAAkB,GAAK;;ApEWnE,MAAM,EAAE,SAAS,EAAE,KAAK;EoEhDxB,AAAA,cAAc,CAAW;IAAE,KAAK,EAAE,EAAE,GAAK;EACzC,AAAA,aAAa,CAAY;IAAE,KAAK,EAAE,CAAC,GAAK;EACxC,AAAA,kBAAkB,CAAO;IAAE,KAAK,EAAE,CAAC,GAAK;EAExC,AAAA,YAAY,CAAkB;IAAE,cAAc,EAAE,cAAc,GAAK;EACnE,AAAA,eAAe,CAAe;IAAE,cAAc,EAAE,iBAAiB,GAAK;EACtE,AAAA,oBAAoB,CAAU;IAAE,cAAc,EAAE,sBAAsB,GAAK;EAC3E,AAAA,uBAAuB,CAAO;IAAE,cAAc,EAAE,yBAAyB,GAAK;EAE9E,AAAA,aAAa,CAAe;IAAE,SAAS,EAAE,eAAe,GAAK;EAC7D,AAAA,eAAe,CAAa;IAAE,SAAS,EAAE,iBAAiB,GAAK;EAC/D,AAAA,qBAAqB,CAAO;IAAE,SAAS,EAAE,uBAAuB,GAAK;EAErE,AAAA,yBAAyB,CAAS;IAAE,eAAe,EAAE,qBAAqB,GAAK;EAC/E,AAAA,uBAAuB,CAAW;IAAE,eAAe,EAAE,mBAAmB,GAAK;EAC7E,AAAA,0BAA0B,CAAQ;IAAE,eAAe,EAAE,iBAAiB,GAAK;EAC3E,AAAA,2BAA2B,CAAO;IAAE,eAAe,EAAE,wBAAwB,GAAK;EAClF,AAAA,0BAA0B,CAAQ;IAAE,eAAe,EAAE,uBAAuB,GAAK;EAEjF,AAAA,qBAAqB,CAAU;IAAE,WAAW,EAAE,qBAAqB,GAAK;EACxE,AAAA,mBAAmB,CAAY;IAAE,WAAW,EAAE,mBAAmB,GAAK;EACtE,AAAA,sBAAsB,CAAS;IAAE,WAAW,EAAE,iBAAiB,GAAK;EACpE,AAAA,wBAAwB,CAAO;IAAE,WAAW,EAAE,mBAAmB,GAAK;EACtE,AAAA,uBAAuB,CAAQ;IAAE,WAAW,EAAE,kBAAkB,GAAK;EAErE,AAAA,uBAAuB,CAAS;IAAE,aAAa,EAAE,qBAAqB,GAAK;EAC3E,AAAA,qBAAqB,CAAW;IAAE,aAAa,EAAE,mBAAmB,GAAK;EACzE,AAAA,wBAAwB,CAAQ;IAAE,aAAa,EAAE,iBAAiB,GAAK;EACvE,AAAA,yBAAyB,CAAO;IAAE,aAAa,EAAE,wBAAwB,GAAK;EAC9E,AAAA,wBAAwB,CAAQ;IAAE,aAAa,EAAE,uBAAuB,GAAK;EAC7E,AAAA,yBAAyB,CAAO;IAAE,aAAa,EAAE,kBAAkB,GAAK;EAExE,AAAA,mBAAmB,CAAW;IAAE,UAAU,EAAE,eAAe,GAAK;EAChE,AAAA,oBAAoB,CAAU;IAAE,UAAU,EAAE,qBAAqB,GAAK;EACtE,AAAA,kBAAkB,CAAY;IAAE,UAAU,EAAE,mBAAmB,GAAK;EACpE,AAAA,qBAAqB,CAAS;IAAE,UAAU,EAAE,iBAAiB,GAAK;EAClE,AAAA,uBAAuB,CAAO;IAAE,UAAU,EAAE,mBAAmB,GAAK;EACpE,AAAA,sBAAsB,CAAQ;IAAE,UAAU,EAAE,kBAAkB,GAAK;;ApEWnE,MAAM,EAAE,SAAS,EAAE,KAAK;EoEhDxB,AAAA,cAAc,CAAW;IAAE,KAAK,EAAE,EAAE,GAAK;EACzC,AAAA,aAAa,CAAY;IAAE,KAAK,EAAE,CAAC,GAAK;EACxC,AAAA,kBAAkB,CAAO;IAAE,KAAK,EAAE,CAAC,GAAK;EAExC,AAAA,YAAY,CAAkB;IAAE,cAAc,EAAE,cAAc,GAAK;EACnE,AAAA,eAAe,CAAe;IAAE,cAAc,EAAE,iBAAiB,GAAK;EACtE,AAAA,oBAAoB,CAAU;IAAE,cAAc,EAAE,sBAAsB,GAAK;EAC3E,AAAA,uBAAuB,CAAO;IAAE,cAAc,EAAE,yBAAyB,GAAK;EAE9E,AAAA,aAAa,CAAe;IAAE,SAAS,EAAE,eAAe,GAAK;EAC7D,AAAA,eAAe,CAAa;IAAE,SAAS,EAAE,iBAAiB,GAAK;EAC/D,AAAA,qBAAqB,CAAO;IAAE,SAAS,EAAE,uBAAuB,GAAK;EAErE,AAAA,yBAAyB,CAAS;IAAE,eAAe,EAAE,qBAAqB,GAAK;EAC/E,AAAA,uBAAuB,CAAW;IAAE,eAAe,EAAE,mBAAmB,GAAK;EAC7E,AAAA,0BAA0B,CAAQ;IAAE,eAAe,EAAE,iBAAiB,GAAK;EAC3E,AAAA,2BAA2B,CAAO;IAAE,eAAe,EAAE,wBAAwB,GAAK;EAClF,AAAA,0BAA0B,CAAQ;IAAE,eAAe,EAAE,uBAAuB,GAAK;EAEjF,AAAA,qBAAqB,CAAU;IAAE,WAAW,EAAE,qBAAqB,GAAK;EACxE,AAAA,mBAAmB,CAAY;IAAE,WAAW,EAAE,mBAAmB,GAAK;EACtE,AAAA,sBAAsB,CAAS;IAAE,WAAW,EAAE,iBAAiB,GAAK;EACpE,AAAA,wBAAwB,CAAO;IAAE,WAAW,EAAE,mBAAmB,GAAK;EACtE,AAAA,uBAAuB,CAAQ;IAAE,WAAW,EAAE,kBAAkB,GAAK;EAErE,AAAA,uBAAuB,CAAS;IAAE,aAAa,EAAE,qBAAqB,GAAK;EAC3E,AAAA,qBAAqB,CAAW;IAAE,aAAa,EAAE,mBAAmB,GAAK;EACzE,AAAA,wBAAwB,CAAQ;IAAE,aAAa,EAAE,iBAAiB,GAAK;EACvE,AAAA,yBAAyB,CAAO;IAAE,aAAa,EAAE,wBAAwB,GAAK;EAC9E,AAAA,wBAAwB,CAAQ;IAAE,aAAa,EAAE,uBAAuB,GAAK;EAC7E,AAAA,yBAAyB,CAAO;IAAE,aAAa,EAAE,kBAAkB,GAAK;EAExE,AAAA,mBAAmB,CAAW;IAAE,UAAU,EAAE,eAAe,GAAK;EAChE,AAAA,oBAAoB,CAAU;IAAE,UAAU,EAAE,qBAAqB,GAAK;EACtE,AAAA,kBAAkB,CAAY;IAAE,UAAU,EAAE,mBAAmB,GAAK;EACpE,AAAA,qBAAqB,CAAS;IAAE,UAAU,EAAE,iBAAiB,GAAK;EAClE,AAAA,uBAAuB,CAAO;IAAE,UAAU,EAAE,mBAAmB,GAAK;EACpE,AAAA,sBAAsB,CAAQ;IAAE,UAAU,EAAE,kBAAkB,GAAK;;ApEWnE,MAAM,EAAE,SAAS,EAAE,MAAM;EoEhDzB,AAAA,cAAc,CAAW;IAAE,KAAK,EAAE,EAAE,GAAK;EACzC,AAAA,aAAa,CAAY;IAAE,KAAK,EAAE,CAAC,GAAK;EACxC,AAAA,kBAAkB,CAAO;IAAE,KAAK,EAAE,CAAC,GAAK;EAExC,AAAA,YAAY,CAAkB;IAAE,cAAc,EAAE,cAAc,GAAK;EACnE,AAAA,eAAe,CAAe;IAAE,cAAc,EAAE,iBAAiB,GAAK;EACtE,AAAA,oBAAoB,CAAU;IAAE,cAAc,EAAE,sBAAsB,GAAK;EAC3E,AAAA,uBAAuB,CAAO;IAAE,cAAc,EAAE,yBAAyB,GAAK;EAE9E,AAAA,aAAa,CAAe;IAAE,SAAS,EAAE,eAAe,GAAK;EAC7D,AAAA,eAAe,CAAa;IAAE,SAAS,EAAE,iBAAiB,GAAK;EAC/D,AAAA,qBAAqB,CAAO;IAAE,SAAS,EAAE,uBAAuB,GAAK;EAErE,AAAA,yBAAyB,CAAS;IAAE,eAAe,EAAE,qBAAqB,GAAK;EAC/E,AAAA,uBAAuB,CAAW;IAAE,eAAe,EAAE,mBAAmB,GAAK;EAC7E,AAAA,0BAA0B,CAAQ;IAAE,eAAe,EAAE,iBAAiB,GAAK;EAC3E,AAAA,2BAA2B,CAAO;IAAE,eAAe,EAAE,wBAAwB,GAAK;EAClF,AAAA,0BAA0B,CAAQ;IAAE,eAAe,EAAE,uBAAuB,GAAK;EAEjF,AAAA,qBAAqB,CAAU;IAAE,WAAW,EAAE,qBAAqB,GAAK;EACxE,AAAA,mBAAmB,CAAY;IAAE,WAAW,EAAE,mBAAmB,GAAK;EACtE,AAAA,sBAAsB,CAAS;IAAE,WAAW,EAAE,iBAAiB,GAAK;EACpE,AAAA,wBAAwB,CAAO;IAAE,WAAW,EAAE,mBAAmB,GAAK;EACtE,AAAA,uBAAuB,CAAQ;IAAE,WAAW,EAAE,kBAAkB,GAAK;EAErE,AAAA,uBAAuB,CAAS;IAAE,aAAa,EAAE,qBAAqB,GAAK;EAC3E,AAAA,qBAAqB,CAAW;IAAE,aAAa,EAAE,mBAAmB,GAAK;EACzE,AAAA,wBAAwB,CAAQ;IAAE,aAAa,EAAE,iBAAiB,GAAK;EACvE,AAAA,yBAAyB,CAAO;IAAE,aAAa,EAAE,wBAAwB,GAAK;EAC9E,AAAA,wBAAwB,CAAQ;IAAE,aAAa,EAAE,uBAAuB,GAAK;EAC7E,AAAA,yBAAyB,CAAO;IAAE,aAAa,EAAE,kBAAkB,GAAK;EAExE,AAAA,mBAAmB,CAAW;IAAE,UAAU,EAAE,eAAe,GAAK;EAChE,AAAA,oBAAoB,CAAU;IAAE,UAAU,EAAE,qBAAqB,GAAK;EACtE,AAAA,kBAAkB,CAAY;IAAE,UAAU,EAAE,mBAAmB,GAAK;EACpE,AAAA,qBAAqB,CAAS;IAAE,UAAU,EAAE,iBAAiB,GAAK;EAClE,AAAA,uBAAuB,CAAO;IAAE,UAAU,EAAE,mBAAmB,GAAK;EACpE,AAAA,sBAAsB,CAAQ;IAAE,UAAU,EAAE,kBAAkB,GAAK;;ACzCnE,AAAA,WAAW,CAAW;EzCHxB,KAAK,EAAE,eAAe,GyCG2B;;AAC/C,AAAA,YAAY,CAAU;EzCDxB,KAAK,EAAE,gBAAgB,GyCC2B;;AAChD,AAAA,WAAW,CAAW;EzCCxB,KAAK,EAAE,eAAe,GyCD2B;;ArEkD/C,MAAM,EAAE,SAAS,EAAE,KAAK;EqEpDxB,AAAA,cAAc,CAAQ;IzCHxB,KAAK,EAAE,eAAe,GyCG2B;EAC/C,AAAA,eAAe,CAAO;IzCDxB,KAAK,EAAE,gBAAgB,GyCC2B;EAChD,AAAA,cAAc,CAAQ;IzCCxB,KAAK,EAAE,eAAe,GyCD2B;;ArEkD/C,MAAM,EAAE,SAAS,EAAE,KAAK;EqEpDxB,AAAA,cAAc,CAAQ;IzCHxB,KAAK,EAAE,eAAe,GyCG2B;EAC/C,AAAA,eAAe,CAAO;IzCDxB,KAAK,EAAE,gBAAgB,GyCC2B;EAChD,AAAA,cAAc,CAAQ;IzCCxB,KAAK,EAAE,eAAe,GyCD2B;;ArEkD/C,MAAM,EAAE,SAAS,EAAE,KAAK;EqEpDxB,AAAA,cAAc,CAAQ;IzCHxB,KAAK,EAAE,eAAe,GyCG2B;EAC/C,AAAA,eAAe,CAAO;IzCDxB,KAAK,EAAE,gBAAgB,GyCC2B;EAChD,AAAA,cAAc,CAAQ;IzCCxB,KAAK,EAAE,eAAe,GyCD2B;;ArEkD/C,MAAM,EAAE,SAAS,EAAE,MAAM;EqEpDzB,AAAA,cAAc,CAAQ;IzCHxB,KAAK,EAAE,eAAe,GyCG2B;EAC/C,AAAA,eAAe,CAAO;IzCDxB,KAAK,EAAE,gBAAgB,GyCC2B;EAChD,AAAA,cAAc,CAAQ;IzCCxB,KAAK,EAAE,eAAe,GyCD2B;;ACJnD,AAAA,UAAU,CAAC;EACT,QAAQ,EAAE,KAAK;EACf,GAAG,EAAE,CAAC;EACN,KAAK,EAAE,CAAC;EACR,IAAI,EAAE,CAAC;EACP,OAAO,ExE0kBmB,IAAI,GwEzkB/B;;AAED,AAAA,aAAa,CAAC;EACZ,QAAQ,EAAE,KAAK;EACf,KAAK,EAAE,CAAC;EACR,MAAM,EAAE,CAAC;EACT,IAAI,EAAE,CAAC;EACP,OAAO,ExEkkBmB,IAAI,GwEjkB/B;;AAED,AAAA,WAAW,CAAC;EACV,QAAQ,EAAE,MAAM;EAChB,GAAG,EAAE,CAAC;EACN,OAAO,ExE6jBmB,IAAI,GwE5jB/B;;AClBD,AAAA,QAAQ,CAAC;ElECP,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,CAAC;EACV,MAAM,EAAE,IAAI;EACZ,QAAQ,EAAE,MAAM;EAChB,IAAI,EAAE,gBAAa;EACnB,MAAM,EAAE,CAAC,GkENV;;AAED,AlEcE,kBkEdgB,AlEchB,OAAQ,EkEdV,AlEeE,kBkEfgB,AlEehB,MAAO,CAAC;EACN,QAAQ,EAAE,MAAM;EAChB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,CAAC;EACT,QAAQ,EAAE,OAAO;EACjB,IAAI,EAAE,IAAI,GACX;;AmE1BC,AAAA,KAAK,CAAgB;EAAE,KAAQ,E1EyK7B,GAAG,C0EzKoC,UAAU,GAAI;;AAAvD,AAAA,KAAK,CAAgB;EAAE,KAAQ,E1E0K7B,GAAG,C0E1KoC,UAAU,GAAI;;AAAvD,AAAA,KAAK,CAAgB;EAAE,KAAQ,E1E2K7B,GAAG,C0E3KoC,UAAU,GAAI;;AAAvD,AAAA,MAAM,CAAe;EAAE,KAAQ,E1E4K5B,IAAI,C0E5KkC,UAAU,GAAI;;AAAvD,AAAA,KAAK,CAAgB;EAAE,MAAQ,E1EyK7B,GAAG,C0EzKoC,UAAU,GAAI;;AAAvD,AAAA,KAAK,CAAgB;EAAE,MAAQ,E1E0K7B,GAAG,C0E1KoC,UAAU,GAAI;;AAAvD,AAAA,KAAK,CAAgB;EAAE,MAAQ,E1E2K7B,GAAG,C0E3KoC,UAAU,GAAI;;AAAvD,AAAA,MAAM,CAAe;EAAE,MAAQ,E1E4K5B,IAAI,C0E5KkC,UAAU,GAAI;;AAI3D,AAAA,OAAO,CAAC;EAAE,SAAS,EAAE,eAAe,GAAK;;AACzC,AAAA,OAAO,CAAC;EAAE,UAAU,EAAE,eAAe,GAAK;;ACElC,AAAA,IAAI,CAA2B;EAAE,MAAQ,E3EuI1C,CAAC,CADD,CAAC,C2EtIsE,UAAU,GAAI;;AACpF,AAAA,KAAK,CAA0B;EAAE,UAAY,E3EsI9C,CAAC,C2EtIgE,UAAU,GAAI;;AAC9E,AAAA,KAAK,CAA0B;EAAE,YAAc,E3EoIhD,CAAC,C2EpIkE,UAAU,GAAI;;AAChF,AAAA,KAAK,CAA0B;EAAE,aAAe,E3EoIjD,CAAC,C2EpImE,UAAU,GAAI;;AACjF,AAAA,KAAK,CAA0B;EAAE,WAAa,E3EkI/C,CAAC,C2ElIiE,UAAU,GAAI;;AAC/E,AAAA,KAAK,CAA0B;EAC7B,YAAc,E3EgIjB,CAAC,C2EhIkC,UAAU;EAC1C,WAAa,E3E+HhB,CAAC,C2E/HiC,UAAU,GAC1C;;AACD,AAAA,KAAK,CAA0B;EAC7B,UAAY,E3E6Hf,CAAC,C2E7HiC,UAAU;EACzC,aAAe,E3E4HlB,CAAC,C2E5HoC,UAAU,GAC7C;;AAZD,AAAA,IAAI,CAA2B;EAAE,MAAQ,E3E2I1C,OAAiB,CADjB,OAAiB,C2E1IsD,UAAU,GAAI;;AACpF,AAAA,KAAK,CAA0B;EAAE,UAAY,E3E0I9C,OAAiB,C2E1IgD,UAAU,GAAI;;AAC9E,AAAA,KAAK,CAA0B;EAAE,YAAc,E3EwIhD,OAAiB,C2ExIkD,UAAU,GAAI;;AAChF,AAAA,KAAK,CAA0B;EAAE,aAAe,E3EwIjD,OAAiB,C2ExImD,UAAU,GAAI;;AACjF,AAAA,KAAK,CAA0B;EAAE,WAAa,E3EsI/C,OAAiB,C2EtIiD,UAAU,GAAI;;AAC/E,AAAA,KAAK,CAA0B;EAC7B,YAAc,E3EoIjB,OAAiB,C2EpIkB,UAAU;EAC1C,WAAa,E3EmIhB,OAAiB,C2EnIiB,UAAU,GAC1C;;AACD,AAAA,KAAK,CAA0B;EAC7B,UAAY,E3EiIf,OAAiB,C2EjIiB,UAAU;EACzC,aAAe,E3EgIlB,OAAiB,C2EhIoB,UAAU,GAC7C;;AAZD,AAAA,IAAI,CAA2B;EAAE,MAAQ,E3E+I1C,MAAgB,CADhB,MAAgB,C2E9IuD,UAAU,GAAI;;AACpF,AAAA,KAAK,CAA0B;EAAE,UAAY,E3E8I9C,MAAgB,C2E9IiD,UAAU,GAAI;;AAC9E,AAAA,KAAK,CAA0B;EAAE,YAAc,E3E4IhD,MAAgB,C2E5ImD,UAAU,GAAI;;AAChF,AAAA,KAAK,CAA0B;EAAE,aAAe,E3E4IjD,MAAgB,C2E5IoD,UAAU,GAAI;;AACjF,AAAA,KAAK,CAA0B;EAAE,WAAa,E3E0I/C,MAAgB,C2E1IkD,UAAU,GAAI;;AAC/E,AAAA,KAAK,CAA0B;EAC7B,YAAc,E3EwIjB,MAAgB,C2ExImB,UAAU;EAC1C,WAAa,E3EuIhB,MAAgB,C2EvIkB,UAAU,GAC1C;;AACD,AAAA,KAAK,CAA0B;EAC7B,UAAY,E3EqIf,MAAgB,C2ErIkB,UAAU;EACzC,aAAe,E3EoIlB,MAAgB,C2EpIqB,UAAU,GAC7C;;AAZD,AAAA,IAAI,CAA2B;EAAE,MAAQ,E3EiItC,IAAI,CAAJ,IAAI,C2EjI+D,UAAU,GAAI;;AACpF,AAAA,KAAK,CAA0B;EAAE,UAAY,E3EgI1C,IAAI,C2EhIyD,UAAU,GAAI;;AAC9E,AAAA,KAAK,CAA0B;EAAE,YAAc,E3E+H5C,IAAI,C2E/H2D,UAAU,GAAI;;AAChF,AAAA,KAAK,CAA0B;EAAE,aAAe,E3E8H7C,IAAI,C2E9H4D,UAAU,GAAI;;AACjF,AAAA,KAAK,CAA0B;EAAE,WAAa,E3E6H3C,IAAI,C2E7H0D,UAAU,GAAI;;AAC/E,AAAA,KAAK,CAA0B;EAC7B,YAAc,E3E2Hb,IAAI,C2E3H2B,UAAU;EAC1C,WAAa,E3E0HZ,IAAI,C2E1H0B,UAAU,GAC1C;;AACD,AAAA,KAAK,CAA0B;EAC7B,UAAY,E3EuHX,IAAI,C2EvH0B,UAAU;EACzC,aAAe,E3EsHd,IAAI,C2EtH6B,UAAU,GAC7C;;AAZD,AAAA,IAAI,CAA2B;EAAE,MAAQ,E3EuJ1C,MAAiB,CADjB,MAAiB,C2EtJsD,UAAU,GAAI;;AACpF,AAAA,KAAK,CAA0B;EAAE,UAAY,E3EsJ9C,MAAiB,C2EtJgD,UAAU,GAAI;;AAC9E,AAAA,KAAK,CAA0B;EAAE,YAAc,E3EoJhD,MAAiB,C2EpJkD,UAAU,GAAI;;AAChF,AAAA,KAAK,CAA0B;EAAE,aAAe,E3EoJjD,MAAiB,C2EpJmD,UAAU,GAAI;;AACjF,AAAA,KAAK,CAA0B;EAAE,WAAa,E3EkJ/C,MAAiB,C2ElJiD,UAAU,GAAI;;AAC/E,AAAA,KAAK,CAA0B;EAC7B,YAAc,E3EgJjB,MAAiB,C2EhJkB,UAAU;EAC1C,WAAa,E3E+IhB,MAAiB,C2E/IiB,UAAU,GAC1C;;AACD,AAAA,KAAK,CAA0B;EAC7B,UAAY,E3E6If,MAAiB,C2E7IiB,UAAU;EACzC,aAAe,E3E4IlB,MAAiB,C2E5IoB,UAAU,GAC7C;;AAZD,AAAA,IAAI,CAA2B;EAAE,MAAQ,E3E2J1C,IAAe,CADf,IAAe,C2E1JwD,UAAU,GAAI;;AACpF,AAAA,KAAK,CAA0B;EAAE,UAAY,E3E0J9C,IAAe,C2E1JkD,UAAU,GAAI;;AAC9E,AAAA,KAAK,CAA0B;EAAE,YAAc,E3EwJhD,IAAe,C2ExJoD,UAAU,GAAI;;AAChF,AAAA,KAAK,CAA0B;EAAE,aAAe,E3EwJjD,IAAe,C2ExJqD,UAAU,GAAI;;AACjF,AAAA,KAAK,CAA0B;EAAE,WAAa,E3EsJ/C,IAAe,C2EtJmD,UAAU,GAAI;;AAC/E,AAAA,KAAK,CAA0B;EAC7B,YAAc,E3EoJjB,IAAe,C2EpJoB,UAAU;EAC1C,WAAa,E3EmJhB,IAAe,C2EnJmB,UAAU,GAC1C;;AACD,AAAA,KAAK,CAA0B;EAC7B,UAAY,E3EiJf,IAAe,C2EjJmB,UAAU;EACzC,aAAe,E3EgJlB,IAAe,C2EhJsB,UAAU,GAC7C;;AAZD,AAAA,IAAI,CAA2B;EAAE,OAAQ,E3EuI1C,CAAC,CADD,CAAC,C2EtIsE,UAAU,GAAI;;AACpF,AAAA,KAAK,CAA0B;EAAE,WAAY,E3EsI9C,CAAC,C2EtIgE,UAAU,GAAI;;AAC9E,AAAA,KAAK,CAA0B;EAAE,aAAc,E3EoIhD,CAAC,C2EpIkE,UAAU,GAAI;;AAChF,AAAA,KAAK,CAA0B;EAAE,cAAe,E3EoIjD,CAAC,C2EpImE,UAAU,GAAI;;AACjF,AAAA,KAAK,CAA0B;EAAE,YAAa,E3EkI/C,CAAC,C2ElIiE,UAAU,GAAI;;AAC/E,AAAA,KAAK,CAA0B;EAC7B,aAAc,E3EgIjB,CAAC,C2EhIkC,UAAU;EAC1C,YAAa,E3E+HhB,CAAC,C2E/HiC,UAAU,GAC1C;;AACD,AAAA,KAAK,CAA0B;EAC7B,WAAY,E3E6Hf,CAAC,C2E7HiC,UAAU;EACzC,cAAe,E3E4HlB,CAAC,C2E5HoC,UAAU,GAC7C;;AAZD,AAAA,IAAI,CAA2B;EAAE,OAAQ,E3E2I1C,OAAiB,CADjB,OAAiB,C2E1IsD,UAAU,GAAI;;AACpF,AAAA,KAAK,CAA0B;EAAE,WAAY,E3E0I9C,OAAiB,C2E1IgD,UAAU,GAAI;;AAC9E,AAAA,KAAK,CAA0B;EAAE,aAAc,E3EwIhD,OAAiB,C2ExIkD,UAAU,GAAI;;AAChF,AAAA,KAAK,CAA0B;EAAE,cAAe,E3EwIjD,OAAiB,C2ExImD,UAAU,GAAI;;AACjF,AAAA,KAAK,CAA0B;EAAE,YAAa,E3EsI/C,OAAiB,C2EtIiD,UAAU,GAAI;;AAC/E,AAAA,KAAK,CAA0B;EAC7B,aAAc,E3EoIjB,OAAiB,C2EpIkB,UAAU;EAC1C,YAAa,E3EmIhB,OAAiB,C2EnIiB,UAAU,GAC1C;;AACD,AAAA,KAAK,CAA0B;EAC7B,WAAY,E3EiIf,OAAiB,C2EjIiB,UAAU;EACzC,cAAe,E3EgIlB,OAAiB,C2EhIoB,UAAU,GAC7C;;AAZD,AAAA,IAAI,CAA2B;EAAE,OAAQ,E3E+I1C,MAAgB,CADhB,MAAgB,C2E9IuD,UAAU,GAAI;;AACpF,AAAA,KAAK,CAA0B;EAAE,WAAY,E3E8I9C,MAAgB,C2E9IiD,UAAU,GAAI;;AAC9E,AAAA,KAAK,CAA0B;EAAE,aAAc,E3E4IhD,MAAgB,C2E5ImD,UAAU,GAAI;;AAChF,AAAA,KAAK,CAA0B;EAAE,cAAe,E3E4IjD,MAAgB,C2E5IoD,UAAU,GAAI;;AACjF,AAAA,KAAK,CAA0B;EAAE,YAAa,E3E0I/C,MAAgB,C2E1IkD,UAAU,GAAI;;AAC/E,AAAA,KAAK,CAA0B;EAC7B,aAAc,E3EwIjB,MAAgB,C2ExImB,UAAU;EAC1C,YAAa,E3EuIhB,MAAgB,C2EvIkB,UAAU,GAC1C;;AACD,AAAA,KAAK,CAA0B;EAC7B,WAAY,E3EqIf,MAAgB,C2ErIkB,UAAU;EACzC,cAAe,E3EoIlB,MAAgB,C2EpIqB,UAAU,GAC7C;;AAZD,AAAA,IAAI,CAA2B;EAAE,OAAQ,E3EiItC,IAAI,CAAJ,IAAI,C2EjI+D,UAAU,GAAI;;AACpF,AAAA,KAAK,CAA0B;EAAE,WAAY,E3EgI1C,IAAI,C2EhIyD,UAAU,GAAI;;AAC9E,AAAA,KAAK,CAA0B;EAAE,aAAc,E3E+H5C,IAAI,C2E/H2D,UAAU,GAAI;;AAChF,AAAA,KAAK,CAA0B;EAAE,cAAe,E3E8H7C,IAAI,C2E9H4D,UAAU,GAAI;;AACjF,AAAA,KAAK,CAA0B;EAAE,YAAa,E3E6H3C,IAAI,C2E7H0D,UAAU,GAAI;;AAC/E,AAAA,KAAK,CAA0B;EAC7B,aAAc,E3E2Hb,IAAI,C2E3H2B,UAAU;EAC1C,YAAa,E3E0HZ,IAAI,C2E1H0B,UAAU,GAC1C;;AACD,AAAA,KAAK,CAA0B;EAC7B,WAAY,E3EuHX,IAAI,C2EvH0B,UAAU;EACzC,cAAe,E3EsHd,IAAI,C2EtH6B,UAAU,GAC7C;;AAZD,AAAA,IAAI,CAA2B;EAAE,OAAQ,E3EuJ1C,MAAiB,CADjB,MAAiB,C2EtJsD,UAAU,GAAI;;AACpF,AAAA,KAAK,CAA0B;EAAE,WAAY,E3EsJ9C,MAAiB,C2EtJgD,UAAU,GAAI;;AAC9E,AAAA,KAAK,CAA0B;EAAE,aAAc,E3EoJhD,MAAiB,C2EpJkD,UAAU,GAAI;;AAChF,AAAA,KAAK,CAA0B;EAAE,cAAe,E3EoJjD,MAAiB,C2EpJmD,UAAU,GAAI;;AACjF,AAAA,KAAK,CAA0B;EAAE,YAAa,E3EkJ/C,MAAiB,C2ElJiD,UAAU,GAAI;;AAC/E,AAAA,KAAK,CAA0B;EAC7B,aAAc,E3EgJjB,MAAiB,C2EhJkB,UAAU;EAC1C,YAAa,E3E+IhB,MAAiB,C2E/IiB,UAAU,GAC1C;;AACD,AAAA,KAAK,CAA0B;EAC7B,WAAY,E3E6If,MAAiB,C2E7IiB,UAAU;EACzC,cAAe,E3E4IlB,MAAiB,C2E5IoB,UAAU,GAC7C;;AAZD,AAAA,IAAI,CAA2B;EAAE,OAAQ,E3E2J1C,IAAe,CADf,IAAe,C2E1JwD,UAAU,GAAI;;AACpF,AAAA,KAAK,CAA0B;EAAE,WAAY,E3E0J9C,IAAe,C2E1JkD,UAAU,GAAI;;AAC9E,AAAA,KAAK,CAA0B;EAAE,aAAc,E3EwJhD,IAAe,C2ExJoD,UAAU,GAAI;;AAChF,AAAA,KAAK,CAA0B;EAAE,cAAe,E3EwJjD,IAAe,C2ExJqD,UAAU,GAAI;;AACjF,AAAA,KAAK,CAA0B;EAAE,YAAa,E3EsJ/C,IAAe,C2EtJmD,UAAU,GAAI;;AAC/E,AAAA,KAAK,CAA0B;EAC7B,aAAc,E3EoJjB,IAAe,C2EpJoB,UAAU;EAC1C,YAAa,E3EmJhB,IAAe,C2EnJmB,UAAU,GAC1C;;AACD,AAAA,KAAK,CAA0B;EAC7B,WAAY,E3EiJf,IAAe,C2EjJmB,UAAU;EACzC,cAAe,E3EgJlB,IAAe,C2EhJsB,UAAU,GAC7C;;AAKL,AAAA,OAAO,CAAW;EAAE,MAAM,EAAS,eAAe,GAAK;;AACvD,AAAA,QAAQ,CAAU;EAAE,UAAU,EAAK,eAAe,GAAK;;AACvD,AAAA,QAAQ,CAAU;EAAE,YAAY,EAAG,eAAe,GAAK;;AACvD,AAAA,QAAQ,CAAU;EAAE,aAAa,EAAE,eAAe,GAAK;;AACvD,AAAA,QAAQ,CAAU;EAAE,WAAW,EAAI,eAAe,GAAK;;AACvD,AAAA,QAAQ,CAAU;EAChB,YAAY,EAAE,eAAe;EAC7B,WAAW,EAAG,eAAe,GAC9B;;AACD,AAAA,QAAQ,CAAU;EAChB,UAAU,EAAK,eAAe;EAC9B,aAAa,EAAE,eAAe,GAC/B;;AzEgBD,MAAM,EAAE,SAAS,EAAE,KAAK;EyE7CpB,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3EuI1C,CAAC,CADD,CAAC,C2EtIsE,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3EsI9C,CAAC,C2EtIgE,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3EoIhD,CAAC,C2EpIkE,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3EoIjD,CAAC,C2EpImE,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3EkI/C,CAAC,C2ElIiE,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EgIjB,CAAC,C2EhIkC,UAAU;IAC1C,WAAa,E3E+HhB,CAAC,C2E/HiC,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3E6Hf,CAAC,C2E7HiC,UAAU;IACzC,aAAe,E3E4HlB,CAAC,C2E5HoC,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3E2I1C,OAAiB,CADjB,OAAiB,C2E1IsD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3E0I9C,OAAiB,C2E1IgD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3EwIhD,OAAiB,C2ExIkD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3EwIjD,OAAiB,C2ExImD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3EsI/C,OAAiB,C2EtIiD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EoIjB,OAAiB,C2EpIkB,UAAU;IAC1C,WAAa,E3EmIhB,OAAiB,C2EnIiB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3EiIf,OAAiB,C2EjIiB,UAAU;IACzC,aAAe,E3EgIlB,OAAiB,C2EhIoB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3E+I1C,MAAgB,CADhB,MAAgB,C2E9IuD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3E8I9C,MAAgB,C2E9IiD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3E4IhD,MAAgB,C2E5ImD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3E4IjD,MAAgB,C2E5IoD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3E0I/C,MAAgB,C2E1IkD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EwIjB,MAAgB,C2ExImB,UAAU;IAC1C,WAAa,E3EuIhB,MAAgB,C2EvIkB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3EqIf,MAAgB,C2ErIkB,UAAU;IACzC,aAAe,E3EoIlB,MAAgB,C2EpIqB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3EiItC,IAAI,CAAJ,IAAI,C2EjI+D,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3EgI1C,IAAI,C2EhIyD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3E+H5C,IAAI,C2E/H2D,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3E8H7C,IAAI,C2E9H4D,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3E6H3C,IAAI,C2E7H0D,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3E2Hb,IAAI,C2E3H2B,UAAU;IAC1C,WAAa,E3E0HZ,IAAI,C2E1H0B,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3EuHX,IAAI,C2EvH0B,UAAU;IACzC,aAAe,E3EsHd,IAAI,C2EtH6B,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3EuJ1C,MAAiB,CADjB,MAAiB,C2EtJsD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3EsJ9C,MAAiB,C2EtJgD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3EoJhD,MAAiB,C2EpJkD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3EoJjD,MAAiB,C2EpJmD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3EkJ/C,MAAiB,C2ElJiD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EgJjB,MAAiB,C2EhJkB,UAAU;IAC1C,WAAa,E3E+IhB,MAAiB,C2E/IiB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3E6If,MAAiB,C2E7IiB,UAAU;IACzC,aAAe,E3E4IlB,MAAiB,C2E5IoB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3E2J1C,IAAe,CADf,IAAe,C2E1JwD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3E0J9C,IAAe,C2E1JkD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3EwJhD,IAAe,C2ExJoD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3EwJjD,IAAe,C2ExJqD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3EsJ/C,IAAe,C2EtJmD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EoJjB,IAAe,C2EpJoB,UAAU;IAC1C,WAAa,E3EmJhB,IAAe,C2EnJmB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3EiJf,IAAe,C2EjJmB,UAAU;IACzC,aAAe,E3EgJlB,IAAe,C2EhJsB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3EuI1C,CAAC,CADD,CAAC,C2EtIsE,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3EsI9C,CAAC,C2EtIgE,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3EoIhD,CAAC,C2EpIkE,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3EoIjD,CAAC,C2EpImE,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3EkI/C,CAAC,C2ElIiE,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EgIjB,CAAC,C2EhIkC,UAAU;IAC1C,YAAa,E3E+HhB,CAAC,C2E/HiC,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3E6Hf,CAAC,C2E7HiC,UAAU;IACzC,cAAe,E3E4HlB,CAAC,C2E5HoC,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3E2I1C,OAAiB,CADjB,OAAiB,C2E1IsD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3E0I9C,OAAiB,C2E1IgD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3EwIhD,OAAiB,C2ExIkD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3EwIjD,OAAiB,C2ExImD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3EsI/C,OAAiB,C2EtIiD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EoIjB,OAAiB,C2EpIkB,UAAU;IAC1C,YAAa,E3EmIhB,OAAiB,C2EnIiB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3EiIf,OAAiB,C2EjIiB,UAAU;IACzC,cAAe,E3EgIlB,OAAiB,C2EhIoB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3E+I1C,MAAgB,CADhB,MAAgB,C2E9IuD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3E8I9C,MAAgB,C2E9IiD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3E4IhD,MAAgB,C2E5ImD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3E4IjD,MAAgB,C2E5IoD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3E0I/C,MAAgB,C2E1IkD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EwIjB,MAAgB,C2ExImB,UAAU;IAC1C,YAAa,E3EuIhB,MAAgB,C2EvIkB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3EqIf,MAAgB,C2ErIkB,UAAU;IACzC,cAAe,E3EoIlB,MAAgB,C2EpIqB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3EiItC,IAAI,CAAJ,IAAI,C2EjI+D,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3EgI1C,IAAI,C2EhIyD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3E+H5C,IAAI,C2E/H2D,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3E8H7C,IAAI,C2E9H4D,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3E6H3C,IAAI,C2E7H0D,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3E2Hb,IAAI,C2E3H2B,UAAU;IAC1C,YAAa,E3E0HZ,IAAI,C2E1H0B,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3EuHX,IAAI,C2EvH0B,UAAU;IACzC,cAAe,E3EsHd,IAAI,C2EtH6B,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3EuJ1C,MAAiB,CADjB,MAAiB,C2EtJsD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3EsJ9C,MAAiB,C2EtJgD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3EoJhD,MAAiB,C2EpJkD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3EoJjD,MAAiB,C2EpJmD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3EkJ/C,MAAiB,C2ElJiD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EgJjB,MAAiB,C2EhJkB,UAAU;IAC1C,YAAa,E3E+IhB,MAAiB,C2E/IiB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3E6If,MAAiB,C2E7IiB,UAAU;IACzC,cAAe,E3E4IlB,MAAiB,C2E5IoB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3E2J1C,IAAe,CADf,IAAe,C2E1JwD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3E0J9C,IAAe,C2E1JkD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3EwJhD,IAAe,C2ExJoD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3EwJjD,IAAe,C2ExJqD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3EsJ/C,IAAe,C2EtJmD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EoJjB,IAAe,C2EpJoB,UAAU;IAC1C,YAAa,E3EmJhB,IAAe,C2EnJmB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3EiJf,IAAe,C2EjJmB,UAAU;IACzC,cAAe,E3EgJlB,IAAe,C2EhJsB,UAAU,GAC7C;EAKL,AAAA,UAAU,CAAQ;IAAE,MAAM,EAAS,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAAE,UAAU,EAAK,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAAE,YAAY,EAAG,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAAE,aAAa,EAAE,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAAE,WAAW,EAAI,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAChB,YAAY,EAAE,eAAe;IAC7B,WAAW,EAAG,eAAe,GAC9B;EACD,AAAA,WAAW,CAAO;IAChB,UAAU,EAAK,eAAe;IAC9B,aAAa,EAAE,eAAe,GAC/B;;AzEgBD,MAAM,EAAE,SAAS,EAAE,KAAK;EyE7CpB,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3EuI1C,CAAC,CADD,CAAC,C2EtIsE,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3EsI9C,CAAC,C2EtIgE,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3EoIhD,CAAC,C2EpIkE,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3EoIjD,CAAC,C2EpImE,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3EkI/C,CAAC,C2ElIiE,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EgIjB,CAAC,C2EhIkC,UAAU;IAC1C,WAAa,E3E+HhB,CAAC,C2E/HiC,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3E6Hf,CAAC,C2E7HiC,UAAU;IACzC,aAAe,E3E4HlB,CAAC,C2E5HoC,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3E2I1C,OAAiB,CADjB,OAAiB,C2E1IsD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3E0I9C,OAAiB,C2E1IgD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3EwIhD,OAAiB,C2ExIkD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3EwIjD,OAAiB,C2ExImD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3EsI/C,OAAiB,C2EtIiD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EoIjB,OAAiB,C2EpIkB,UAAU;IAC1C,WAAa,E3EmIhB,OAAiB,C2EnIiB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3EiIf,OAAiB,C2EjIiB,UAAU;IACzC,aAAe,E3EgIlB,OAAiB,C2EhIoB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3E+I1C,MAAgB,CADhB,MAAgB,C2E9IuD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3E8I9C,MAAgB,C2E9IiD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3E4IhD,MAAgB,C2E5ImD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3E4IjD,MAAgB,C2E5IoD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3E0I/C,MAAgB,C2E1IkD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EwIjB,MAAgB,C2ExImB,UAAU;IAC1C,WAAa,E3EuIhB,MAAgB,C2EvIkB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3EqIf,MAAgB,C2ErIkB,UAAU;IACzC,aAAe,E3EoIlB,MAAgB,C2EpIqB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3EiItC,IAAI,CAAJ,IAAI,C2EjI+D,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3EgI1C,IAAI,C2EhIyD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3E+H5C,IAAI,C2E/H2D,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3E8H7C,IAAI,C2E9H4D,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3E6H3C,IAAI,C2E7H0D,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3E2Hb,IAAI,C2E3H2B,UAAU;IAC1C,WAAa,E3E0HZ,IAAI,C2E1H0B,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3EuHX,IAAI,C2EvH0B,UAAU;IACzC,aAAe,E3EsHd,IAAI,C2EtH6B,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3EuJ1C,MAAiB,CADjB,MAAiB,C2EtJsD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3EsJ9C,MAAiB,C2EtJgD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3EoJhD,MAAiB,C2EpJkD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3EoJjD,MAAiB,C2EpJmD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3EkJ/C,MAAiB,C2ElJiD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EgJjB,MAAiB,C2EhJkB,UAAU;IAC1C,WAAa,E3E+IhB,MAAiB,C2E/IiB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3E6If,MAAiB,C2E7IiB,UAAU;IACzC,aAAe,E3E4IlB,MAAiB,C2E5IoB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3E2J1C,IAAe,CADf,IAAe,C2E1JwD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3E0J9C,IAAe,C2E1JkD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3EwJhD,IAAe,C2ExJoD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3EwJjD,IAAe,C2ExJqD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3EsJ/C,IAAe,C2EtJmD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EoJjB,IAAe,C2EpJoB,UAAU;IAC1C,WAAa,E3EmJhB,IAAe,C2EnJmB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3EiJf,IAAe,C2EjJmB,UAAU;IACzC,aAAe,E3EgJlB,IAAe,C2EhJsB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3EuI1C,CAAC,CADD,CAAC,C2EtIsE,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3EsI9C,CAAC,C2EtIgE,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3EoIhD,CAAC,C2EpIkE,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3EoIjD,CAAC,C2EpImE,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3EkI/C,CAAC,C2ElIiE,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EgIjB,CAAC,C2EhIkC,UAAU;IAC1C,YAAa,E3E+HhB,CAAC,C2E/HiC,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3E6Hf,CAAC,C2E7HiC,UAAU;IACzC,cAAe,E3E4HlB,CAAC,C2E5HoC,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3E2I1C,OAAiB,CADjB,OAAiB,C2E1IsD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3E0I9C,OAAiB,C2E1IgD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3EwIhD,OAAiB,C2ExIkD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3EwIjD,OAAiB,C2ExImD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3EsI/C,OAAiB,C2EtIiD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EoIjB,OAAiB,C2EpIkB,UAAU;IAC1C,YAAa,E3EmIhB,OAAiB,C2EnIiB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3EiIf,OAAiB,C2EjIiB,UAAU;IACzC,cAAe,E3EgIlB,OAAiB,C2EhIoB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3E+I1C,MAAgB,CADhB,MAAgB,C2E9IuD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3E8I9C,MAAgB,C2E9IiD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3E4IhD,MAAgB,C2E5ImD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3E4IjD,MAAgB,C2E5IoD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3E0I/C,MAAgB,C2E1IkD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EwIjB,MAAgB,C2ExImB,UAAU;IAC1C,YAAa,E3EuIhB,MAAgB,C2EvIkB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3EqIf,MAAgB,C2ErIkB,UAAU;IACzC,cAAe,E3EoIlB,MAAgB,C2EpIqB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3EiItC,IAAI,CAAJ,IAAI,C2EjI+D,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3EgI1C,IAAI,C2EhIyD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3E+H5C,IAAI,C2E/H2D,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3E8H7C,IAAI,C2E9H4D,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3E6H3C,IAAI,C2E7H0D,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3E2Hb,IAAI,C2E3H2B,UAAU;IAC1C,YAAa,E3E0HZ,IAAI,C2E1H0B,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3EuHX,IAAI,C2EvH0B,UAAU;IACzC,cAAe,E3EsHd,IAAI,C2EtH6B,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3EuJ1C,MAAiB,CADjB,MAAiB,C2EtJsD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3EsJ9C,MAAiB,C2EtJgD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3EoJhD,MAAiB,C2EpJkD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3EoJjD,MAAiB,C2EpJmD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3EkJ/C,MAAiB,C2ElJiD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EgJjB,MAAiB,C2EhJkB,UAAU;IAC1C,YAAa,E3E+IhB,MAAiB,C2E/IiB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3E6If,MAAiB,C2E7IiB,UAAU;IACzC,cAAe,E3E4IlB,MAAiB,C2E5IoB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3E2J1C,IAAe,CADf,IAAe,C2E1JwD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3E0J9C,IAAe,C2E1JkD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3EwJhD,IAAe,C2ExJoD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3EwJjD,IAAe,C2ExJqD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3EsJ/C,IAAe,C2EtJmD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EoJjB,IAAe,C2EpJoB,UAAU;IAC1C,YAAa,E3EmJhB,IAAe,C2EnJmB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3EiJf,IAAe,C2EjJmB,UAAU;IACzC,cAAe,E3EgJlB,IAAe,C2EhJsB,UAAU,GAC7C;EAKL,AAAA,UAAU,CAAQ;IAAE,MAAM,EAAS,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAAE,UAAU,EAAK,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAAE,YAAY,EAAG,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAAE,aAAa,EAAE,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAAE,WAAW,EAAI,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAChB,YAAY,EAAE,eAAe;IAC7B,WAAW,EAAG,eAAe,GAC9B;EACD,AAAA,WAAW,CAAO;IAChB,UAAU,EAAK,eAAe;IAC9B,aAAa,EAAE,eAAe,GAC/B;;AzEgBD,MAAM,EAAE,SAAS,EAAE,KAAK;EyE7CpB,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3EuI1C,CAAC,CADD,CAAC,C2EtIsE,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3EsI9C,CAAC,C2EtIgE,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3EoIhD,CAAC,C2EpIkE,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3EoIjD,CAAC,C2EpImE,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3EkI/C,CAAC,C2ElIiE,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EgIjB,CAAC,C2EhIkC,UAAU;IAC1C,WAAa,E3E+HhB,CAAC,C2E/HiC,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3E6Hf,CAAC,C2E7HiC,UAAU;IACzC,aAAe,E3E4HlB,CAAC,C2E5HoC,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3E2I1C,OAAiB,CADjB,OAAiB,C2E1IsD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3E0I9C,OAAiB,C2E1IgD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3EwIhD,OAAiB,C2ExIkD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3EwIjD,OAAiB,C2ExImD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3EsI/C,OAAiB,C2EtIiD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EoIjB,OAAiB,C2EpIkB,UAAU;IAC1C,WAAa,E3EmIhB,OAAiB,C2EnIiB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3EiIf,OAAiB,C2EjIiB,UAAU;IACzC,aAAe,E3EgIlB,OAAiB,C2EhIoB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3E+I1C,MAAgB,CADhB,MAAgB,C2E9IuD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3E8I9C,MAAgB,C2E9IiD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3E4IhD,MAAgB,C2E5ImD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3E4IjD,MAAgB,C2E5IoD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3E0I/C,MAAgB,C2E1IkD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EwIjB,MAAgB,C2ExImB,UAAU;IAC1C,WAAa,E3EuIhB,MAAgB,C2EvIkB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3EqIf,MAAgB,C2ErIkB,UAAU;IACzC,aAAe,E3EoIlB,MAAgB,C2EpIqB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3EiItC,IAAI,CAAJ,IAAI,C2EjI+D,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3EgI1C,IAAI,C2EhIyD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3E+H5C,IAAI,C2E/H2D,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3E8H7C,IAAI,C2E9H4D,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3E6H3C,IAAI,C2E7H0D,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3E2Hb,IAAI,C2E3H2B,UAAU;IAC1C,WAAa,E3E0HZ,IAAI,C2E1H0B,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3EuHX,IAAI,C2EvH0B,UAAU;IACzC,aAAe,E3EsHd,IAAI,C2EtH6B,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3EuJ1C,MAAiB,CADjB,MAAiB,C2EtJsD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3EsJ9C,MAAiB,C2EtJgD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3EoJhD,MAAiB,C2EpJkD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3EoJjD,MAAiB,C2EpJmD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3EkJ/C,MAAiB,C2ElJiD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EgJjB,MAAiB,C2EhJkB,UAAU;IAC1C,WAAa,E3E+IhB,MAAiB,C2E/IiB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3E6If,MAAiB,C2E7IiB,UAAU;IACzC,aAAe,E3E4IlB,MAAiB,C2E5IoB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3E2J1C,IAAe,CADf,IAAe,C2E1JwD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3E0J9C,IAAe,C2E1JkD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3EwJhD,IAAe,C2ExJoD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3EwJjD,IAAe,C2ExJqD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3EsJ/C,IAAe,C2EtJmD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EoJjB,IAAe,C2EpJoB,UAAU;IAC1C,WAAa,E3EmJhB,IAAe,C2EnJmB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3EiJf,IAAe,C2EjJmB,UAAU;IACzC,aAAe,E3EgJlB,IAAe,C2EhJsB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3EuI1C,CAAC,CADD,CAAC,C2EtIsE,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3EsI9C,CAAC,C2EtIgE,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3EoIhD,CAAC,C2EpIkE,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3EoIjD,CAAC,C2EpImE,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3EkI/C,CAAC,C2ElIiE,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EgIjB,CAAC,C2EhIkC,UAAU;IAC1C,YAAa,E3E+HhB,CAAC,C2E/HiC,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3E6Hf,CAAC,C2E7HiC,UAAU;IACzC,cAAe,E3E4HlB,CAAC,C2E5HoC,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3E2I1C,OAAiB,CADjB,OAAiB,C2E1IsD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3E0I9C,OAAiB,C2E1IgD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3EwIhD,OAAiB,C2ExIkD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3EwIjD,OAAiB,C2ExImD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3EsI/C,OAAiB,C2EtIiD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EoIjB,OAAiB,C2EpIkB,UAAU;IAC1C,YAAa,E3EmIhB,OAAiB,C2EnIiB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3EiIf,OAAiB,C2EjIiB,UAAU;IACzC,cAAe,E3EgIlB,OAAiB,C2EhIoB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3E+I1C,MAAgB,CADhB,MAAgB,C2E9IuD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3E8I9C,MAAgB,C2E9IiD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3E4IhD,MAAgB,C2E5ImD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3E4IjD,MAAgB,C2E5IoD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3E0I/C,MAAgB,C2E1IkD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EwIjB,MAAgB,C2ExImB,UAAU;IAC1C,YAAa,E3EuIhB,MAAgB,C2EvIkB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3EqIf,MAAgB,C2ErIkB,UAAU;IACzC,cAAe,E3EoIlB,MAAgB,C2EpIqB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3EiItC,IAAI,CAAJ,IAAI,C2EjI+D,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3EgI1C,IAAI,C2EhIyD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3E+H5C,IAAI,C2E/H2D,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3E8H7C,IAAI,C2E9H4D,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3E6H3C,IAAI,C2E7H0D,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3E2Hb,IAAI,C2E3H2B,UAAU;IAC1C,YAAa,E3E0HZ,IAAI,C2E1H0B,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3EuHX,IAAI,C2EvH0B,UAAU;IACzC,cAAe,E3EsHd,IAAI,C2EtH6B,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3EuJ1C,MAAiB,CADjB,MAAiB,C2EtJsD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3EsJ9C,MAAiB,C2EtJgD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3EoJhD,MAAiB,C2EpJkD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3EoJjD,MAAiB,C2EpJmD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3EkJ/C,MAAiB,C2ElJiD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EgJjB,MAAiB,C2EhJkB,UAAU;IAC1C,YAAa,E3E+IhB,MAAiB,C2E/IiB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3E6If,MAAiB,C2E7IiB,UAAU;IACzC,cAAe,E3E4IlB,MAAiB,C2E5IoB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3E2J1C,IAAe,CADf,IAAe,C2E1JwD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3E0J9C,IAAe,C2E1JkD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3EwJhD,IAAe,C2ExJoD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3EwJjD,IAAe,C2ExJqD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3EsJ/C,IAAe,C2EtJmD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EoJjB,IAAe,C2EpJoB,UAAU;IAC1C,YAAa,E3EmJhB,IAAe,C2EnJmB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3EiJf,IAAe,C2EjJmB,UAAU;IACzC,cAAe,E3EgJlB,IAAe,C2EhJsB,UAAU,GAC7C;EAKL,AAAA,UAAU,CAAQ;IAAE,MAAM,EAAS,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAAE,UAAU,EAAK,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAAE,YAAY,EAAG,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAAE,aAAa,EAAE,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAAE,WAAW,EAAI,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAChB,YAAY,EAAE,eAAe;IAC7B,WAAW,EAAG,eAAe,GAC9B;EACD,AAAA,WAAW,CAAO;IAChB,UAAU,EAAK,eAAe;IAC9B,aAAa,EAAE,eAAe,GAC/B;;AzEgBD,MAAM,EAAE,SAAS,EAAE,MAAM;EyE7CrB,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3EuI1C,CAAC,CADD,CAAC,C2EtIsE,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3EsI9C,CAAC,C2EtIgE,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3EoIhD,CAAC,C2EpIkE,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3EoIjD,CAAC,C2EpImE,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3EkI/C,CAAC,C2ElIiE,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EgIjB,CAAC,C2EhIkC,UAAU;IAC1C,WAAa,E3E+HhB,CAAC,C2E/HiC,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3E6Hf,CAAC,C2E7HiC,UAAU;IACzC,aAAe,E3E4HlB,CAAC,C2E5HoC,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3E2I1C,OAAiB,CADjB,OAAiB,C2E1IsD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3E0I9C,OAAiB,C2E1IgD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3EwIhD,OAAiB,C2ExIkD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3EwIjD,OAAiB,C2ExImD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3EsI/C,OAAiB,C2EtIiD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EoIjB,OAAiB,C2EpIkB,UAAU;IAC1C,WAAa,E3EmIhB,OAAiB,C2EnIiB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3EiIf,OAAiB,C2EjIiB,UAAU;IACzC,aAAe,E3EgIlB,OAAiB,C2EhIoB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3E+I1C,MAAgB,CADhB,MAAgB,C2E9IuD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3E8I9C,MAAgB,C2E9IiD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3E4IhD,MAAgB,C2E5ImD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3E4IjD,MAAgB,C2E5IoD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3E0I/C,MAAgB,C2E1IkD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EwIjB,MAAgB,C2ExImB,UAAU;IAC1C,WAAa,E3EuIhB,MAAgB,C2EvIkB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3EqIf,MAAgB,C2ErIkB,UAAU;IACzC,aAAe,E3EoIlB,MAAgB,C2EpIqB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3EiItC,IAAI,CAAJ,IAAI,C2EjI+D,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3EgI1C,IAAI,C2EhIyD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3E+H5C,IAAI,C2E/H2D,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3E8H7C,IAAI,C2E9H4D,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3E6H3C,IAAI,C2E7H0D,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3E2Hb,IAAI,C2E3H2B,UAAU;IAC1C,WAAa,E3E0HZ,IAAI,C2E1H0B,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3EuHX,IAAI,C2EvH0B,UAAU;IACzC,aAAe,E3EsHd,IAAI,C2EtH6B,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3EuJ1C,MAAiB,CADjB,MAAiB,C2EtJsD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3EsJ9C,MAAiB,C2EtJgD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3EoJhD,MAAiB,C2EpJkD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3EoJjD,MAAiB,C2EpJmD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3EkJ/C,MAAiB,C2ElJiD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EgJjB,MAAiB,C2EhJkB,UAAU;IAC1C,WAAa,E3E+IhB,MAAiB,C2E/IiB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3E6If,MAAiB,C2E7IiB,UAAU;IACzC,aAAe,E3E4IlB,MAAiB,C2E5IoB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,MAAQ,E3E2J1C,IAAe,CADf,IAAe,C2E1JwD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,UAAY,E3E0J9C,IAAe,C2E1JkD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,YAAc,E3EwJhD,IAAe,C2ExJoD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,aAAe,E3EwJjD,IAAe,C2ExJqD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,WAAa,E3EsJ/C,IAAe,C2EtJmD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,YAAc,E3EoJjB,IAAe,C2EpJoB,UAAU;IAC1C,WAAa,E3EmJhB,IAAe,C2EnJmB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,UAAY,E3EiJf,IAAe,C2EjJmB,UAAU;IACzC,aAAe,E3EgJlB,IAAe,C2EhJsB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3EuI1C,CAAC,CADD,CAAC,C2EtIsE,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3EsI9C,CAAC,C2EtIgE,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3EoIhD,CAAC,C2EpIkE,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3EoIjD,CAAC,C2EpImE,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3EkI/C,CAAC,C2ElIiE,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EgIjB,CAAC,C2EhIkC,UAAU;IAC1C,YAAa,E3E+HhB,CAAC,C2E/HiC,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3E6Hf,CAAC,C2E7HiC,UAAU;IACzC,cAAe,E3E4HlB,CAAC,C2E5HoC,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3E2I1C,OAAiB,CADjB,OAAiB,C2E1IsD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3E0I9C,OAAiB,C2E1IgD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3EwIhD,OAAiB,C2ExIkD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3EwIjD,OAAiB,C2ExImD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3EsI/C,OAAiB,C2EtIiD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EoIjB,OAAiB,C2EpIkB,UAAU;IAC1C,YAAa,E3EmIhB,OAAiB,C2EnIiB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3EiIf,OAAiB,C2EjIiB,UAAU;IACzC,cAAe,E3EgIlB,OAAiB,C2EhIoB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3E+I1C,MAAgB,CADhB,MAAgB,C2E9IuD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3E8I9C,MAAgB,C2E9IiD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3E4IhD,MAAgB,C2E5ImD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3E4IjD,MAAgB,C2E5IoD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3E0I/C,MAAgB,C2E1IkD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EwIjB,MAAgB,C2ExImB,UAAU;IAC1C,YAAa,E3EuIhB,MAAgB,C2EvIkB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3EqIf,MAAgB,C2ErIkB,UAAU;IACzC,cAAe,E3EoIlB,MAAgB,C2EpIqB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3EiItC,IAAI,CAAJ,IAAI,C2EjI+D,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3EgI1C,IAAI,C2EhIyD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3E+H5C,IAAI,C2E/H2D,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3E8H7C,IAAI,C2E9H4D,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3E6H3C,IAAI,C2E7H0D,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3E2Hb,IAAI,C2E3H2B,UAAU;IAC1C,YAAa,E3E0HZ,IAAI,C2E1H0B,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3EuHX,IAAI,C2EvH0B,UAAU;IACzC,cAAe,E3EsHd,IAAI,C2EtH6B,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3EuJ1C,MAAiB,CADjB,MAAiB,C2EtJsD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3EsJ9C,MAAiB,C2EtJgD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3EoJhD,MAAiB,C2EpJkD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3EoJjD,MAAiB,C2EpJmD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3EkJ/C,MAAiB,C2ElJiD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EgJjB,MAAiB,C2EhJkB,UAAU;IAC1C,YAAa,E3E+IhB,MAAiB,C2E/IiB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3E6If,MAAiB,C2E7IiB,UAAU;IACzC,cAAe,E3E4IlB,MAAiB,C2E5IoB,UAAU,GAC7C;EAZD,AAAA,OAAO,CAAwB;IAAE,OAAQ,E3E2J1C,IAAe,CADf,IAAe,C2E1JwD,UAAU,GAAI;EACpF,AAAA,QAAQ,CAAuB;IAAE,WAAY,E3E0J9C,IAAe,C2E1JkD,UAAU,GAAI;EAC9E,AAAA,QAAQ,CAAuB;IAAE,aAAc,E3EwJhD,IAAe,C2ExJoD,UAAU,GAAI;EAChF,AAAA,QAAQ,CAAuB;IAAE,cAAe,E3EwJjD,IAAe,C2ExJqD,UAAU,GAAI;EACjF,AAAA,QAAQ,CAAuB;IAAE,YAAa,E3EsJ/C,IAAe,C2EtJmD,UAAU,GAAI;EAC/E,AAAA,QAAQ,CAAuB;IAC7B,aAAc,E3EoJjB,IAAe,C2EpJoB,UAAU;IAC1C,YAAa,E3EmJhB,IAAe,C2EnJmB,UAAU,GAC1C;EACD,AAAA,QAAQ,CAAuB;IAC7B,WAAY,E3EiJf,IAAe,C2EjJmB,UAAU;IACzC,cAAe,E3EgJlB,IAAe,C2EhJsB,UAAU,GAC7C;EAKL,AAAA,UAAU,CAAQ;IAAE,MAAM,EAAS,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAAE,UAAU,EAAK,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAAE,YAAY,EAAG,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAAE,aAAa,EAAE,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAAE,WAAW,EAAI,eAAe,GAAK;EACvD,AAAA,WAAW,CAAO;IAChB,YAAY,EAAE,eAAe;IAC7B,WAAW,EAAG,eAAe,GAC9B;EACD,AAAA,WAAW,CAAO;IAChB,UAAU,EAAK,eAAe;IAC9B,aAAa,EAAE,eAAe,GAC/B;;AClCL,AAAA,aAAa,CAAE;EAAE,UAAU,EAAE,kBAAkB,GAAK;;AACpD,AAAA,YAAY,CAAG;EAAE,WAAW,EAAE,iBAAiB,GAAK;;AACpD,AAAA,cAAc,CAAC;EhEJb,QAAQ,EAAE,MAAM;EAChB,aAAa,EAAE,QAAQ;EACvB,WAAW,EAAE,MAAM,GgEEsB;;AAQvC,AAAA,UAAU,CAAY;EAAE,UAAU,EAAE,eAAe,GAAK;;AACxD,AAAA,WAAW,CAAW;EAAE,UAAU,EAAE,gBAAgB,GAAK;;AACzD,AAAA,YAAY,CAAU;EAAE,UAAU,EAAE,iBAAiB,GAAK;;A1EsC1D,MAAM,EAAE,SAAS,EAAE,KAAK;E0ExCxB,AAAA,aAAa,CAAS;IAAE,UAAU,EAAE,eAAe,GAAK;EACxD,AAAA,cAAc,CAAQ;IAAE,UAAU,EAAE,gBAAgB,GAAK;EACzD,AAAA,eAAe,CAAO;IAAE,UAAU,EAAE,iBAAiB,GAAK;;A1EsC1D,MAAM,EAAE,SAAS,EAAE,KAAK;E0ExCxB,AAAA,aAAa,CAAS;IAAE,UAAU,EAAE,eAAe,GAAK;EACxD,AAAA,cAAc,CAAQ;IAAE,UAAU,EAAE,gBAAgB,GAAK;EACzD,AAAA,eAAe,CAAO;IAAE,UAAU,EAAE,iBAAiB,GAAK;;A1EsC1D,MAAM,EAAE,SAAS,EAAE,KAAK;E0ExCxB,AAAA,aAAa,CAAS;IAAE,UAAU,EAAE,eAAe,GAAK;EACxD,AAAA,cAAc,CAAQ;IAAE,UAAU,EAAE,gBAAgB,GAAK;EACzD,AAAA,eAAe,CAAO;IAAE,UAAU,EAAE,iBAAiB,GAAK;;A1EsC1D,MAAM,EAAE,SAAS,EAAE,MAAM;E0ExCzB,AAAA,aAAa,CAAS;IAAE,UAAU,EAAE,eAAe,GAAK;EACxD,AAAA,cAAc,CAAQ;IAAE,UAAU,EAAE,gBAAgB,GAAK;EACzD,AAAA,eAAe,CAAO;IAAE,UAAU,EAAE,iBAAiB,GAAK;;AAM9D,AAAA,eAAe,CAAE;EAAE,cAAc,EAAE,oBAAoB,GAAK;;AAC5D,AAAA,eAAe,CAAE;EAAE,cAAc,EAAE,oBAAoB,GAAK;;AAC5D,AAAA,gBAAgB,CAAC;EAAE,cAAc,EAAE,qBAAqB,GAAK;;AAI7D,AAAA,mBAAmB,CAAC;EAAE,WAAW,E5EkOZ,MAAM,G4ElO+B;;AAC1D,AAAA,iBAAiB,CAAG;EAAE,WAAW,E5EkOd,IAAI,G4ElOiC;;AACxD,AAAA,YAAY,CAAQ;EAAE,UAAU,EAAE,MAAM,GAAK;;AAI7C,AAAA,WAAW,CAAC;EACV,KAAK,EAAE,eAAe,GACvB;;AlEnCC,AAAA,WAAW,CAAA;EACT,KAAK,EVwGmB,OAAO,CUxGjB,UAAU,GACzB;;AACD,APcE,COdD,AAAA,WAAW,APc5D,MAAyD,EOdT,APeE,COfD,AAAA,WAAW,APe5D,MAAyD,CAAC;EObN,KAAK,EAAE,OAAmB,CAAC,UAAU,GPetC;;AOpBH,AAAA,aAAa,CAAF;EACT,KAAK,EZQ0B,OAAO,CYRxB,UAAU,GACzB;;AACD,APcE,COdD,AAAA,aAAa,APc9D,MAAyD,EOdT,APeE,COfD,AAAA,aAAa,APe9D,MAAyD,CAAC;EObN,KAAK,EAAE,OAAmB,CAAC,UAAU,GPetC;;AOpBH,AAAA,aAAa,CAAF;EACT,KAAK,EZS0B,OAAO,CYTxB,UAAU,GACzB;;AACD,APcE,COdD,AAAA,aAAa,APc9D,MAAyD,EOdT,APeE,COfD,AAAA,aAAa,APe9D,MAAyD,CAAC;EObN,KAAK,EAAE,OAAmB,CAAC,UAAU,GPetC;;AOpBH,AAAA,UAAU,CAAC;EACT,KAAK,EZU0B,OAAO,CYVxB,UAAU,GACzB;;AACD,APcE,COdD,AAAA,UAAU,APc3D,MAAyD,EOdT,APeE,COfD,AAAA,UAAU,APe3D,MAAyD,CAAC;EObN,KAAK,EAAE,OAAmB,CAAC,UAAU,GPetC;;AOpBH,AAAA,aAAa,CAAF;EACT,KAAK,EZW0B,OAAO,CYXxB,UAAU,GACzB;;AACD,APcE,COdD,AAAA,aAAa,APc9D,MAAyD,EOdT,APeE,COfD,AAAA,aAAa,APe9D,MAAyD,CAAC;EObN,KAAK,EAAE,OAAmB,CAAC,UAAU,GPetC;;AOpBH,AAAA,YAAY,CAAD;EACT,KAAK,EZY0B,OAAO,CYZxB,UAAU,GACzB;;AACD,APcE,COdD,AAAA,YAAY,APc7D,MAAyD,EOdT,APeE,COfD,AAAA,YAAY,APe7D,MAAyD,CAAC;EObN,KAAK,EAAE,OAAmB,CAAC,UAAU,GPetC;;AOpBH,AAAA,eAAe,CAAJ;EACT,KAAK,EVsGmB,OAAO,CUtGjB,UAAU,GACzB;;AACD,APcE,COdD,AAAA,eAAe,APchE,MAAyD,EOdT,APeE,COfD,AAAA,eAAe,APehE,MAAyD,CAAC;EObN,KAAK,EAAE,OAAmB,CAAC,UAAU,GPetC;;AyEmCL,AAAA,UAAU,CAAC;EjExDT,IAAI,EAAE,KAAK;EACX,KAAK,EAAE,WAAW;EAClB,WAAW,EAAE,IAAI;EACjB,gBAAgB,EAAE,WAAW;EAC7B,MAAM,EAAE,CAAC,GiEsDV;;ACxDD,AAAA,UAAU,CAAC;E/DDT,UAAU,EAAE,iBAAiB,G+DG9B;;AAKC,AAAA,aAAa,CAAK;EAEd,OAAO,EAAE,eAAe,GAE3B;;A3EsDC,MAAM,EAAE,SAAS,EAAE,KAAK;E2ErD1B,AAAA,eAAe,CAAK;IAEhB,OAAO,EAAE,eAAe,GAE3B;;A3EoCC,MAAM,EAAE,SAAS,EAAE,KAAK;E2E7C1B,AAAA,aAAa,CAAK;IAEd,OAAO,EAAE,eAAe,GAE3B;;A3EsDC,MAAM,EAAE,SAAS,EAAE,KAAK;E2ErD1B,AAAA,eAAe,CAAK;IAEhB,OAAO,EAAE,eAAe,GAE3B;;A3EoCC,MAAM,EAAE,SAAS,EAAE,KAAK;E2E7C1B,AAAA,aAAa,CAAK;IAEd,OAAO,EAAE,eAAe,GAE3B;;A3EsDC,MAAM,EAAE,SAAS,EAAE,KAAK;E2ErD1B,AAAA,eAAe,CAAK;IAEhB,OAAO,EAAE,eAAe,GAE3B;;A3EoCC,MAAM,EAAE,SAAS,EAAE,KAAK;E2E7C1B,AAAA,aAAa,CAAK;IAEd,OAAO,EAAE,eAAe,GAE3B;;A3EsDC,MAAM,EAAE,SAAS,EAAE,MAAM;E2ErD3B,AAAA,eAAe,CAAK;IAEhB,OAAO,EAAE,eAAe,GAE3B;;A3EoCC,MAAM,EAAE,SAAS,EAAE,MAAM;E2E7C3B,AAAA,aAAa,CAAK;IAEd,OAAO,EAAE,eAAe,GAE3B;;AACD,AAAA,eAAe,CAAK;EAEhB,OAAO,EAAE,eAAe,GAE3B;;AAQH,AAAA,oBAAoB,CAAC;EACnB,OAAO,EAAE,eAAe,GAKzB;EAHC,MAAM,CAAC,KAAK;IAHd,AAAA,oBAAoB,CAAC;MAIjB,OAAO,EAAE,gBAAgB,GAE5B;;AACD,AAAA,qBAAqB,CAAC;EACpB,OAAO,EAAE,eAAe,GAKzB;EAHC,MAAM,CAAC,KAAK;IAHd,AAAA,qBAAqB,CAAC;MAIlB,OAAO,EAAE,iBAAiB,GAE7B;;AACD,AAAA,2BAA2B,CAAC;EAC1B,OAAO,EAAE,eAAe,GAKzB;EAHC,MAAM,CAAC,KAAK;IAHd,AAAA,2BAA2B,CAAC;MAIxB,OAAO,EAAE,uBAAuB,GAEnC;;AAGC,MAAM,CAAC,KAAK;EADd,AAAA,aAAa,CAAC;IAEV,OAAO,EAAE,eAAe,GAE3B;;ACtDD;;;GAGG;AGHH;gCACgC;AAEhC,UAAU;EACR,WAAW,EAAE,aAAa;EAC1B,GAAG,EAAE,+EAAgE;EACrE,GAAG,EAAE,sFAAuE,CAAC,2BAA2B,EACtG,iFAAkE,CAAC,eAAe,EAClF,gFAAiE,CAAC,cAAc,EAChF,+EAAgE,CAAC,kBAAkB,EACnF,kGAAmF,CAAC,aAAa;EAEnG,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,MAAM;;ACVpB,AAAA,GAAG,CAAgB;EACjB,OAAO,EAAE,YAAY;EACrB,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAA6C,CAAC,WAAW;EACpF,SAAS,EAAE,OAAO;EAClB,cAAc,EAAE,IAAI;EACpB,sBAAsB,EAAE,WAAW;EACnC,uBAAuB,EAAE,SAAS,GAEnC;;ACRD,8DAA8D;AAC9D,AAAA,MAAM,CAAgB;EACpB,SAAS,EAAE,SAAS;EACpB,WAAW,EAAE,MAAS;EACtB,cAAc,EAAE,IAAI,GACrB;;AACD,AAAA,MAAM,CAAgB;EAAE,SAAS,EAAE,GAAG,GAAK;;AAC3C,AAAA,MAAM,CAAgB;EAAE,SAAS,EAAE,GAAG,GAAK;;AAC3C,AAAA,MAAM,CAAgB;EAAE,SAAS,EAAE,GAAG,GAAK;;AAC3C,AAAA,MAAM,CAAgB;EAAE,SAAS,EAAE,GAAG,GAAK;;ACV3C,AAAA,MAAM,CAAgB;EACpB,KAAK,EAAE,SAAW;EAClB,UAAU,EAAE,MAAM,GACnB;;ACFD,AAAA,MAAM,CAAgB;EACpB,YAAY,EAAE,CAAC;EACf,WAAW,ENMS,SAAW;EML/B,eAAe,EAAE,IAAI,GAEtB;EALD,AAII,MAJE,GAIF,EAAE,CAAC;IAAE,QAAQ,EAAE,QAAQ,GAAK;;AAEhC,AAAA,MAAM,CAAgB;EACpB,QAAQ,EAAE,QAAQ;EAClB,IAAI,ENAgB,UAAW;EMC/B,KAAK,ENDe,SAAW;EME/B,GAAG,EAAE,SAAU;EACf,UAAU,EAAE,MAAM,GAInB;EATD,AAME,MANI,AAMJ,MAAO,CAAgB;IACrB,IAAI,EAAE,UAA0B,GACjC;;ACdH,AAAA,UAAU,CAAgB;EACxB,OAAO,EAAE,gBAAgB;EACzB,MAAM,EAAE,KAAK,CAAC,MAAK,CPIC,IAAI;EOHxB,aAAa,EAAE,IAAI,GACpB;;AAED,AAAA,aAAa,CAAgB;EAAE,KAAK,EAAE,IAAI,GAAK;;AAC/C,AAAA,cAAc,CAAgB;EAAE,KAAK,EAAE,KAAK,GAAK;;AAEjD,AACE,GADC,AACD,aAAc,CAAgB;EAAE,YAAY,EAAE,IAAI,GAAK;;AADzD,AAEE,GAFC,AAED,cAAe,CAAgB;EAAE,WAAW,EAAE,IAAI,GAAK;;AAGzD,4BAA4B;AAC5B,AAAA,WAAW,CAAC;EAAE,KAAK,EAAE,KAAK,GAAK;;AAC/B,AAAA,UAAU,CAAC;EAAE,KAAK,EAAE,IAAI,GAAK;;AAE7B,AACE,GADC,AACD,UAAW,CAAC;EAAE,YAAY,EAAE,IAAI,GAAK;;AADvC,AAEE,GAFC,AAED,WAAY,CAAC;EAAE,WAAW,EAAE,IAAI,GAAK;;ACpBvC,AAAA,QAAQ,CAAgB;EACtB,iBAAiB,EAAE,0BAA0B;EACrC,SAAS,EAAE,0BAA0B,GAC9C;;AAED,AAAA,SAAS,CAAgB;EACvB,iBAAiB,EAAE,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ;EACvC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,GAChD;;AAED,kBAAkB,CAAlB,OAAkB;EAChB,AAAA,EAAE;IACA,iBAAiB,EAAE,YAAY;IACvB,SAAS,EAAE,YAAY;EAEjC,AAAA,IAAI;IACF,iBAAiB,EAAE,cAAc;IACzB,SAAS,EAAE,cAAc;;AAIrC,UAAU,CAAV,OAAU;EACR,AAAA,EAAE;IACA,iBAAiB,EAAE,YAAY;IACvB,SAAS,EAAE,YAAY;EAEjC,AAAA,IAAI;IACF,iBAAiB,EAAE,cAAc;IACzB,SAAS,EAAE,cAAc;;AC5BrC,AAAA,aAAa,CAAiB;ERW5B,UAAU,EAAE,0DAAqE;EACjF,iBAAiB,EAAE,aAAgB;EAC/B,aAAa,EAAE,aAAgB;EAC3B,SAAS,EAAE,aAAgB,GQdiC;;AACtE,AAAA,cAAc,CAAgB;ERU5B,UAAU,EAAE,0DAAqE;EACjF,iBAAiB,EAAE,cAAgB;EAC/B,aAAa,EAAE,cAAgB;EAC3B,SAAS,EAAE,cAAgB,GQbiC;;AACtE,AAAA,cAAc,CAAgB;ERS5B,UAAU,EAAE,0DAAqE;EACjF,iBAAiB,EAAE,cAAgB;EAC/B,aAAa,EAAE,cAAgB;EAC3B,SAAS,EAAE,cAAgB,GQZiC;;AAEtE,AAAA,mBAAmB,CAAgB;ERcjC,UAAU,EAAE,oEAA+E;EAC3F,iBAAiB,EAAE,YAAoB;EACnC,aAAa,EAAE,YAAoB;EAC/B,SAAS,EAAE,YAAoB,GQjB+B;;AACxE,AAAA,iBAAiB,CAAkB;ERajC,UAAU,EAAE,oEAA+E;EAC3F,iBAAiB,EAAE,YAAoB;EACnC,aAAa,EAAE,YAAoB;EAC/B,SAAS,EAAE,YAAoB,GQhB+B;;AAKxE,AAAM,KAAD,CAAC,aAAa;AACnB,AAAM,KAAD,CAAC,cAAc;AACpB,AAAM,KAAD,CAAC,cAAc;AACpB,AAAM,KAAD,CAAC,mBAAmB;AACzB,AAAM,KAAD,CAAC,iBAAiB,CAAgB;EACrC,MAAM,EAAE,IAAI,GACb;;AChBD,AAAA,SAAS,CAAgB;EACvB,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,YAAY;EACrB,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,GAAG;EACX,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,MAAM,GACvB;;AACD,AAAA,YAAY,EAAE,AAAA,YAAY,CAA+B;EACvD,QAAQ,EAAE,QAAQ;EAClB,IAAI,EAAE,CAAC;EACP,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM,GACnB;;AACD,AAAA,YAAY,CAAgB;EAAE,WAAW,EAAE,OAAO,GAAK;;AACvD,AAAA,YAAY,CAAgB;EAAE,SAAS,EAAE,GAAG,GAAK;;AACjD,AAAA,WAAW,CAAgB;EAAE,KAAK,EVTZ,IAAI,GUSyB;;ACnBnD;oEACoE;AAEpE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXwU1B,KAAO,GWxUsC;;AAC5D,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2d1B,KAAO,GW3dsC;;AAC5D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0jB1B,KAAO,GW1jBuC;;AAC9D,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXsO1B,KAAO,GWtO2C;;AACtE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuW1B,KAAO,GWvWsC;;AAC5D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXknB1B,KAAO,GWlnBqC;;AAC1D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXsnB1B,KAAO,GWtnBuC;;AAC9D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXytB1B,KAAO,GWztBqC;;AAC1D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXmR1B,KAAO,GWnRqC;;AAC1D,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXupB1B,KAAO,GWvpByC;;AAClE,AAAA,MAAM,AAAA,OAAO,CAAgB;EAAE,OAAO,EXqpB1B,KAAO,GWrpBmC;;AACtD,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXspB1B,KAAO,GWtpBwC;;AAChE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyI1B,KAAO,GWzIsC;;AAC5D,AAAA,UAAU,AAAA,OAAO;AACjB,AAAA,SAAS,AAAA,OAAO;AAChB,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXqqB1B,KAAO,GWrqBsC;;AAC5D,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EX8iB1B,KAAO,GW9iB4C;;AACxE,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4iB1B,KAAO,GW5iB6C;;AAC1E,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4f1B,KAAO,GW5f0C;;AACpE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXikB1B,KAAO,GWjkBuC;;AAC9D,AAAA,QAAQ,AAAA,OAAO;AACf,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EXgK1B,KAAO,GWhKoC;;AACxD,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+qB1B,KAAO,GW/qBwC;;AAChE,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXwV1B,KAAO,GWxVqC;;AAC1D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuP1B,KAAO,GWvPuC;;AAC9D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXgJ1B,KAAO,GWhJwC;;AAChE,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXmhB1B,KAAO,GWnhBqC;;AAC1D,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXgM1B,KAAO,GWhMyC;;AAClE,AAAA,uBAAuB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXY1B,KAAO,GWZoD;;AACxF,AAAA,qBAAqB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXc1B,KAAO,GWdkD;;AACpF,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXqW1B,KAAO,GWrWsC;;AAC5D,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXwe1B,KAAO,GWxe8C;;AAC5E,AAAA,gBAAgB,AAAA,OAAO;AACvB,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXsgB1B,KAAO,GWtgBuC;;AAC9D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXggB1B,KAAO,GWhgBwC;;AAChE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXwY1B,KAAO,GWxYyC;;AAClE,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2Y1B,KAAO,GW3YqC;;AAC1D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4P1B,KAAO,GW5PqC;;AAC1D,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoU1B,KAAO,GWpU2C;;AACtE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXitB1B,KAAO,GWjtB2C;;AACtE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+sB1B,KAAO,GW/sB4C;;AACxE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXgtB1B,KAAO,GWhtB0C;;AACpE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXye1B,KAAO,GWzeuC;;AAC9D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXwB1B,KAAO,GWxBwC;;AAChE,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EXymB1B,KAAO,GWzmBoC;;AACxD,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXymB1B,KAAO,GWzmBqC;;AAC1D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyD1B,KAAO,GWzDqC;;AAC1D,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyD1B,KAAO,GWzDyC;;AAClE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+d1B,KAAO,GW/dsC;;AAC5D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2E1B,KAAO,GW3EuC;;AAC9D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0P1B,KAAO,GW1PqC;;AAC1D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXiD1B,KAAO,GWjDqC;;AAC1D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0V1B,KAAO,GW1VuC;;AAC9D,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXwmB1B,KAAO,GWxmB4C;;AACxE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXwmB1B,KAAO,GWxmB2C;;AACtE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpC1B,KAAO,GWoC2C;;AACtE,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXvC1B,KAAO,GWuC6C;;AAC1E,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrC1B,KAAO,GWqC4C;;AACxE,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxC1B,KAAO,GWwC8C;;AAC5E,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+W1B,KAAO,GW/WqC;;AAC1D,AAAA,UAAU,AAAA,OAAO;AACjB,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2a1B,KAAO,GW3awC;;AAChE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXsU1B,KAAO,GWtUuC;;AAC9D,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXkrB1B,KAAO,GWlrB6C;;AAC1E,AAAA,SAAS,AAAA,OAAO;AAChB,AAAA,SAAS,AAAA,OAAO;AAChB,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0b1B,KAAO,GW1b0C;;AACpE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXkb1B,KAAO,GWlbuC;;AAC9D,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXwX1B,KAAO,GWxX2C;;AACtE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXtD1B,KAAO,GWsDuC;;AAC9D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXmnB1B,KAAO,GWnnBqC;;AAC1D,AAAA,QAAQ,AAAA,OAAO;AACf,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+a1B,KAAO,GW/agD;;AAChF,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX8f1B,KAAO,GW9f+C;;AAC9E,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+E1B,KAAO,GW/E+C;;AAC9E,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzB1B,KAAO,GWyBuC;;AAC9D,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXmjB1B,KAAO,GWnjB8C;;AAC5E,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXqL1B,KAAO,GWrL8C;;AAC5E,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlB1B,KAAO,GWkByC;;AAClE,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXsb1B,KAAO,GWtbqC;;AAC1D,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXga1B,KAAO,GWhasC;;AAC5D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXmjB1B,KAAO,GWnjBqC;;AAC1D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+N1B,KAAO,GW/NwC;;AAChE,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXgL1B,KAAO,GWhL6C;;AAC1E,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4iB1B,KAAO,GW5iB6C;;AAC1E,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+I1B,KAAO,GW/IsC;;AAC5D,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyE1B,KAAO,GWzE6C;;AAC1E,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyE1B,KAAO,GWzE8C;;AAC5E,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXkb1B,KAAO,GWlb4C;;AACxE,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuX1B,KAAO,GWvX6C;;AAC1E,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2lB1B,KAAO,GW3lB6C;;AAC1E,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2D1B,KAAO,GW3D6C;;AAC1E,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyb1B,KAAO,GWzbgD;;AAChF,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0S1B,KAAO,GW1S4C;;AACxE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0G1B,KAAO,GW1G2C;;AACtE,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXulB1B,KAAO,GWvlB+C;;AAC9E,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuD1B,KAAO,GWvD+C;;AAC9E,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnC1B,KAAO,GWmCoC;;AACxD,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnD1B,KAAO,GWmD2C;;AACtE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnD1B,KAAO,GWmD4C;;AACxE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnD1B,KAAO,GWmDyC;;AAClE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXvD1B,KAAO,GWuD2C;;AACtE,AAAA,gBAAgB,AAAA,OAAO;AACvB,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4d1B,KAAO,GW5dsC;;AAC5D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX8I1B,KAAO,GW9IuC;;AAC9D,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXsF1B,KAAO,GWtFyC;;AAClE,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+Z1B,KAAO,GW/ZqC;;AAC1D,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoW1B,KAAO,GWpWsC;;AAC5D,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpD1B,KAAO,GWoDyC;;AAClE,AAAA,sBAAsB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuI1B,KAAO,GWvImD;;AACtF,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXkN1B,KAAO,GWlNqC;;AAC1D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0S1B,KAAO,GW1SqC;;AAC1D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX6K1B,KAAO,GW7KqC;;AAC1D,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyI1B,KAAO,GWzIoC;;AACxD,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyI1B,KAAO,GWzI0C;;AACpE,AAAA,WAAW,AAAA,OAAO;AAClB,AAAA,wBAAwB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXiI1B,KAAO,GWjIqD;;AAC1F,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+Y1B,KAAO,GW/YsC;;AAC5D,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXA1B,KAAO,GWAyC;;AAClE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoa1B,KAAO,GWpauC;;AAC9D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXgE1B,KAAO,GWhEwC;;AAChE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX6T1B,KAAO,GW7TuC;;AAC9D,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuC1B,KAAO,GWvC2C;;AACtE,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXmC1B,KAAO,GWnC6C;;AAC1E,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+a1B,KAAO,GW/awC;;AAChE,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXkd1B,KAAO,GWld8C;;AAC5E,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0K1B,KAAO,GW1KuC;;AAC9D,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2K1B,KAAO,GW3K4C;;AACxE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3E1B,KAAO,GW2EyC;;AAClE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7E1B,KAAO,GW6EyC;;AAClE,AAAA,eAAe,AAAA,OAAO;AACtB,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlE1B,KAAO,GWkE0C;;AACpE,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+kB1B,KAAO,GW/kB+C;;AAC9E,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4H1B,KAAO,GW5HgD;;AAChF,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXT1B,KAAO,GWS6C;;AAC1E,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2Q1B,KAAO,GW3QoC;;AACxD,AAAA,SAAS,AAAA,OAAO;AAChB,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX6C1B,KAAO,GW7CqC;;AAC1D,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXkD1B,KAAO,GWlDyC;;AAClE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXsiB1B,KAAO,GWtiB4C;;AACxE,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoiB1B,KAAO,GWpiB8C;;AAC5E,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2e1B,KAAO,GW3e0C;;AACpE,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX8N1B,KAAO,GW9NwC;;AAChE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoc1B,KAAO,GWpcyC;;AAClE,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuR1B,KAAO,GWvRgD;;AAChF,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX6hB1B,KAAO,GW7hB2C;;AACtE,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXsG1B,KAAO,GWtG8C;;AAC5E,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX8b1B,KAAO,GW9bwC;;AAChE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXqjB1B,KAAO,GWrjBuC;;AAC9D,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXgL1B,KAAO,GWhL8C;;AAC5E,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXukB1B,KAAO,GWvkBuC;;AAC9D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXqQ1B,KAAO,GWrQwC;;AAChE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXiW1B,KAAO,GWjWsC;;AAC5D,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2d1B,KAAO,GW3dyC;;AAClE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXjD1B,KAAO,GWiD2C;;AACtE,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+V1B,KAAO,GW/V6C;;AAC1E,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXsjB1B,KAAO,GWtjBwC;;AAChE,AAAA,cAAc,AAAA,OAAO;AACrB,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXgG1B,KAAO,GWhGyC;;AAClE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoK1B,KAAO,GWpKuC;;AAC9D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0jB1B,KAAO,GW1jBuC;;AAC9D,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoC1B,KAAO,GWpC4C;;AACxE,AAAA,QAAQ,AAAA,OAAO;AACf,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+Y1B,KAAO,GW/YoC;;AACxD,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoM1B,KAAO,GWpMsC;;AAC5D,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrD1B,KAAO,GWqDyC;;AAClE,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXhF1B,KAAO,GWgFqC;;AAC1D,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrB1B,KAAO,GWqB4C;;AACxE,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoL1B,KAAO,GWpL6C;;AAC1E,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXkL1B,KAAO,GWlL4C;;AACxE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXmL1B,KAAO,GWnL0C;;AACpE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+K1B,KAAO,GW/K4C;;AACxE,AAAA,qBAAqB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrI1B,KAAO,GWqIkD;;AACpF,AAAA,sBAAsB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXjI1B,KAAO,GWiImD;;AACtF,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXjI1B,KAAO,GWiIgD;;AAChF,AAAA,qBAAqB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzI1B,KAAO,GWyIkD;;AACpF,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2J1B,KAAO,GW3JsC;;AAC5D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX6lB1B,KAAO,GW7lBuC;;AAC9D,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXqe1B,KAAO,GWresC;;AAC5D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyG1B,KAAO,GWzGuC;;AAC9D,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzE1B,KAAO,GWyE0C;;AACpE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlI1B,KAAO,GWkI2C;;AACtE,AAAA,SAAS,AAAA,OAAO;AAChB,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXijB1B,KAAO,GWjjBsC;;AAC5D,AAAA,SAAS,AAAA,OAAO;AAChB,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4O1B,KAAO,GW5OqC;;AAC1D,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXd1B,KAAO,GWcsC;;AAC5D,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0G1B,KAAO,GW1GsC;;AAC5D,AAAA,OAAO,AAAA,OAAO;AACd,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EX6X1B,KAAO,GW7XyC;;AAClE,AAAA,QAAQ,AAAA,OAAO;AACf,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2F1B,KAAO,GW3FwC;;AAChE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX6S1B,KAAO,GW7S0C;;AACpE,AAAA,QAAQ,AAAA,OAAO;AACf,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXqG1B,KAAO,GWrGyC;;AAClE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXgb1B,KAAO,GWhbuC;;AAC9D,AAAA,WAAW,AAAA,OAAO;AAClB,AAAA,WAAW,AAAA,OAAO;AAClB,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlI1B,KAAO,GWkIqC;;AAC1D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXsO1B,KAAO,GWtOwC;;AAChE,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoO1B,KAAO,GWpOwC;;AAChE,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+b1B,KAAO,GW/b8C;;AAC5E,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2gB1B,KAAO,GW3gB0C;;AACpE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuc1B,KAAO,GWvcsC;;AAC5D,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyO1B,KAAO,GWzOsC;;AAC5D,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EX6f1B,KAAO,GW7fsC;;AAC5D,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXmT1B,KAAO,GWnT0C;;AACpE,AAAA,oBAAoB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoT1B,KAAO,GWpTiD;;AAClF,AAAA,sBAAsB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXgI1B,KAAO,GWhImD;;AACtF,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4H1B,KAAO,GW5H4C;;AACxE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXqQ1B,KAAO,GWrQsC;;AAC5D,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpF1B,KAAO,GWoF2C;;AACtE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9E1B,KAAO,GW8EyC;;AAClE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrF1B,KAAO,GWqF2C;;AACtE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrF1B,KAAO,GWqF4C;;AACxE,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXhC1B,KAAO,GWgCwC;;AAChE,AAAA,YAAY,AAAA,OAAO;AACnB,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0Y1B,KAAO,GW1YqC;;AAC1D,AAAA,aAAa,AAAA,OAAO;AACpB,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX8Y1B,KAAO,GW9Y0C;;AACpE,AAAA,WAAW,AAAA,OAAO;AAClB,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2Y1B,KAAO,GW3YyC;;AAClE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXU1B,KAAO,GWVyC;;AAClE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuM1B,KAAO,GWvMyC;;AAClE,AAAA,eAAe,AAAA,OAAO;AACtB,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXqf1B,KAAO,GWrfqC;;AAC1D,AAAA,SAAS,AAAA,OAAO;AAChB,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoF1B,KAAO,GWpFsC;;AAC5D,AAAA,aAAa,AAAA,OAAO;AACpB,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+a1B,KAAO,GW/a2C;;AACtE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7C1B,KAAO,GW6C0C;;AACpE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX1C1B,KAAO,GW0C2C;;AACtE,AAAA,SAAS,AAAA,OAAO;AAChB,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpI1B,KAAO,GWoIqC;;AAC1D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX6W1B,KAAO,GW7WwC;;AAChE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXye1B,KAAO,GWzeyC;;AAClE,AAAA,SAAS,AAAA,OAAO;AAChB,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrE1B,KAAO,GWqE0C;;AACpE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXqL1B,KAAO,GWrL4C;;AACxE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXG1B,KAAO,GWHyC;;AAClE,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnE1B,KAAO,GWmE+C;;AAC9E,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnE1B,KAAO,GWmE6C;;AAC1E,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXif1B,KAAO,GWjfwC;;AAChE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EX8Y1B,KAAO,GW9Y4C;;AACxE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyZ1B,KAAO,GWzZyC;;AAClE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9J1B,KAAO,GW8JuC;;AAC9D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlE1B,KAAO,GWkEuC;;AAC9D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX1C1B,KAAO,GW0CwC;;AAChE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EX8B1B,KAAO,GW9B4C;;AACxE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX1I1B,KAAO,GW0I2C;;AACtE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXsH1B,KAAO,GWtH2C;;AACtE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrO1B,KAAO,GWqO0C;;AACpE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4M1B,KAAO,GW5MuC;;AAC9D,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXU1B,KAAO,GWV4C;;AACxE,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3K1B,KAAO,GW2KqC;;AAC1D,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuF1B,KAAO,GWvFyC;;AAClE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2Q1B,KAAO,GW3Q4C;;AACxE,AAAA,qBAAqB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrO1B,KAAO,GWqOkD;;AACpF,AAAA,sBAAsB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrO1B,KAAO,GWqOmD;;AACtF,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrO1B,KAAO,GWqOgD;;AAChF,AAAA,qBAAqB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzO1B,KAAO,GWyOkD;;AACpF,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrO1B,KAAO,GWqO2C;;AACtE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrO1B,KAAO,GWqO4C;;AACxE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrO1B,KAAO,GWqOyC;;AAClE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzO1B,KAAO,GWyO2C;;AACtE,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpD1B,KAAO,GWoDwC;;AAChE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4I1B,KAAO,GW5IuC;;AAC9D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXwY1B,KAAO,GWxYuC;;AAC9D,AAAA,gBAAgB,AAAA,OAAO;AACvB,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuM1B,KAAO,GWvMuC;;AAC9D,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzG1B,KAAO,GWyGyC;;AAClE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyQ1B,KAAO,GWzQ2C;;AACtE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyQ1B,KAAO,GWzQ4C;;AACxE,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+V1B,KAAO,GW/VwC;;AAChE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9G1B,KAAO,GW8GuC;;AAC9D,AAAA,cAAc,AAAA,OAAO;AACrB,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoR1B,KAAO,GWpRsC;;AAC5D,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+C1B,KAAO,GW/C2C;;AACtE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXmB1B,KAAO,GWnByC;;AAClE,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoB1B,KAAO,GWpB8C;;AAC5E,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXqU1B,KAAO,GWrUwC;;AAChE,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2B1B,KAAO,GW3BwC;;AAChE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXgL1B,KAAO,GWhLsC;;AAC5D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2B1B,KAAO,GW3BwC;;AAChE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuH1B,KAAO,GWvH2C;;AACtE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXM1B,KAAO,GWNuC;;AAC9D,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXI1B,KAAO,GWJ+C;;AAC9E,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EX6X1B,KAAO,GW7XyC;;AAClE,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXhH1B,KAAO,GWgHqC;;AAC1D,AAAA,kBAAkB,AAAA,OAAO;AACzB,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuQ1B,KAAO,GWvQ0C;;AACpE,AAAA,mBAAmB,AAAA,OAAO;AAC1B,AAAA,kBAAkB,AAAA,OAAO;AACzB,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXsV1B,KAAO,GWtV4C;;AACxE,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXwI1B,KAAO,GWxI+C;;AAC9E,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXhG1B,KAAO,GWgGqC;;AAC1D,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXvH1B,KAAO,GWuH0C;;AACpE,AAAA,UAAU,AAAA,OAAO;AACjB,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXtJ1B,KAAO,GWsJ6C;;AAC1E,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyO1B,KAAO,GWzOyC;;AAClE,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0F1B,KAAO,GW1FqC;;AAC1D,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EX1D1B,KAAO,GW0D4C;;AACxE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXkW1B,KAAO,GWlW4C;;AACxE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4V1B,KAAO,GW5V0C;;AACpE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlE1B,KAAO,GWkEuC;;AAC9D,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXgO1B,KAAO,GWhO6C;;AAC1E,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2J1B,KAAO,GW3J2C;;AACtE,AAAA,oBAAoB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2J1B,KAAO,GW3JiD;;AAClF,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXsR1B,KAAO,GWtRuC;;AAC9D,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX5L1B,KAAO,GW4L2C;;AACtE,AAAA,qBAAqB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxB1B,KAAO,GWwBkD;;AACpF,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuP1B,KAAO,GWvPuC;;AAC9D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX6I1B,KAAO,GW7IuC;;AAC9D,AAAA,uBAAuB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9J1B,KAAO,GW8JoD;;AACxF,AAAA,wBAAwB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9J1B,KAAO,GW8JqD;;AAC1F,AAAA,qBAAqB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9J1B,KAAO,GW8JkD;;AACpF,AAAA,uBAAuB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlK1B,KAAO,GWkKoD;;AACxF,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EX8D1B,KAAO,GW9DsC;;AAC5D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrH1B,KAAO,GWqHqC;;AAC1D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXvS1B,KAAO,GWuSuC;;AAC9D,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2Z1B,KAAO,GW3Z2C;;AACtE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXhN1B,KAAO,GWgNyC;;AAClE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7F1B,KAAO,GW6F2C;;AACtE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7F1B,KAAO,GW6F2C;;AACtE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+O1B,KAAO,GW/O2C;;AACtE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXiM1B,KAAO,GWjM4C;;AACxE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX6W1B,KAAO,GW7WuC;;AAC9D,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0I1B,KAAO,GW1I6C;;AAC1E,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0I1B,KAAO,GW1I+C;;AAC9E,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXqF1B,KAAO,GWrFyC;;AAClE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXmF1B,KAAO,GWnF2C;;AACtE,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnL1B,KAAO,GWmL6C;;AAC1E,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0K1B,KAAO,GW1K8C;;AAC5E,AAAA,wBAAwB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpF1B,KAAO,GWoFqD;;AAC1F,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXwP1B,KAAO,GWxP6C;;AAC1E,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXjJ1B,KAAO,GWiJwC;;AAChE,AAAA,eAAe,AAAA,OAAO;AACtB,AAAA,uBAAuB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/M1B,KAAO,GW+MoD;;AACxF,AAAA,aAAa,AAAA,OAAO;AACpB,AAAA,qBAAqB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9M1B,KAAO,GW8MkD;;AACpF,AAAA,gBAAgB,AAAA,OAAO;AACvB,AAAA,wBAAwB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXjN1B,KAAO,GWiNqD;;AAC1F,AAAA,QAAQ,AAAA,OAAO;AACf,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EXvG1B,KAAO,GWuGoC;;AACxD,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EXhC1B,KAAO,GWgCoC;;AACxD,AAAA,UAAU,AAAA,OAAO;AACjB,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EXqY1B,KAAO,GWrYoC;;AACxD,AAAA,SAAS,AAAA,OAAO;AAChB,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4C1B,KAAO,GW5CoC;;AACxD,AAAA,OAAO,AAAA,OAAO;AACd,AAAA,OAAO,AAAA,OAAO;AACd,AAAA,OAAO,AAAA,OAAO;AACd,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EXgD1B,KAAO,GWhDoC;;AACxD,AAAA,SAAS,AAAA,OAAO;AAChB,AAAA,UAAU,AAAA,OAAO;AACjB,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EXiN1B,KAAO,GWjNoC;;AACxD,AAAA,OAAO,AAAA,OAAO;AACd,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+C1B,KAAO,GW/CoC;;AACxD,AAAA,WAAW,AAAA,OAAO;AAClB,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3P1B,KAAO,GW2PoC;;AACxD,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXhG1B,KAAO,GWgGqC;;AAC1D,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpF1B,KAAO,GWoF0C;;AACpE,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0P1B,KAAO,GW1P+C;;AAC9E,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0P1B,KAAO,GW1PgD;;AAChF,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0P1B,KAAO,GW1PgD;;AAChF,AAAA,oBAAoB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0P1B,KAAO,GW1PiD;;AAClF,AAAA,oBAAoB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX6P1B,KAAO,GW7PiD;;AAClF,AAAA,qBAAqB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX6P1B,KAAO,GW7PkD;;AACpF,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXkU1B,KAAO,GWlU0C;;AACpE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EX8T1B,KAAO,GW9T4C;;AACxE,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXya1B,KAAO,GWza+C;;AAC9E,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXsa1B,KAAO,GWtawC;;AAChE,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2Z1B,KAAO,GW3ZqC;;AAC1D,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2Z1B,KAAO,GW3Z4C;;AACxE,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoa1B,KAAO,GWpa6C;;AAC1E,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxJ1B,KAAO,GWwJwC;;AAChE,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX8P1B,KAAO,GW9P+C;;AAC9E,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXgB1B,KAAO,GWhB0C;;AACpE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpF1B,KAAO,GWoFuC;;AAC9D,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3W1B,KAAO,GW2WoC;;AACxD,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/R1B,KAAO,GW+R0C;;AACpE,AAAA,oBAAoB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/R1B,KAAO,GW+RiD;;AAClF,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+U1B,KAAO,GW/UuC;;AAC9D,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+U1B,KAAO,GW/U8C;;AAC5E,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXgD1B,KAAO,GWhDgD;;AAChF,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXkD1B,KAAO,GWlD8C;;AAC5E,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+C1B,KAAO,GW/CgD;;AAChF,AAAA,oBAAoB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+C1B,KAAO,GW/CiD;;AAClF,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXjW1B,KAAO,GWiWsC;;AAC5D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXmY1B,KAAO,GWnYwC;;AAChE,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7W1B,KAAO,GW6WwC;;AAChE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXkC1B,KAAO,GWlCsC;;AAC5D,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EX5K1B,KAAO,GW4KyC;;AAClE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXgN1B,KAAO,GWhNsC;;AAC5D,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxF1B,KAAO,GWwF2C;;AACtE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4T1B,KAAO,GW5TuC;;AAC9D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXtI1B,KAAO,GWsIuC;;AAC9D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX6C1B,KAAO,GW7CqC;;AAC1D,AAAA,UAAU,AAAA,OAAO;AACjB,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EX5D1B,KAAO,GW4DyC;;AAClE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EX8P1B,KAAO,GW9PsC;;AAC5D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuE1B,KAAO,GWvEuC;;AAC9D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9W1B,KAAO,GW8WwC;;AAChE,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EXtS1B,KAAO,GWsSoC;;AACxD,AAAA,MAAM,AAAA,OAAO,CAAgB;EAAE,OAAO,EXiW1B,KAAO,GWjWmC;;AACtD,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuW1B,KAAO,GWvWsC;;AAC5D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+I1B,KAAO,GW/IuC;;AAC9D,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXkF1B,KAAO,GWlF0C;;AACpE,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX6N1B,KAAO,GW7N+C;;AAC9E,AAAA,wBAAwB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/W1B,KAAO,GW+WqD;;AAC1F,AAAA,uBAAuB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXjX1B,KAAO,GWiXoD;;AACxF,AAAA,eAAe,AAAA,OAAO;AACtB,AAAA,uBAAuB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzR1B,KAAO,GWyRoD;;AACxF,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnM1B,KAAO,GWmM6C;;AAC1E,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXiW1B,KAAO,GWjW2C;;AACtE,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoV1B,KAAO,GWpV6C;;AAC1E,AAAA,gBAAgB,AAAA,OAAO;AACvB,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0S1B,KAAO,GW1SoC;;AACxD,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0G1B,KAAO,GW1G8C;;AAC5E,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4M1B,KAAO,GW5M8C;;AAC5E,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXsL1B,KAAO,GWtLsC;;AAC5D,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzL1B,KAAO,GWyLgD;;AAChF,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoW1B,KAAO,GWpW0C;;AACpE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX8D1B,KAAO,GW9DuC;;AAC9D,AAAA,eAAe,AAAA,OAAO;AACtB,AAAA,QAAQ,AAAA,OAAO;AACf,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX8S1B,KAAO,GW9S2C;;AACtE,AAAA,gBAAgB,AAAA,OAAO;AACvB,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX1F1B,KAAO,GW0F+C;;AAC9E,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXsW1B,KAAO,GWtWsC;;AAC5D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlG1B,KAAO,GWkGuC;;AAC9D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXgH1B,KAAO,GWhHuC;;AAC9D,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXiH1B,KAAO,GWjH8C;;AAC5E,AAAA,sBAAsB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyN1B,KAAO,GWzNmD;;AACtF,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuN1B,KAAO,GWvN4C;;AACxE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/N1B,KAAO,GW+N0C;;AACpE,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX5N1B,KAAO,GW4NqC;;AAC1D,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2E1B,KAAO,GW3E8C;;AAC5E,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyE1B,KAAO,GWzE+C;;AAC9E,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXvN1B,KAAO,GWuNuC;;AAC9D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzC1B,KAAO,GWyCuC;;AAC9D,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpC1B,KAAO,GWoCyC;;AAClE,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EXtL1B,KAAO,GWsLoC;;AACxD,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7U1B,KAAO,GW6UyC;;AAClE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EX1R1B,KAAO,GW0RsC;;AAC5D,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EXsD1B,KAAO,GWtDoC;;AACxD,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXmL1B,KAAO,GWnLsC;;AAC5D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrP1B,KAAO,GWqPqC;;AAC1D,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrP1B,KAAO,GWqPsC;;AAC5D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7W1B,KAAO,GW6WwC;;AAChE,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7W1B,KAAO,GW6W+C;;AAC9E,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0L1B,KAAO,GW1LsC;;AAC5D,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0L1B,KAAO,GW1L6C;;AAC1E,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyF1B,KAAO,GWzFwC;;AAChE,AAAA,cAAc,AAAA,OAAO;AACrB,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzU1B,KAAO,GWyUoC;;AACxD,AAAA,OAAO,AAAA,OAAO;AACd,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+M1B,KAAO,GW/MqC;;AAC1D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4P1B,KAAO,GW5PqC;;AAC1D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuK1B,KAAO,GWvKwC;;AAChE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXtP1B,KAAO,GWsP2C;;AACtE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXiK1B,KAAO,GWjK2C;;AACtE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9P1B,KAAO,GW8PyC;;AAClE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/L1B,KAAO,GW+L2C;;AACtE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxL1B,KAAO,GWwL4C;;AACxE,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrM1B,KAAO,GWqM6C;;AAC1E,AAAA,qBAAqB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/L1B,KAAO,GW+LkD;;AACpF,AAAA,gBAAgB,AAAA,OAAO;AACvB,AAAA,kBAAkB,AAAA,OAAO;AACzB,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxM1B,KAAO,GWwM6C;;AAC1E,AAAA,cAAc,AAAA,OAAO;AACrB,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9M1B,KAAO,GW8M+C;;AAC9E,AAAA,gBAAgB,AAAA,OAAO;AACvB,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/M1B,KAAO,GW+M6C;;AAC1E,AAAA,gBAAgB,AAAA,OAAO;AACvB,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpM1B,KAAO,GWoM6C;;AAC1E,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXjN1B,KAAO,GWiN4C;;AACxE,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuR1B,KAAO,GWvRqC;;AAC1D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX5S1B,KAAO,GW4SwC;;AAChE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9E1B,KAAO,GW8EyC;;AAClE,AAAA,aAAa,AAAA,OAAO;AACpB,AAAA,aAAa,AAAA,OAAO;AACpB,AAAA,cAAc,AAAA,OAAO;AACrB,AAAA,WAAW,AAAA,OAAO;AAClB,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnE1B,KAAO,GWmE0C;;AACpE,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/T1B,KAAO,GW+T+C;;AAC9E,AAAA,MAAM,AAAA,OAAO;AACb,AAAA,cAAc,AAAA,OAAO;AACrB,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXqD1B,KAAO,GWrDsC;;AAC5D,AAAA,MAAM,AAAA,OAAO;AACb,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnQ1B,KAAO,GWmQuC;;AAC9D,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzK1B,KAAO,GWyK2C;;AACtE,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3K1B,KAAO,GW2KoC;;AACxD,AAAA,uBAAuB,AAAA,OAAO;AAC9B,AAAA,aAAa,AAAA,OAAO;AACpB,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxJ1B,KAAO,GWwJ4C;;AACxE,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2K1B,KAAO,GW3K8C;;AAC5E,AAAA,MAAM,AAAA,OAAO,CAAgB;EAAE,OAAO,EXiC1B,KAAO,GWjCmC;;AACtD,AAAA,UAAU,AAAA,OAAO;AACjB,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0Q1B,KAAO,GW1QuC;;AAC9D,AAAA,QAAQ,AAAA,OAAO;AACf,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXV1B,KAAO,GWU4C;;AACxE,AAAA,UAAU,AAAA,OAAO;AACjB,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXX1B,KAAO,GWW8C;;AAC5E,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX1I1B,KAAO,GW0IwC;;AAChE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlV1B,KAAO,GWkV4C;;AACxE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXjJ1B,KAAO,GWiJuC;;AAC9D,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXb1B,KAAO,GWa0C;;AACpE,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+F1B,KAAO,GW/FwC;;AAChE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuE1B,KAAO,GWvE0C;;AACpE,AAAA,oBAAoB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuE1B,KAAO,GWvEiD;;AAClF,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzZ1B,KAAO,GWyZqC;;AAC1D,AAAA,iBAAiB,AAAA,OAAO;AACxB,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EX5M1B,KAAO,GW4MyC;;AAClE,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0M1B,KAAO,GW1MoC;;AACxD,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxa1B,KAAO,GWwa2C;;AACtE,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXI1B,KAAO,GWJqC;;AAC1D,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuF1B,KAAO,GWvF2C;;AACtE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2M1B,KAAO,GW3MuC;;AAC9D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+Q1B,KAAO,GW/QqC;;AAC1D,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzC1B,KAAO,GWyC4C;;AACxE,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXwP1B,KAAO,GWxPqC;;AAC1D,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrZ1B,KAAO,GWqZ2C;;AACtE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXvB1B,KAAO,GWuBuC;;AAC9D,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3L1B,KAAO,GW2L8C;;AAC5E,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX5X1B,KAAO,GW4XwC;;AAChE,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXhY1B,KAAO,GWgY8C;;AAC5E,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnY1B,KAAO,GWmY4C;;AACxE,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXtY1B,KAAO,GWsYwC;;AAChE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlY1B,KAAO,GWkY0C;;AACpE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlY1B,KAAO,GWkY0C;;AACpE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3b1B,KAAO,GW2b2C;;AACtE,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3b1B,KAAO,GW2b6C;;AAC1E,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+K1B,KAAO,GW/KsC;;AAC5D,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnV1B,KAAO,GWmV0C;;AACpE,AAAA,MAAM,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9d1B,KAAO,GW8dmC;;AACtD,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX5R1B,KAAO,GW4R2C;;AACtE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/C1B,KAAO,GW+C4C;;AACxE,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9b1B,KAAO,GW8b8C;;AAC5E,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXtf1B,KAAO,GWsf2C;;AACtE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/B1B,KAAO,GW+B0C;;AACpE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzH1B,KAAO,GWyH2C;;AACtE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXvI1B,KAAO,GWuIuC;;AAC9D,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXvI1B,KAAO,GWuI8C;;AAC5E,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4J1B,KAAO,GW5J2C;;AACtE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4J1B,KAAO,GW5J0C;;AACpE,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxc1B,KAAO,GWwcwC;;AAChE,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EXjb1B,KAAO,GWiboC;;AACxD,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXvJ1B,KAAO,GWuJwC;;AAChE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3gB1B,KAAO,GW2gB0C;;AACpE,AAAA,MAAM,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7Z1B,KAAO,GW6ZmC;;AACtD,AAAA,UAAU,AAAA,OAAO;AACjB,AAAA,UAAU,AAAA,OAAO;AACjB,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzK1B,KAAO,GWyKoC;;AACxD,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpG1B,KAAO,GWoGyC;;AAClE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxb1B,KAAO,GWwb2C;;AACtE,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX5W1B,KAAO,GW4W+C;;AAC9E,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9V1B,KAAO,GW8VyC;;AAClE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9P1B,KAAO,GW8PyC;;AAClE,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrJ1B,KAAO,GWqJwC;;AAChE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXe1B,KAAO,GWfuC;;AAC9D,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2B1B,KAAO,GW3B6C;;AAC1E,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoC1B,KAAO,GWpC4C;;AACxE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXqC1B,KAAO,GWrCyC;;AAClE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX5a1B,KAAO,GW4a0C;;AACpE,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9a1B,KAAO,GW8agD;;AAChF,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/V1B,KAAO,GW+VwC;;AAChE,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoB1B,KAAO,GWpBqC;;AAC1D,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EX8K1B,KAAO,GW9K4C;;AACxE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/F1B,KAAO,GW+F2C;;AACtE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EX6E1B,KAAO,GW7E4C;;AACxE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9M1B,KAAO,GW8M0C;;AACpE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+K1B,KAAO,GW/KsC;;AAC5D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7H1B,KAAO,GW6HqC;;AAC1D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnH1B,KAAO,GWmHwC;;AAChE,AAAA,YAAY,AAAA,OAAO;AACnB,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXkI1B,KAAO,GWlI4C;;AACxE,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXkI1B,KAAO,GWlIgD;;AAChF,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0K1B,KAAO,GW1K6C;;AAC1E,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlI1B,KAAO,GWkI4C;;AACxE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXyK1B,KAAO,GWzK2C;;AACtE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnI1B,KAAO,GWmI4C;;AACxE,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlI1B,KAAO,GWkI8C;;AAC5E,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpI1B,KAAO,GWoI8C;;AAC5E,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX1G1B,KAAO,GW0GuC;;AAC9D,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7Q1B,KAAO,GW6Q2C;;AACtE,AAAA,qBAAqB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX1U1B,KAAO,GW0UkD;;AACpF,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzE1B,KAAO,GWyE4C;;AACxE,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXkL1B,KAAO,GWlLyC;;AAClE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXX1B,KAAO,GWWuC;;AAC9D,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXuJ1B,KAAO,GWvJ0C;;AACpE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXwJ1B,KAAO,GWxJ2C;;AACtE,AAAA,SAAS,AAAA,OAAO;AAChB,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/f1B,KAAO,GW+foC;;AACxD,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX4J1B,KAAO,GW5JwC;;AAChE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EX8G1B,KAAO,GW9GsC;;AAC5D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXwD1B,KAAO,GWxDuC;;AAC9D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9I1B,KAAO,GW8IuC;;AAC9D,AAAA,MAAM,AAAA,OAAO;AACb,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX0L1B,KAAO,GW1L6C;;AAC1E,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXjH1B,KAAO,GWiH8C;;AAC5E,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrH1B,KAAO,GWqHyC;;AAClE,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnW1B,KAAO,GWmW6C;;AAC1E,AAAA,aAAa,AAAA,OAAO;AACpB,AAAA,WAAW,AAAA,OAAO;AAClB,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/gB1B,KAAO,GW+gB6C;;AAC1E,AAAA,aAAa,AAAA,OAAO;AACpB,AAAA,0BAA0B,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9gB1B,KAAO,GW8gBuD;;AAC9F,AAAA,aAAa,AAAA,OAAO;AACpB,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlhB1B,KAAO,GWkhB6C;;AAC1E,AAAA,aAAa,AAAA,OAAO;AACpB,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnhB1B,KAAO,GWmhBgD;;AAChF,AAAA,aAAa,AAAA,OAAO;AACpB,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxhB1B,KAAO,GWwhB8C;;AAC5E,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3I1B,KAAO,GW2I8C;;AAC5E,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3O1B,KAAO,GW2OyC;;AAClE,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxI1B,KAAO,GWwI6C;;AAC1E,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxI1B,KAAO,GWwI+C;;AAC9E,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXwB1B,KAAO,GWxB4C;;AACxE,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXwB1B,KAAO,GWxB8C;;AAC5E,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/d1B,KAAO,GW+duC;;AAC9D,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXle1B,KAAO,GWke+C;;AAC9E,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpc1B,KAAO,GWocsC;;AAC5D,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXljB1B,KAAO,GWkjB8C;;AAC5E,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxP1B,KAAO,GWwP4C;;AACxE,AAAA,eAAe,AAAA,OAAO;AACtB,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzP1B,KAAO,GWyPgD;;AAChF,AAAA,eAAe,AAAA,OAAO;AACtB,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7P1B,KAAO,GW6P+C;;AAC9E,AAAA,eAAe,AAAA,OAAO;AACtB,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXhQ1B,KAAO,GWgQ8C;;AAC5E,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrQ1B,KAAO,GWqQ0C;;AACpE,AAAA,eAAe,AAAA,OAAO;AACtB,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxR1B,KAAO,GWwR4C;;AACxE,AAAA,eAAe,AAAA,OAAO;AACtB,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7R1B,KAAO,GW6R6C;;AAC1E,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX1R1B,KAAO,GW0RgD;;AAChF,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpS1B,KAAO,GWoS8C;;AAC5E,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3R1B,KAAO,GW2R6C;;AAC1E,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/R1B,KAAO,GW+R+C;;AAC9E,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXjS1B,KAAO,GWiS6C;;AAC1E,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX+D1B,KAAO,GW/D0C;;AACpE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/F1B,KAAO,GW+F2C;;AACtE,AAAA,oBAAoB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/b1B,KAAO,GW+biD;;AAClF,AAAA,MAAM,AAAA,OAAO,CAAgB;EAAE,OAAO,EXtU1B,KAAO,GWsUmC;;AACtD,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXtU1B,KAAO,GWsU0C;;AACpE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXkE1B,KAAO,GWlE4C;;AACxE,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrK1B,KAAO,GWqK8C;;AAC5E,AAAA,wBAAwB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrK1B,KAAO,GWqKqD;;AAC1F,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EX5U1B,KAAO,GW4U2C;;AACtE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXwH1B,KAAO,GWxH4C;;AACxE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnF1B,KAAO,GWmFuC;;AAC9D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXze1B,KAAO,GWyeuC;;AAC9D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9W1B,KAAO,GW8WwC;;AAChE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxK1B,KAAO,GWwKsC;;AAC5D,AAAA,qBAAqB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpQ1B,KAAO,GWoQkD;;AACpF,AAAA,MAAM,AAAA,OAAO;AACb,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXS1B,KAAO,GWT2C;;AACtE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXjd1B,KAAO,GWiduC;;AAC9D,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzoB1B,KAAO,GWyoBsC;;AAC5D,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/nB1B,KAAO,GW+nBuC;;AAC9D,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3hB1B,KAAO,GW2hBgD;;AAChF,AAAA,oBAAoB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9hB1B,KAAO,GW8hBiD;;AAClF,AAAA,oBAAoB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX5hB1B,KAAO,GW4hBiD;;AAClF,AAAA,oBAAoB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXjiB1B,KAAO,GWiiBiD;;AAClF,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpR1B,KAAO,GWoRyC;;AAClE,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX5N1B,KAAO,GW4NwC;;AAChE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX5N1B,KAAO,GW4N0C;;AACpE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/N1B,KAAO,GW+NsC;;AAC5D,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlO1B,KAAO,GWkOoC;;AACxD,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpe1B,KAAO,GWoe2C;;AACtE,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpe1B,KAAO,GWoe6C;;AAC1E,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXtS1B,KAAO,GWsSsC;;AAC5D,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXiF1B,KAAO,GWjFsC;;AAC5D,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlkB1B,KAAO,GWkkB0C;;AACpE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrX1B,KAAO,GWqX0C;;AACpE,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpI1B,KAAO,GWoI6C;;AAC1E,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpc1B,KAAO,GWocqC;;AAC1D,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXhe1B,KAAO,GWgegD;;AAChF,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpf1B,KAAO,GWofyC;;AAClE,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlN1B,KAAO,GWkNqC;;AAC1D,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX1X1B,KAAO,GW0X6C;;AAC1E,AAAA,OAAO,AAAA,OAAO,CAAgB;EAAE,OAAO,EXoD1B,KAAO,GWpDoC;;AACxD,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3J1B,KAAO,GW2J6C;;AAC1E,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzN1B,KAAO,GWyNyC;;AAClE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlH1B,KAAO,GWkHuC;;AAC9D,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7L1B,KAAO,GW6L6C;;AAC1E,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7L1B,KAAO,GW6L+C;;AAC9E,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3C1B,KAAO,GW2C4C;;AACxE,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3C1B,KAAO,GW2C8C;;AAC5E,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrG1B,KAAO,GWqG6C;;AAC1E,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrG1B,KAAO,GWqGgD;;AAChF,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7U1B,KAAO,GW6UwC;;AAChE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnlB1B,KAAO,GWmlB0C;;AACpE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXnlB1B,KAAO,GWmlB4C;;AACxE,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/L1B,KAAO,GW+LwC;;AAChE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlX1B,KAAO,GWkXuC;;AAC9D,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXkF1B,KAAO,GWlF2C;;AACtE,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXmF1B,KAAO,GWnFwC;;AAChE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9c1B,KAAO,GW8cuC;;AAC9D,AAAA,oBAAoB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX2B1B,KAAO,GW3BiD;;AAClF,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXmE1B,KAAO,GWnE+C;;AAC9E,AAAA,qBAAqB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxK1B,KAAO,GWwKkD;;AACpF,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9lB1B,KAAO,GW8lBsC;;AAC5D,AAAA,qBAAqB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXtoB1B,KAAO,GWsoBkD;;AACpF,AAAA,wBAAwB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXqD1B,KAAO,GWrDqD;;AAC1F,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxlB1B,KAAO,GWwlBwC;;AAChE,AAAA,+BAA+B,AAAA,OAAO,CAAgB;EAAE,OAAO,EX5oB1B,KAAO,GW4oB4D;;AACxG,AAAA,oBAAoB,AAAA,OAAO;AAC3B,AAAA,uCAAuC,AAAA,OAAO,CAAgB;EAAE,OAAO,EX9qB1B,KAAO,GW8qBoE;;AACxH,AAAA,YAAY,AAAA,OAAO;AACnB,AAAA,mBAAmB,AAAA,OAAO;AAC1B,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXvf1B,KAAO,GWufqC;;AAC1D,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXhY1B,KAAO,GWgYsC;;AAC5D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXhY1B,KAAO,GWgYwC;;AAChE,AAAA,WAAW,AAAA,OAAO;AAClB,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX1H1B,KAAO,GW0H8C;;AAC5E,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzR1B,KAAO,GWyR2C;;AACtE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXiC1B,KAAO,GWjCuC;;AAC9D,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXiC1B,KAAO,GWjC8C;;AAC5E,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlH1B,KAAO,GWkHyC;;AAClE,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlH1B,KAAO,GWkH+C;;AAC9E,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlH1B,KAAO,GWkHgD;;AAChF,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrN1B,KAAO,GWqN2C;;AACtE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpb1B,KAAO,GWob4C;;AACxE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXmE1B,KAAO,GWnEsC;;AAC5D,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpD1B,KAAO,GWoD0C;;AACpE,AAAA,sBAAsB,AAAA,OAAO;AAC7B,AAAA,wBAAwB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzY1B,KAAO,GWyYqD;;AAC1F,AAAA,MAAM,AAAA,OAAO;AACb,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7a1B,KAAO,GW6a6C;;AAC1E,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXtX1B,KAAO,GWsX4C;;AACxE,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlf1B,KAAO,GWkf8C;;AAC5E,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlf1B,KAAO,GWkfgD;;AAChF,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXtT1B,KAAO,GWsTuC;;AAC9D,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXptB1B,KAAO,GWotB6C;;AAC1E,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXptB1B,KAAO,GWotB+C;;AAC9E,AAAA,SAAS,AAAA,OAAO;AAChB,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXrtB1B,KAAO,GWqtB6C;;AAC1E,AAAA,WAAW,AAAA,OAAO;AAClB,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXttB1B,KAAO,GWstB+C;;AAC9E,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXJ1B,KAAO,GWI4C;;AACxE,AAAA,iBAAiB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXJ1B,KAAO,GWI8C;;AAC5E,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXH1B,KAAO,GWGuC;;AAC9D,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3W1B,KAAO,GW2WyC;;AAClE,AAAA,mBAAmB,AAAA,OAAO;AAC1B,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX5W1B,KAAO,GW4WwC;;AAChE,AAAA,qBAAqB,AAAA,OAAO;AAC5B,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7W1B,KAAO,GW6W0C;;AACpE,AAAA,SAAS,AAAA,OAAO,CAAgB;EAAE,OAAO,EXtN1B,KAAO,GWsNsC;;AAC5D,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3b1B,KAAO,GW2b+C;;AAC9E,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXtF1B,KAAO,GWsFyC;;AAClE,AAAA,iBAAiB,AAAA,OAAO;AACxB,AAAA,eAAe,AAAA,OAAO;AACtB,AAAA,oBAAoB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxE1B,KAAO,GWwEiD;;AAClF,AAAA,iBAAiB,AAAA,OAAO;AACxB,AAAA,8BAA8B,AAAA,OAAO,CAAgB;EAAE,OAAO,EXvE1B,KAAO,GWuE2D;;AACtG,AAAA,iBAAiB,AAAA,OAAO;AACxB,AAAA,oBAAoB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3E1B,KAAO,GW2EiD;;AAClF,AAAA,iBAAiB,AAAA,OAAO;AACxB,AAAA,uBAAuB,AAAA,OAAO,CAAgB;EAAE,OAAO,EX5E1B,KAAO,GW4EoD;;AACxF,AAAA,iBAAiB,AAAA,OAAO;AACxB,AAAA,qBAAqB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXjF1B,KAAO,GWiFkD;;AACpF,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EX3K1B,KAAO,GW2KuC;;AAC9D,AAAA,WAAW,AAAA,OAAO;AAClB,AAAA,OAAO,AAAA,OAAO;AACd,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXzrB1B,KAAO,GWyrBqC;;AAC1D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXlP1B,KAAO,GWkPwC;;AAChE,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXK1B,KAAO,GWLgD;;AAChF,AAAA,mBAAmB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXK1B,KAAO,GWLgD;;AAChF,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXK1B,KAAO,GWL+C;;AAC9E,AAAA,mBAAmB,AAAA,OAAO;AAC1B,AAAA,gBAAgB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXD1B,KAAO,GWC6C;;AAC1E,AAAA,qBAAqB,AAAA,OAAO;AAC5B,AAAA,kBAAkB,AAAA,OAAO,CAAgB;EAAE,OAAO,EXF1B,KAAO,GWE+C;;AAC9E,AAAA,YAAY,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxsB1B,KAAO,GWwsByC;;AAClE,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXpb1B,KAAO,GWobqC;;AAC1D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EX1hB1B,KAAO,GW0hBqC;;AAC1D,AAAA,QAAQ,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxY1B,KAAO,GWwYqC;;AAC1D,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EX/O1B,KAAO,GW+OwC;;AAChE,AAAA,WAAW,AAAA,OAAO,CAAgB;EAAE,OAAO,EXziB1B,KAAO,GWyiBwC;;AAChE,AAAA,aAAa,AAAA,OAAO,CAAgB;EAAE,OAAO,EXjU1B,KAAO,GWiU0C;;AACpE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EX7K1B,KAAO,GW6K4C;;AACxE,AAAA,eAAe,AAAA,OAAO,CAAgB;EAAE,OAAO,EXhI1B,KAAO,GWgI4C;;AACxE,AAAA,cAAc,AAAA,OAAO,CAAgB;EAAE,OAAO,EXJ1B,KAAO,GWI2C;;AACtE,AAAA,UAAU,AAAA,OAAO,CAAgB;EAAE,OAAO,EXxU1B,KAAO,GWwUuC;;ACjxB9D,AAAA,QAAQ,CAAC;EX8BP,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,CAAC;EACV,MAAM,EAAE,IAAI;EACZ,QAAQ,EAAE,MAAM;EAChB,IAAI,EAAE,gBAAa;EACnB,MAAM,EAAE,CAAC,GWrCsB;;AACjC,AX8CE,kBW9CgB,AX8ChB,OAAQ,EW9CV,AX+CE,kBW/CgB,AX+ChB,MAAO,CAAC;EACN,QAAQ,EAAE,MAAM;EAChB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,CAAC;EACT,QAAQ,EAAE,OAAO;EACjB,IAAI,EAAE,IAAI,GACX;;AnF7CH,AAAA,IAAI,CAAC;EACH,gBAAgB,EAAE,OAAO;EACzB,gBAAgB,EAAE,gDAAgD,GACnE;;AAED,AAAA,CAAC,EAAE,AAAA,CAAC,AAAA,OAAO,EAAE,AAAA,CAAC,AAAA,QAAQ,CAAC;EACrB,UAAU,EAAE,UAAU,GACvB;;AAED,AAAA,UAAU,CAAC;EACT,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,UAAU,EAAE,KAAK,GAClB;;AAED,AAAA,SAAS,CAAC;EACR,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,KAAK,EAAE,IAAI,GACZ;;AAED,AAAA,YAAY,CAAC;EACX,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,KAAK;EAChB,MAAM,EAAE,MAAM,GACf;;AAED,AAAA,SAAS,CAAC;EACR,OAAO,EAAE,SAAS;EAClB,UAAU,EAAE,IAAI;EAChB,SAAS,EAAE,KAAK;EAChB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,KAAK;EACjB,gBAAgB,EAAE,OAAO,GAC1B;;AAED,AAAA,cAAc,CAAC;EACb,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,KAAK;EAChB,MAAM,EAAE,IAAI,GACb;;AAED,AAAA,cAAc,CAAC;EACb,MAAM,EAAE,mBAAmB,GAM5B;EAPD,AAEE,cAFY,CAEZ,CAAC,CAAC;IACA,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;IACf,KAAK,EAAE,IAAI,GACZ;;AAGH,AAAA,eAAe,CAAC;EACd,OAAO,EAAE,IAAI;EACb,aAAa,EAAE,IAAI;EACnB,gBAAgB,EAAE,IAAI;EACtB,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,qBAAoB,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,sBAAqB,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAqB,GAW5G;EAfD,AAKE,eALa,AAKb,OAAQ,CAAC;IACP,OAAO,EAAE,KAAK,GACf;EAPH,AAQE,eARa,CAQb,MAAM,CAAC;IACL,KAAK,EAAE,IAAI;IACX,WAAW,EAAE,YAAY,GAC1B;EAXH,AAYE,eAZa,CAYb,UAAU,CAAC;IACT,UAAU,EAAE,IAAI,GACjB;;AAGH,AAAA,sBAAsB,CAAC;EACrB,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,SAAS;EAClB,SAAS,EAAE,MAAM;EACjB,WAAW,EAAE,MAAM;EACnB,KAAK,EAAE,IAAI;EACX,gBAAgB,EAAE,OAAO,GAiB1B;EAvBD,AAOE,sBAPoB,AAOpB,OAAQ,CAAC;IACP,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,IAAI;IACT,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,EAAE;IACX,gBAAgB,EAAE,OAAO;IACzB,gBAAgB,EAAE,kDAAkD,GACrE;EAhBH,AAiBE,sBAjBoB,CAiBpB,IAAI,CAAC;IACH,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,GAAG;IACR,YAAY,EAAE,GAAG;IACjB,SAAS,EAAE,IAAI,GAChB;;AAGH,AAAA,oBAAoB,CAAC;EACnB,OAAO,EAAE,cAAc,GAIxB;EALD,AAEe,oBAFK,CAElB,UAAU,GAAG,UAAU,CAAC;IACtB,UAAU,EAAE,KAAK,GAClB;;AAIH,AAAA,aAAa,CAAC;EACZ,OAAO,EAAE,QAAQ,GAIlB;EALD,AAEE,aAFW,CAEX,cAAc,CAAC;IACb,KAAK,EAAE,IAAI,GACZ;;AAGH,AAAgB,eAAD,CAAC,MAAM,CAAC;EACrB,MAAM,EAAE,SAAS,GAClB;;AAED,AAAA,MAAM,CAAC;EACL,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,OAAO;EACnB,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,kBAAc;EAChC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAe,GAIrC;EAVD,AAOE,MAPI,CAOJ,CAAC,CAAC;IACA,aAAa,EAAE,CAAC,GACjB;;AAEH,AAAA,WAAW,CAAC;EACV,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,eAAe,EAAE,MAAM;EACvB,KAAK,EAAE,GAAG;EACV,aAAa,EAAE,CAAC;EAChB,SAAS,EAAE,IAAI;EACf,OAAO,EAAE,EAAE,GAKZ;EAZD,AAQE,WARS,CAQT,GAAG,CAAC;IACF,KAAK,EAAE,IAAI;IACX,UAAU,EAAE,MAAM,GACnB;;AAGH,AAAA,WAAW,CAAC;EACV,OAAO,EAAE,SAAS,GACnB;;AAED,AAAA,YAAY,CAAC;EACX,GAAG,EAAE,CAAC;EACN,KAAK,EAAE,CAAC;EACR,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,IAAI,GAMd;EAVD,AAKE,YALU,CAKV,cAAc,CAAC;IACb,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,0BAA0B;IACnC,WAAW,EAAE,CAAC,GACf;;AAGH,AAAA,OAAO,CAAC;EACN,OAAO,EAAE,IAAI,GACd;;CACD,AAAA,AAAA,MAAC,CAAO,QAAQ,AAAf,EAAiB;EAChB,OAAO,EAAE,IAAI,GACd;;AAED,AAAA,YAAY,CAAC;EACX,KAAK,EAAE,IAAI;EACX,gBAAgB,EAAE,OAAO;EACzB,YAAY,EAAE,OAAO,GACtB;;AAKD,AAAA,aAAa,CAAC;EACZ,gBAAgB,EChLiB,OAAO,GDsLzC;EAPD,AAGE,aAHW,AAGX,WAAY,CAAC;IACX,SAAS,EAAE,IAAI,GAChB;;AAIH,AAAA,cAAc,CAAC;EACb,aAAa,EAAE,IAAI,GAcpB;EAfD,AAGE,cAHY,AAGZ,OAAQ,CAAC;IACP,OAAO,EAAE,KAAK;IACd,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,EAAE,GACZ;EAPH,AASE,cATY,CASZ,cAAc,CAAC;IACb,KAAK,EAAE,IAAI;IACX,WAAW,EAAE,GAAG;IAChB,aAAa,EAAE,GAAG;IAClB,UAAU,EAAE,IAAI,GACjB;;AAGH,AAII,eAJW,CAEb,cAAc,CAEZ,SAAS,CAAC;EACR,WAAW,EAAE,CAAC,GACf;;AANL,AAQI,eARW,CAEb,cAAc,CAMZ,cAAc,CAAC;EACb,KAAK,EAAE,IAAI,GACZ;;AAML,AAAQ,OAAD,CAAC,EAAE,CAAC;EACT,KAAK,EAAE,KAAK,GACb;;AAED,AAAM,KAAD,CAAC,cAAc,CAAC;EACnB,KAAK,EAAE,IAAI,GACZ;;AAED,AAAG,EAAD,CAAC,aAAa,CAAC;EACf,OAAO,EAAE,YAAY;EACrB,KAAK,EAAE,IAAI,GACZ;;AAED,AAAA,MAAM,CAAC;EACL,aAAa,EAAE,MAAM,GACtB;;AAED,AAAA,WAAW,CAAC;EACV,WAAW,EAAE,GAAG,GAOjB;EARD,AAGY,WAHD,CAGT,SAAS,CAAC,KAAK,CAAC;IACd,QAAQ,EAAE,MAAM;IAChB,WAAW,EAAE,CAAC,GACf;;AAIH,AAAA,WAAW,CAAC;EACV,WAAW,EAAE,GAAG;EAChB,aAAa,EAAE,CAAC,GACjB;;AAGD,AAAA,QAAQ,CAAC;EACP,KAAK,ECvK4B,OAAgB;EDwKjD,YAAY,ECxKqB,OAAgB,GDyKlD;;AACD,AAAA,MAAM,CAAC;EACL,YAAY,EC5KqB,OAAe,GD6KjD;;AAGD,AAAA,cAAc,CAAA,AAAA,QAAC,AAAA,EAAU;EACvB,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,IAAI,GACjB;;AAGD,AAAA,QAAQ,CAAC;EACP,KAAK,ECtL4B,OAAgB;EDuLjD,YAAY,ECvLqB,OAAgB,GDwLlD;;AAED,AAAA,MAAM,CAAC;EACL,YAAY,EC5LqB,OAAe,GD6LjD"
-}
\ No newline at end of file
diff --git a/installation/template/error.php b/installation/template/error.php
index dbb80563b8cd0..ca1122ff587ff 100644
--- a/installation/template/error.php
+++ b/installation/template/error.php
@@ -2,7 +2,7 @@
 /**
  * @package	Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license	GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/template/index.php b/installation/template/index.php
index c03d29b85dfe5..10982fdf4f200 100644
--- a/installation/template/index.php
+++ b/installation/template/index.php
@@ -2,7 +2,7 @@
 /**
  * @package	Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license	GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/template/js/preinstall.js b/installation/template/js/preinstall.js
index 9329ca73650f0..356842b79601b 100644
--- a/installation/template/js/preinstall.js
+++ b/installation/template/js/preinstall.js
@@ -1,6 +1,6 @@
 /**
  * @package     Joomla.Installation
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 Joomla = window.Joomla || {};
diff --git a/installation/template/js/remove.js b/installation/template/js/remove.js
index f14cc26a58a32..3791da629ef24 100644
--- a/installation/template/js/remove.js
+++ b/installation/template/js/remove.js
@@ -1,6 +1,6 @@
 /**
  * @package     Joomla.Installation
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 // Init on dom content loaded event
diff --git a/installation/template/js/setup.js b/installation/template/js/setup.js
index 6daca3c6ec379..8e2470310010e 100644
--- a/installation/template/js/setup.js
+++ b/installation/template/js/setup.js
@@ -1,6 +1,6 @@
 /**
  * @package     Joomla.Installation
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/template/js/template.js b/installation/template/js/template.js
index 68e152a5ad6f8..eede7e8404079 100644
--- a/installation/template/js/template.js
+++ b/installation/template/js/template.js
@@ -1,6 +1,6 @@
 /**
  * @package     Joomla.Installation
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 (function() {
diff --git a/installation/template/message.php b/installation/template/message.php
index 5df77a2ffce29..df2270d6d3441 100644
--- a/installation/template/message.php
+++ b/installation/template/message.php
@@ -3,12 +3,15 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\Layout\LayoutHelper;
+
 // @TODO Remove when webcomponents get merged into the core
 
 /**
@@ -39,7 +42,7 @@ public function render($name, $params = array(), $content = null)
 			'content' => $content,
 		);
 
-		$app        = JFactory::getApplication();
+		$app        = Factory::getApplication();
 		$chromePath = JPATH_THEMES . '/' . $app->getTemplate() . '/html/message.php';
 
 		if (file_exists($chromePath))
@@ -54,7 +57,7 @@ public function render($name, $params = array(), $content = null)
 			return renderMessage($msgList);
 		}
 
-		return JLayoutHelper::render('installation.template.html.system.message', $displayData);
+		return LayoutHelper::render('installation.template.html.system.message', $displayData);
 	}
 
 	/**
@@ -70,7 +73,7 @@ private function getData()
 		$lists = array();
 
 		// Get the message queue
-		$messages = JFactory::getApplication()->getMessageQueue();
+		$messages = Factory::getApplication()->getMessageQueue();
 
 		// Build the sorted message list
 		if (is_array($messages) && !empty($messages))
diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss
index 11e99a5919f63..1a3696bfb4093 100644
--- a/installation/template/scss/template.scss
+++ b/installation/template/scss/template.scss
@@ -278,9 +278,6 @@ legend {
 caption {
   caption-side: top;
 }
-.badge-warning {
-  color: #292b2c;
-}
 
 .fa-eye:before, .icon-eye-open:before, .icon-eye:before {
   font-family: FontAwesome;
diff --git a/installation/tmpl/error/default.php b/installation/tmpl/error/default.php
index e809e4046eb01..db8e7de94f5ac 100644
--- a/installation/tmpl/error/default.php
+++ b/installation/tmpl/error/default.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/tmpl/preinstall/default.php b/installation/tmpl/preinstall/default.php
index 5a11c00175c8a..6c7ea79d5e67e 100644
--- a/installation/tmpl/preinstall/default.php
+++ b/installation/tmpl/preinstall/default.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/tmpl/remove/default.php b/installation/tmpl/remove/default.php
index a6707ae4a30a6..b76c9d3a0b3ec 100644
--- a/installation/tmpl/remove/default.php
+++ b/installation/tmpl/remove/default.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/tmpl/setup/default.php b/installation/tmpl/setup/default.php
index 7a56d1a5b495c..1f315391859bc 100644
--- a/installation/tmpl/setup/default.php
+++ b/installation/tmpl/setup/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/language/en-GB/en-GB.com_ajax.ini b/language/en-GB/en-GB.com_ajax.ini
index cef5ced392ffa..b2eba95084108 100644
--- a/language/en-GB/en-GB.com_ajax.ini
+++ b/language/en-GB/en-GB.com_ajax.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.com_config.ini b/language/en-GB/en-GB.com_config.ini
index b7d4b07f71f10..85162773b467a 100644
--- a/language/en-GB/en-GB.com_config.ini
+++ b/language/en-GB/en-GB.com_config.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.com_contact.ini b/language/en-GB/en-GB.com_contact.ini
index 353438a837b93..181a2b739b13f 100644
--- a/language/en-GB/en-GB.com_contact.ini
+++ b/language/en-GB/en-GB.com_contact.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.com_content.ini b/language/en-GB/en-GB.com_content.ini
index 2df6991b08b65..069aa8c40f8ae 100644
--- a/language/en-GB/en-GB.com_content.ini
+++ b/language/en-GB/en-GB.com_content.ini
@@ -1,13 +1,13 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 COM_CONTENT_ARTICLE_CONTENT="Content"
 COM_CONTENT_ARTICLE_HITS="Hits: %s"
 COM_CONTENT_ARTICLE_INFO="Details"
-COM_CONTENT_ARTICLE_VOTE_FAILURE="You already rated this Article today!"
-COM_CONTENT_ARTICLE_VOTE_SUCCESS="Thank You for rating this Article."
+COM_CONTENT_ARTICLE_VOTE_FAILURE="You already rated this article today!"
+COM_CONTENT_ARTICLE_VOTE_SUCCESS="Thank you for rating this article."
 COM_CONTENT_AUTHOR_FILTER_LABEL="Author Filter"
 COM_CONTENT_CAPTCHA_DESC="Please complete the security check."
 COM_CONTENT_CAPTCHA_LABEL="Captcha"
@@ -28,6 +28,7 @@ COM_CONTENT_FIELD_FULL_LABEL="Full Article Image"
 COM_CONTENT_FIELD_IMAGE_ALT_LABEL="Alt Text"
 COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL="Caption"
 COM_CONTENT_FIELD_INTRO_LABEL="Intro Image"
+COM_CONTENT_FIELD_NOTE_LABEL="Note"
 COM_CONTENT_FIELD_URL_LINK_TEXT_LABEL="Link Text"
 COM_CONTENT_FIELD_URLA_LABEL="Link A"
 COM_CONTENT_FIELD_URLA_LINK_TEXT_LABEL="Link A Text"
@@ -59,7 +60,6 @@ COM_CONTENT_NEW_ARTICLE="New Article"
 COM_CONTENT_NO_ARTICLES="There are no articles in this category. If subcategories display on this page, they may have articles."
 COM_CONTENT_NONE="None"
 COM_CONTENT_NUM_ITEMS="Article Count:"
-COM_CONTENT_NUM_ITEMS_TIP="Article Count"
 COM_CONTENT_ON_NEW_CONTENT="A new Article has been submitted by '%1$s' entitled '%2$s'."
 COM_CONTENT_ORDERING="Ordering:<br>New articles default to the first position in the Category. The ordering can be changed in Backend."
 COM_CONTENT_PAGEBREAK_DOC_TITLE="Page Break"
diff --git a/language/en-GB/en-GB.com_finder.commonwords.txt b/language/en-GB/en-GB.com_finder.commonwords.txt
new file mode 100644
index 0000000000000..e9d9f063a5b78
--- /dev/null
+++ b/language/en-GB/en-GB.com_finder.commonwords.txt
@@ -0,0 +1,179 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : This file needs to be saved as UTF-8
+
+i
+me
+my
+myself
+we
+our
+ours
+ourselves
+you
+your
+yours
+yourself
+yourselves
+he
+him
+his
+himself
+she
+her
+hers
+herself
+it
+its
+itself
+they
+them
+their
+theirs
+themselves
+what
+which
+who
+whom
+this
+that
+these
+those
+am
+is
+are
+was
+were
+be
+been
+being
+have
+has
+had
+having
+do
+does
+did
+doing
+would
+should
+could
+ought
+i'm
+you're
+he's
+she's
+it's
+we're
+they're
+i've
+you've
+we've
+they've
+i'd
+you'd
+he'd
+she'd
+we'd
+they'd
+i'll
+you'll
+he'll
+she'll
+we'll
+they'll
+isn't
+aren't
+wasn't
+weren't
+hasn't
+haven't
+hadn't
+doesn't
+don't
+didn't
+won't
+wouldn't
+shan't
+shouldn't
+can't
+cannot
+couldn't
+mustn't
+let's
+that's
+who's
+what's
+here's
+there's
+when's
+where's
+why's
+how's
+a
+an
+the
+and
+but
+if
+or
+because
+as
+until
+while
+of
+at
+by
+for
+with
+about
+against
+between
+into
+through
+during
+before
+after
+above
+below
+to
+from
+up
+down
+in
+out
+on
+off
+over
+under
+again
+further
+then
+once
+here
+there
+when
+where
+why
+how
+all
+any
+both
+each
+few
+more
+most
+other
+some
+such
+no
+nor
+not
+only
+own
+same
+so
+than
+too
+very
diff --git a/language/en-GB/en-GB.com_finder.ini b/language/en-GB/en-GB.com_finder.ini
index 8c4ae4e618b23..fc8f558d8f879 100644
--- a/language/en-GB/en-GB.com_finder.ini
+++ b/language/en-GB/en-GB.com_finder.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.com_mailto.ini b/language/en-GB/en-GB.com_mailto.ini
index 16c6fd1f15712..1dd8c315ac2da 100644
--- a/language/en-GB/en-GB.com_mailto.ini
+++ b/language/en-GB/en-GB.com_mailto.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.com_media.ini b/language/en-GB/en-GB.com_media.ini
index 2629b242f9189..7bae6dc4c418c 100644
--- a/language/en-GB/en-GB.com_media.ini
+++ b/language/en-GB/en-GB.com_media.ini
@@ -1,31 +1,46 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
-COM_MEDIA_ACTIN_RENAME="Rename item"
+COM_MEDIA="Media"
 COM_MEDIA_ACTION_DELETE="Delete item"
+COM_MEDIA_ACTION_DOWNLOAD="Download item"
 COM_MEDIA_ACTION_EDIT="Edit item"
 COM_MEDIA_ACTION_PREVIEW="Preview item"
+COM_MEDIA_ACTION_RENAME="Rename item"
 COM_MEDIA_ACTION_SHARE="Get a sharable link"
 COM_MEDIA_ALIGN="Image Float"
 COM_MEDIA_ALIGN_DESC="This will apply the classes 'float-left', 'pull-center' or 'float-right' to the '<figure>' or '<img>' element."
+COM_MEDIA_BREADCRUMB_LABEL="Breadcrumb"
 COM_MEDIA_BROWSE_FILES="Browse Files"
 COM_MEDIA_CAPTION="Caption"
 COM_MEDIA_CAPTION_CLASS_DESC="This will apply the entered class to the '<figcaption>' element. For example: 'text-left', 'text-right', 'text-center'."
 COM_MEDIA_CAPTION_CLASS_LABEL="Caption Class"
 COM_MEDIA_CLEAR_LIST="Clear List"
 COM_MEDIA_CONFIGURATION="Media: Options"
+COM_MEDIA_CONFIRM_DELETE_MODAL="Delete"
+COM_MEDIA_CONFIRM_DELETE_MODAL_HEADING="Confirm Delete"
 COM_MEDIA_CREATE_FOLDER="Create Folder"
+COM_MEDIA_CREATE_NEW_FOLDER="Create New Folder"
+COM_MEDIA_CREATE_NEW_FOLDER_ERROR="Error creating folder."
+COM_MEDIA_CREATE_NEW_FOLDER_SUCCESS="Folder created."
 COM_MEDIA_CURRENT_PROGRESS="Current progress"
 COM_MEDIA_DECREASE_GRID="Decrease grid size"
+COM_MEDIA_DELETE_ERROR="Error deleting the item."
+COM_MEDIA_DELETE_SUCCESS="Item deleted."
 COM_MEDIA_DESCFTP="To upload, change and delete media files, Joomla! will most likely need your FTP account details. Please enter them in the form fields below."
 COM_MEDIA_DESCFTPTITLE="FTP Login Details"
 COM_MEDIA_DETAIL_VIEW="Detail View"
 COM_MEDIA_DIRECTORY="Folder"
 COM_MEDIA_DIRECTORY_UP="Folder Up"
+COM_MEDIA_DROP_FILE="Drop file(s) to Upload"
+COM_MEDIA_ERROR="An error occurred."
 COM_MEDIA_ERROR_BAD_REQUEST="Bad Request"
 COM_MEDIA_ERROR_FILE_EXISTS="File already exists."
+COM_MEDIA_ERROR_NOT_AUTHENTICATED="You are not authenticated. Please login."
+COM_MEDIA_ERROR_NOT_AUTHORIZED="You are not authorized"
+COM_MEDIA_ERROR_NOT_FOUND="File or Folder not found"
 COM_MEDIA_ERROR_UNABLE_TO_BROWSE_FOLDER_WARNDIRNAME="Unable to browse:&#160;%s. Folder name must only have alphanumeric characters and no spaces."
 COM_MEDIA_ERROR_UNABLE_TO_CREATE_FOLDER_WARNDIRNAME="Unable to create folder. Folder name must only have alphanumeric characters and no spaces."
 COM_MEDIA_ERROR_UNABLE_TO_DELETE="Unable to delete:&#160;"
@@ -55,34 +70,55 @@ COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_DESC="Enter the path to the image folder relat
 COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_LABEL="Path to Image Folder"
 COM_MEDIA_FIELD_RESTRICT_UPLOADS_DESC="Restrict uploads for lower than manager users to images if Fileinfo or MIME Magic isn't installed."
 COM_MEDIA_FIELD_RESTRICT_UPLOADS_LABEL="Restrict Uploads"
+COM_MEDIA_FILE_EXISTS_AND_OVERRIDE="%s already exists. Do you want to replace it?"
 COM_MEDIA_FILES="Files"
 COM_MEDIA_FILESIZE="File size"
 COM_MEDIA_FOLDER="Folder"
+COM_MEDIA_FOLDER_NAME="Folder Name"
 COM_MEDIA_FOLDERS="Folders"
 COM_MEDIA_IMAGE_DESCRIPTION="Image Description"
 COM_MEDIA_IMAGE_URL="Image URL"
 COM_MEDIA_INCREASE_GRID="Increase grid size"
+COM_MEDIA_INCREASE_GRID="Increase grid size"
 COM_MEDIA_INSERT="Insert"
 COM_MEDIA_INSERT_IMAGE="Insert Image"
 COM_MEDIA_MAXIMUM_SIZE="Maximum Size"
 COM_MEDIA_MEDIA="Media"
+COM_MEDIA_MEDIA_DATE_CREATED="Date created"
+COM_MEDIA_MEDIA_DATE_MODIFIED="Date modified"
+COM_MEDIA_MEDIA_DIMENSION="Dimensions"
+COM_MEDIA_MEDIA_EXTENSION="Extension"
+COM_MEDIA_MEDIA_MIME_TYPE="MIME Type"
+COM_MEDIA_MEDIA_NAME="Name"
+COM_MEDIA_MEDIA_SIZE="Size"
+COM_MEDIA_MEDIA_TYPE="Type"
 COM_MEDIA_NAME="Image Name"
 COM_MEDIA_NO_IMAGES_FOUND="No Images Found"
 COM_MEDIA_NOT_SET="Not Set"
 COM_MEDIA_OPEN_ITEM_ACTIONS="Open item actions"
 COM_MEDIA_OVERALL_PROGRESS="Overall Progress"
 COM_MEDIA_PIXEL_DIMENSIONS="Pixel Dimensions (w x h)"
+COM_MEDIA_PLEASE_SELECT_ITEM="Please select item."
+COM_MEDIA_RENAME="Rename"
+COM_MEDIA_RENAME_ERROR="Error renaming item."
+COM_MEDIA_RENAME_SUCCESS="Item renamed."
+COM_MEDIA_SEARCH="Search..."
 COM_MEDIA_SELECT_ALL="Toggle select all"
+COM_MEDIA_SERVER_ERROR="Internal server error"
+COM_MEDIA_SHARE="Share the file"
+COM_MEDIA_SHARE_COPY="Copy to clipboard"
+COM_MEDIA_SHARE_COPY_FAILED_ERROR="Error copying to clipboard"
+COM_MEDIA_SHARE_DESC="Share the file with others. Anyone with link can view the file"
 COM_MEDIA_START_UPLOAD="Start Upload"
 COM_MEDIA_THUMBNAIL_VIEW="Thumbnail View"
 COM_MEDIA_TITLE="Image Title"
 COM_MEDIA_TOGGLE_INFO="Toggle item info"
 COM_MEDIA_TOGGLE_LIST_VIEW="Toggle between grid and table views"
 COM_MEDIA_TOGGLE_SELECT_ITEM="Toggle select item"
+COM_MEDIA_TOOLBAR_LABEL="Media Manager"
 COM_MEDIA_UP="Up"
 COM_MEDIA_UPLOAD="Upload"
 COM_MEDIA_UPLOAD_COMPLETE="Upload Complete"
 COM_MEDIA_UPLOAD_FILE="Upload file"
+COM_MEDIA_UPLOAD_SUCCESS="Item uploaded."
 COM_MEDIA_UPLOAD_SUCCESSFUL="Upload Successful"
-COM_MEDIA_SHARE="Share the file"
-COM_MEDIA_SHARE_DESC="Share the file with others. Anyone with link can view the file"
diff --git a/language/en-GB/en-GB.com_messages.ini b/language/en-GB/en-GB.com_messages.ini
index f59d5fea1baf5..515b34c9d8cf2 100644
--- a/language/en-GB/en-GB.com_messages.ini
+++ b/language/en-GB/en-GB.com_messages.ini
@@ -1,10 +1,8 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 COM_MESSAGES_ERR_SEND_FAILED="The user has locked their mailbox. Message failed."
 COM_MESSAGES_NEW_MESSAGE="New Message from %1$s at %2$s"
-; The following string is deprecated and will be removed in Joomla 4.0
-COM_MESSAGES_NEW_MESSAGE_ARRIVED="A new private message has arrived from %s"
 COM_MESSAGES_PLEASE_LOGIN="Please log in to %s to read your message."
diff --git a/language/en-GB/en-GB.com_newsfeeds.ini b/language/en-GB/en-GB.com_newsfeeds.ini
index b9c5648f2711e..30f2703833b92 100644
--- a/language/en-GB/en-GB.com_newsfeeds.ini
+++ b/language/en-GB/en-GB.com_newsfeeds.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.com_privacy.ini b/language/en-GB/en-GB.com_privacy.ini
new file mode 100644
index 0000000000000..4f93e9774eecf
--- /dev/null
+++ b/language/en-GB/en-GB.com_privacy.ini
@@ -0,0 +1,53 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_PRIVACY="Privacy"
+COM_PRIVACY_ADMIN_NOTIFICATION_USER_CONFIRMED_REQUEST_MESSAGE="User %1$s has confirmed their information request."
+COM_PRIVACY_ADMIN_NOTIFICATION_USER_CONFIRMED_REQUEST_SUBJECT="Information Request Confirmed By User"
+COM_PRIVACY_ADMIN_NOTIFICATION_USER_CREATED_REQUEST_MESSAGE="A new information request has been submitted by %1$s."
+COM_PRIVACY_ADMIN_NOTIFICATION_USER_CREATED_REQUEST_SUBJECT="Information Request Submitted"
+COM_PRIVACY_CONFIRM_REMIND_SUCCEEDED="Your consent to this web site's Privacy Policy has been extended."
+COM_PRIVACY_CONFIRM_REQUEST_FIELDSET_LABEL="An email has been sent to your email address. The email has a confirmation token, please confirm your email address again and paste the confirmation token in the field below to prove that you are the owner of the information being requested."
+COM_PRIVACY_CONFIRM_REQUEST_SUCCEEDED="Your information request has been confirmed."
+COM_PRIVACY_CREATE_REQUEST_SUCCEEDED="Your information request has been created. Before it can be processed, you must verify this request. An email has been sent to your address with additional instructions to complete this verification."
+; You can use the following merge codes for all COM_PRIVACY_EMAIL strings:
+; [SITENAME]  Site name, as set in Global Configuration.
+; [URL]       URL of the site's frontend page.
+; [TOKENURL]  URL of the confirm page with the token prefilled.
+; [FORMURL]   URL of the confirm page where the user can paste their token.
+; [TOKEN]     The confirmation token.
+; \n          Newline character. Use it to start a new line in the email.
+COM_PRIVACY_EMAIL_REQUEST_BODY_EXPORT_REQUEST="Someone has created a request to export all personal information related to this email address at [URL]. As a security measure, you must confirm that this is a valid request for your personal information from this website.\n\nIn order to confirm this request, you can complete one of the following tasks:\n\n1. Visit the following URL: [TOKENURL]\n\n2. Copy your token from this email, visit the referenced URL, and paste your token into the form.\nURL: [FORMURL]\nToken: [TOKEN]\n\nPlease note that this token is only valid for 24 hours from the time this email was sent."
+COM_PRIVACY_EMAIL_REQUEST_BODY_REMOVE_REQUEST="Someone has created a request to remove all personal information related to this email address at [URL]. As a security measure, you must confirm that this is a valid request for your personal information to be removed from this website.\n\nIn order to confirm this request, you can complete one of the following tasks:\n\n1. Visit the following URL: [TOKENURL]\n\n2. Copy your token from this email, visit the referenced URL, and paste your token into the form.\nURL: [FORMURL]\nToken: [TOKEN]\n\nPlease note that this token is only valid for 24 hours from the time this email was sent."
+COM_PRIVACY_EMAIL_REQUEST_SUBJECT_EXPORT_REQUEST="Information Request Created at [SITENAME]"
+COM_PRIVACY_EMAIL_REQUEST_SUBJECT_REMOVE_REQUEST="Information Deletion Request Created at [SITENAME]"
+COM_PRIVACY_ERROR_CANNOT_CREATE_REQUEST_WHEN_SENDMAIL_DISABLED="An information request can't be created when email support is disabled."
+COM_PRIVACY_ERROR_CHECKING_FOR_EXISTING_REQUESTS="There was an error checking for existing information requests, please try submitting this request again."
+COM_PRIVACY_ERROR_CONFIRM_TOKEN_EXPIRED="The confirmation token for your information request has expired. You will need to submit a new request."
+COM_PRIVACY_ERROR_CONFIRMING_REMIND_FAILED="No expiration reminder was found."
+COM_PRIVACY_ERROR_CONFIRMING_REQUEST="Error while confirming the information request."
+COM_PRIVACY_ERROR_CONFIRMING_REQUEST_FAILED="Your information request confirmation failed. %s"
+COM_PRIVACY_ERROR_CREATING_REQUEST="Error while creating the information request."
+COM_PRIVACY_ERROR_CREATING_REQUEST_FAILED="Your information request could not be created. %s"
+COM_PRIVACY_ERROR_NO_PENDING_REMIND="No expiration reminder has been sent yet."
+COM_PRIVACY_ERROR_NO_PENDING_REQUESTS="There are no information requests for this email address requiring confirmation."
+COM_PRIVACY_ERROR_NO_REMIND_REQUESTS="Please re-check the token"
+COM_PRIVACY_ERROR_PENDING_REQUEST_OPEN="There is already an active information request for this email address and request type. Please contact the site owner for updates on this request."
+COM_PRIVACY_ERROR_REMIND_REQUEST="An error occurred while processing your request."
+COM_PRIVACY_ERROR_UNKNOWN_REQUEST_TYPE="Unknown information request type."
+COM_PRIVACY_FIELD_CONFIRM_CONFIRM_TOKEN_DESC="Enter the confirmation token you received by email."
+COM_PRIVACY_FIELD_CONFIRM_CONFIRM_TOKEN_LABEL="Confirmation Token"
+COM_PRIVACY_FIELD_CONFIRM_EMAIL_DESC="Enter your email address."
+COM_PRIVACY_FIELD_REMIND_CONFIRM_TOKEN_DESC="Enter the confirmation token you received by email."
+COM_PRIVACY_FIELD_REMIND_CONFIRM_TOKEN_LABEL="Confirmation Token"
+COM_PRIVACY_FIELD_REQUEST_TYPE_DESC="The type of information request."
+COM_PRIVACY_FIELD_REQUEST_TYPE_LABEL="Request Type"
+COM_PRIVACY_FIELD_STATUS_DESC="The status of the information request."
+COM_PRIVACY_REMIND_REQUEST_FIELDSET_LABEL="Renew Privacy Consent"
+COM_PRIVACY_REQUEST_TYPE_EXPORT="Export"
+COM_PRIVACY_REQUEST_TYPE_REMOVE="Remove"
+COM_PRIVACY_VIEW_CONFIRM_PAGE_TITLE="Confirm Information Request"
+COM_PRIVACY_VIEW_REQUEST_PAGE_TITLE="Submit Information Request"
+COM_PRIVACY_WARNING_CANNOT_CREATE_REQUEST_WHEN_SENDMAIL_DISABLED="We're sorry, you can't submit an information request at this time."
diff --git a/language/en-GB/en-GB.com_search.ini b/language/en-GB/en-GB.com_search.ini
index 66abdb5f48f68..cdada49d4090c 100644
--- a/language/en-GB/en-GB.com_search.ini
+++ b/language/en-GB/en-GB.com_search.ini
@@ -1,5 +1,5 @@
 ; author Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; license GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.com_tags.ini b/language/en-GB/en-GB.com_tags.ini
index 991ec9714ca5e..c0a9a200eae0e 100644
--- a/language/en-GB/en-GB.com_tags.ini
+++ b/language/en-GB/en-GB.com_tags.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.com_users.ini b/language/en-GB/en-GB.com_users.ini
index ed9c063c98b86..a79110d59979c 100644
--- a/language/en-GB/en-GB.com_users.ini
+++ b/language/en-GB/en-GB.com_users.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -37,6 +37,7 @@ COM_USERS_FIELD_RESET_PASSWORD1_LABEL="Password"
 COM_USERS_FIELD_RESET_PASSWORD1_MESSAGE="The passwords you entered do not match. Please enter your desired password in the password field and confirm your entry by entering it in the confirm password field."
 COM_USERS_FIELD_RESET_PASSWORD2_LABEL="Confirm Password"
 COM_USERS_INVALID_EMAIL="Invalid email address"
+COM_USERS_LOGIN_DEFAULT_LABEL="User Login"
 COM_USERS_LOGIN_IMAGE_ALT="Login image"
 COM_USERS_LOGIN_REGISTER="Don't have an account?"
 COM_USERS_LOGIN_REMEMBER_ME="Remember me"
@@ -62,6 +63,7 @@ COM_USERS_PROFILE_BIND_FAILED="Could not bind profile data: %s"
 COM_USERS_PROFILE_CORE_LEGEND="Profile"
 COM_USERS_PROFILE_DEFAULT_LABEL="Edit Your Profile"
 COM_USERS_PROFILE_EMAIL1_LABEL="Email Address"
+; The following string is deprecated and will be removed with 4.0
 COM_USERS_PROFILE_EMAIL1_MESSAGE="The email address you entered is already in use or invalid. Please enter another email address."
 COM_USERS_PROFILE_LAST_VISITED_DATE_LABEL="Last Visited Date"
 COM_USERS_PROFILE_NAME_LABEL="Name"
@@ -83,12 +85,15 @@ COM_USERS_PROFILE_USERNAME_LABEL="Username"
 COM_USERS_PROFILE_USERNAME_MESSAGE="The username you entered is not available. Please pick another username."
 COM_USERS_PROFILE_VALUE_NOT_FOUND="No Information Entered"
 COM_USERS_REGISTER_EMAIL1_LABEL="Email Address"
+; The following string is deprecated and will be removed with 4.0
 COM_USERS_REGISTER_EMAIL1_MESSAGE="The email address you entered is already in use or invalid. Please enter another email address."
 COM_USERS_REGISTER_NAME_LABEL="Name"
 COM_USERS_REGISTER_REQUIRED="<strong class=\"red\">*</strong> Required field"
 COM_USERS_REGISTER_USERNAME_LABEL="Username"
 COM_USERS_REGISTER_USERNAME_MESSAGE="The username you entered is not available. Please pick another username."
 COM_USERS_REGISTRATION="User Registration"
+COM_USERS_REGISTRATION_ACL_ADMIN_ACTIVATION="Please log in to confirm that you are authorised to activate new accounts."
+COM_USERS_REGISTRATION_ACL_ADMIN_ACTIVATION_PERMISSIONS="You are not authorised to activate new accounts, please log in with a privileged account."
 COM_USERS_REGISTRATION_ACTIVATE_SUCCESS="Your Account has been activated. You can now log in using the username and password you chose during the registration."
 COM_USERS_REGISTRATION_ACTIVATION_NOTIFY_SEND_MAIL_FAILED="An error was encountered while sending activation notification email"
 COM_USERS_REGISTRATION_ACTIVATION_SAVE_FAILED="Failed to save activation data: %s"
diff --git a/language/en-GB/en-GB.com_wrapper.ini b/language/en-GB/en-GB.com_wrapper.ini
index ed97c10a8416a..e9f568cd6f875 100644
--- a/language/en-GB/en-GB.com_wrapper.ini
+++ b/language/en-GB/en-GB.com_wrapper.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.files_joomla.sys.ini b/language/en-GB/en-GB.files_joomla.sys.ini
index f1fbe75c73507..ffa68feee522d 100644
--- a/language/en-GB/en-GB.files_joomla.sys.ini
+++ b/language/en-GB/en-GB.files_joomla.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.finder_cli.ini b/language/en-GB/en-GB.finder_cli.ini
index 8d632a9e6b262..94494edce7e5d 100644
--- a/language/en-GB/en-GB.finder_cli.ini
+++ b/language/en-GB/en-GB.finder_cli.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini
index 1138ed7818f48..e5e976fafc1c6 100644
--- a/language/en-GB/en-GB.ini
+++ b/language/en-GB/en-GB.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -44,6 +44,7 @@ JACTION_EDIT="Edit"
 JACTION_EDITOWN="Edit Own"
 JACTION_EDITSTATE="Edit State"
 JACTION_LOGIN_ADMIN="Administrator Login"
+JACTION_LOGIN_API="Web Services Login"
 JACTION_LOGIN_SITE="Site Login"
 JACTION_MANAGE="Access Administration Interface"
 
@@ -99,7 +100,6 @@ JSITE="Site"
 JSTATUS="Status"
 JSUBMIT="Submit"
 JTAG="Tags"
-JTAG_DESC="Assign tags to content items. You may select a tag from the pre-defined list or enter a new tag by typing the name in the field and pressing enter."
 JTAG_FIELD_SELECT_DESC="Select the tag to use."
 JTOOLBAR="Toolbar"
 JTOOLBAR_VERSIONS="Versions"
@@ -140,6 +140,7 @@ JERROR_LOADING_MENUS="Error loading Menus: %s"
 JERROR_LOGIN_DENIED="You can't access the private section of this site."
 JERROR_NOLOGIN_BLOCKED="Login denied! Your account has either been blocked or you have not activated it yet."
 JERROR_PAGE_NOT_FOUND="Page not found"
+JERROR_SENDING_EMAIL="Email could not be sent."
 JERROR_SESSION_STARTUP="Error starting the session."
 JERROR_TABLE_BIND_FAILED="hmm %s ..."
 JERROR_USERS_PROFILE_NOT_FOUND="User profile not found"
@@ -172,6 +173,7 @@ JFIELD_TITLE_DESC="Title for the article."
 
 JGLOBAL_ADD_CUSTOM_CATEGORY="Add new Category"
 JGLOBAL_ARTICLES="Articles"
+JGLOBAL_CONFIRM_DELETE="Are you sure you want to delete? Confirming will permanently delete the selected item(s)!"
 JGLOBAL_FIELDS="Fields"
 JGLOBAL_AUTH_ACCESS_DENIED="Access Denied"
 JGLOBAL_AUTH_ACCESS_GRANTED="Access Granted"
@@ -184,9 +186,6 @@ JGLOBAL_AUTH_FAILED="Failed to authenticate: %s"
 JGLOBAL_AUTH_INCORRECT="Incorrect username/password"
 JGLOBAL_AUTH_INVALID_PASS="Username and password do not match or you do not have an account yet."
 JGLOBAL_AUTH_INVALID_SECRETKEY="The two factor authentication Secret Key is invalid."
-; The following 2 strings are deprecated and will be removed with 4.0.
-JGLOBAL_AUTH_NO_BIND="Unable to bind to LDAP"
-JGLOBAL_AUTH_NO_CONNECT="Unable to connect to LDAP server"
 JGLOBAL_AUTH_NO_REDIRECT="Could not redirect to server: %s"
 JGLOBAL_AUTH_NO_USER="Username and password do not match or you do not have an account yet."
 JGLOBAL_AUTH_NOT_CONNECT="Unable to connect to authentication service."
@@ -208,6 +207,7 @@ JGLOBAL_DISPLAY_NUM="Display #"
 JGLOBAL_EDIT="Edit"
 JGLOBAL_EDIT_TITLE="Edit article"
 JGLOBAL_EMAIL="Email"
+JGLOBAL_EMAIL_DOMAIN_NOT_ALLOWED="The email domain <strong>%s</strong> is not allowed. Please enter another email address."
 JGLOBAL_EMAIL_TITLE="Email this link to a friend"
 JGLOBAL_EXPAND_CATEGORIES="Show more categories"
 JGLOBAL_FIELD_ADD="Add"
@@ -266,6 +266,8 @@ JGLOBAL_NUM="#"
 JGLOBAL_OTPMETHOD_NONE="Disable Two Factor Authentication"
 JGLOBAL_PASSWORD="Password"
 JGLOBAL_PASSWORD_RESET_REQUIRED="You are required to reset your password before proceeding."
+JGLOBAL_PREVIEW_POSITION="<span>Position:</span> %s"
+JGLOBAL_PREVIEW_STYLE="<span>Style:</span> %s"
 JGLOBAL_PRINT="Print"
 JGLOBAL_PRINT_TITLE="Print article < %s >"
 JGLOBAL_RECORD_NUMBER="Record ID: %d"
@@ -313,6 +315,7 @@ JOPTION_SELECT_CATEGORY="- Select Category -"
 JOPTION_SELECT_LANGUAGE="- Select Language -"
 JOPTION_SELECT_PUBLISHED="- Select Status -"
 JOPTION_SELECT_MAX_LEVELS="- Select Max Levels -"
+JOPTION_SELECT_MONTH="- Select Month -"
 JOPTION_SELECT_TAG="- Select Tag -"
 JOPTION_USE_DEFAULT="- Use Default -"
 
diff --git a/language/en-GB/en-GB.lib_joomla.ini b/language/en-GB/en-GB.lib_joomla.ini
index d254833d98b70..c50863bff8407 100644
--- a/language/en-GB/en-GB.lib_joomla.ini
+++ b/language/en-GB/en-GB.lib_joomla.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -166,7 +166,7 @@ JLIB_DATABASE_ERROR_DATABASE_UPGRADE_FAILED="MySQL Database Upgrade failed. Plea
 JLIB_DATABASE_ERROR_DELETE_CATEGORY="Left-Right data inconsistency. Can't delete category."
 JLIB_DATABASE_ERROR_DELETE_FAILED="%s: :delete failed - %s"
 JLIB_DATABASE_ERROR_DELETE_ROOT_CATEGORIES="Root categories can't be deleted."
-JLIB_DATABASE_ERROR_EMAIL_INUSE="This email address is already registered."
+JLIB_DATABASE_ERROR_EMAIL_INUSE="The email address you entered is already in use. Please enter another email address."
 JLIB_DATABASE_ERROR_EMPTY_ROW_RETURNED="The database row is empty."
 JLIB_DATABASE_ERROR_FUNCTION_FAILED="DB function failed with error number %s <br><span style=\"color: red;\">%s</span>"
 JLIB_DATABASE_ERROR_GET_NEXT_ORDER_FAILED="%s: :getNextOrder failed - %s"
@@ -224,7 +224,7 @@ JLIB_DATABASE_ERROR_USERLEVEL_NAME_EXISTS="Level with the name &quot;%s&quot; al
 JLIB_DATABASE_ERROR_USERNAME_CANNOT_CHANGE="Can't use this username."
 JLIB_DATABASE_ERROR_USERNAME_INUSE="Username in use."
 JLIB_DATABASE_ERROR_VALID_AZ09="Please enter a valid username. No space at beginning or end, at least %d characters and must <strong>not</strong> have the following characters: < > \ &quot; ' &#37; ; ( ) &."
-JLIB_DATABASE_ERROR_VALID_MAIL="Please enter a valid email address."
+JLIB_DATABASE_ERROR_VALID_MAIL="The email address you entered is invalid. Please enter another email address."
 JLIB_DATABASE_ERROR_VIEWLEVEL="Viewlevel must have a title."
 JLIB_DATABASE_FUNCTION_NOERROR="DB function reports no errors."
 JLIB_DATABASE_QUERY_FAILED="Database query failed (error # %s): %s"
diff --git a/language/en-GB/en-GB.lib_joomla.sys.ini b/language/en-GB/en-GB.lib_joomla.sys.ini
index 3d7e4b367ee32..48ddc61903821 100644
--- a/language/en-GB/en-GB.lib_joomla.sys.ini
+++ b/language/en-GB/en-GB.lib_joomla.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.lib_phpass.sys.ini b/language/en-GB/en-GB.lib_phpass.sys.ini
index bdf731fd913d5..56f520e5994c7 100644
--- a/language/en-GB/en-GB.lib_phpass.sys.ini
+++ b/language/en-GB/en-GB.lib_phpass.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.lib_simplepie.sys.ini b/language/en-GB/en-GB.lib_simplepie.sys.ini
index fc43f3e284e2f..340b37a4ea32e 100644
--- a/language/en-GB/en-GB.lib_simplepie.sys.ini
+++ b/language/en-GB/en-GB.lib_simplepie.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.localise.php b/language/en-GB/en-GB.localise.php
index db62e563de244..77e11be263a8b 100644
--- a/language/en-GB/en-GB.localise.php
+++ b/language/en-GB/en-GB.localise.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Language
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/language/en-GB/en-GB.mod_articles_archive.ini b/language/en-GB/en-GB.mod_articles_archive.ini
index 97f8fcf581a5a..9eb022b5cd08c 100644
--- a/language/en-GB/en-GB.mod_articles_archive.ini
+++ b/language/en-GB/en-GB.mod_articles_archive.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_articles_archive.sys.ini b/language/en-GB/en-GB.mod_articles_archive.sys.ini
index 657d5c65f5cbf..235dc71a93ec0 100644
--- a/language/en-GB/en-GB.mod_articles_archive.sys.ini
+++ b/language/en-GB/en-GB.mod_articles_archive.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_articles_categories.ini b/language/en-GB/en-GB.mod_articles_categories.ini
index 03b9090eec64b..4c5925245f963 100644
--- a/language/en-GB/en-GB.mod_articles_categories.ini
+++ b/language/en-GB/en-GB.mod_articles_categories.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_articles_categories.sys.ini b/language/en-GB/en-GB.mod_articles_categories.sys.ini
index bd7f4d690742b..66ee02f6ddc2e 100644
--- a/language/en-GB/en-GB.mod_articles_categories.sys.ini
+++ b/language/en-GB/en-GB.mod_articles_categories.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_articles_category.ini b/language/en-GB/en-GB.mod_articles_category.ini
index 138e97aedb8f8..49ec6f0e2e4c7 100644
--- a/language/en-GB/en-GB.mod_articles_category.ini
+++ b/language/en-GB/en-GB.mod_articles_category.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -21,10 +21,11 @@ MOD_ARTICLES_CATEGORY_FIELD_DATEFIELD_LABEL="Date Field"
 MOD_ARTICLES_CATEGORY_FIELD_DATEFIELDFORMAT_DESC="Please enter in a valid date format. See: http://php.net/date for formatting information."
 MOD_ARTICLES_CATEGORY_FIELD_DATEFIELDFORMAT_LABEL="Date Format"
 MOD_ARTICLES_CATEGORY_FIELD_DATEFILTERING_LABEL="Date Filtering"
+MOD_ARTICLES_CATEGORY_FIELD_DATEGROUPINGFIELD_DESC="Select which date field you want the date grouping to be applied to."
+MOD_ARTICLES_CATEGORY_FIELD_DATEGROUPINGFIELD_LABEL="Date Grouping Field"
 MOD_ARTICLES_CATEGORY_FIELD_ENDDATE_LABEL="To Date"
 MOD_ARTICLES_CATEGORY_FIELD_EXCLUDEDARTICLES_LABEL="Article IDs to Exclude"
 MOD_ARTICLES_CATEGORY_FIELD_GROUP_DISPLAY_LABEL="Display Options"
-MOD_ARTICLES_CATEGORY_FIELD_GROUP_DYNAMIC_LABEL="Dynamic Mode Options"
 MOD_ARTICLES_CATEGORY_FIELD_GROUP_FILTERING_LABEL="Filtering Options"
 MOD_ARTICLES_CATEGORY_FIELD_GROUP_GROUPING_LABEL="Grouping Options"
 MOD_ARTICLES_CATEGORY_FIELD_GROUP_ORDERING_LABEL="Ordering Options"
@@ -70,4 +71,5 @@ MOD_ARTICLES_CATEGORY_OPTION_YEAR_VALUE="Year"
 MOD_ARTICLES_CATEGORY_READ_MORE="Read more: "
 MOD_ARTICLES_CATEGORY_READ_MORE_TITLE="Read More ..."
 MOD_ARTICLES_CATEGORY_REGISTER_TO_READ_MORE="Register to read more"
-MOD_ARTICLES_CATEGORY_XML_DESCRIPTION="This module displays a list of articles from one or more categories."
\ No newline at end of file
+MOD_ARTICLES_CATEGORY_UNTAGGED="Untagged"
+MOD_ARTICLES_CATEGORY_XML_DESCRIPTION="This module displays a list of articles from one or more categories."
diff --git a/language/en-GB/en-GB.mod_articles_category.sys.ini b/language/en-GB/en-GB.mod_articles_category.sys.ini
index 76eafefde24c9..1394a2f6d29fc 100644
--- a/language/en-GB/en-GB.mod_articles_category.sys.ini
+++ b/language/en-GB/en-GB.mod_articles_category.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_articles_latest.ini b/language/en-GB/en-GB.mod_articles_latest.ini
index f09e47a8f42a9..f290f63373632 100644
--- a/language/en-GB/en-GB.mod_articles_latest.ini
+++ b/language/en-GB/en-GB.mod_articles_latest.ini
@@ -1,15 +1,17 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_ARTICLES_LATEST="Articles - Latest"
+MOD_LATEST_NEWS_FIELD_AUTHOR_LABEL="Created by Author(s)"
 MOD_LATEST_NEWS_FIELD_COUNT_LABEL="Articles to Display"
 MOD_LATEST_NEWS_FIELD_FEATURED_LABEL="Featured Articles"
 MOD_LATEST_NEWS_FIELD_ORDERING_LABEL="Order"
 MOD_LATEST_NEWS_FIELD_USER_LABEL="Authors"
 MOD_LATEST_NEWS_VALUE_ADDED_BY_ME="Added or modified by me"
 MOD_LATEST_NEWS_VALUE_ANYONE="Anyone"
+MOD_LATEST_NEWS_VALUE_CREATED_BY="Created by"
 MOD_LATEST_NEWS_VALUE_NOTADDED_BY_ME="Not added or modified by me"
 MOD_LATEST_NEWS_VALUE_ONLY_SHOW_FEATURED="Only show Featured Articles"
 MOD_LATEST_NEWS_VALUE_RECENT_ADDED="Recently Added First"
diff --git a/language/en-GB/en-GB.mod_articles_latest.sys.ini b/language/en-GB/en-GB.mod_articles_latest.sys.ini
index 720ec6456ba40..79729df22d2ec 100644
--- a/language/en-GB/en-GB.mod_articles_latest.sys.ini
+++ b/language/en-GB/en-GB.mod_articles_latest.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_articles_news.ini b/language/en-GB/en-GB.mod_articles_news.ini
index 7003341a97f57..df04be08fd8b5 100644
--- a/language/en-GB/en-GB.mod_articles_news.ini
+++ b/language/en-GB/en-GB.mod_articles_news.ini
@@ -1,11 +1,13 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_ARTICLES_NEWS="Articles - Newsflash"
 MOD_ARTICLES_NEWS_FIELD_FEATURED_LABEL="Featured Articles"
-MOD_ARTICLES_NEWS_FIELD_IMAGES_LABEL="Images"
+MOD_ARTICLES_NEWS_FIELD_IMAGES_ARTICLE_LABEL="Show Intro/Full Image"
+MOD_ARTICLES_NEWS_FIELD_IMAGES_DESC="Show the images that are inside the text of the article."
+MOD_ARTICLES_NEWS_FIELD_IMAGES_LABEL="Show Article Images"
 MOD_ARTICLES_NEWS_FIELD_ITEMS_LABEL="Number of Articles"
 MOD_ARTICLES_NEWS_FIELD_LINKTITLE_LABEL="Linked Titles"
 MOD_ARTICLES_NEWS_FIELD_ORDERING_LABEL="Order Results"
@@ -19,6 +21,8 @@ MOD_ARTICLES_NEWS_FIELD_SEPARATOR_LABEL="Last Separator"
 MOD_ARTICLES_NEWS_FIELD_TITLE_LABEL="Article Title"
 MOD_ARTICLES_NEWS_FIELD_TRIGGEREVENTS_LABEL="Trigger Plugin Events"
 MOD_ARTICLES_NEWS_FIELD_SHOWINTROTEXT_LABEL="Intro Text"
+MOD_ARTICLES_NEWS_OPTION_FULLIMAGE="Full Image"
+MOD_ARTICLES_NEWS_OPTION_INTROIMAGE="Intro Image"
 MOD_ARTICLES_NEWS_READMORE="Read more ..."
 MOD_ARTICLES_NEWS_READMORE_REGISTER="Register to Read More"
 MOD_ARTICLES_NEWS_TITLE_HEADING="Header Level"
diff --git a/language/en-GB/en-GB.mod_articles_news.sys.ini b/language/en-GB/en-GB.mod_articles_news.sys.ini
index a45c494a3660d..1b700c88f5cfe 100644
--- a/language/en-GB/en-GB.mod_articles_news.sys.ini
+++ b/language/en-GB/en-GB.mod_articles_news.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_articles_popular.ini b/language/en-GB/en-GB.mod_articles_popular.ini
index 15481da9d46a7..5dd246744f357 100644
--- a/language/en-GB/en-GB.mod_articles_popular.ini
+++ b/language/en-GB/en-GB.mod_articles_popular.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_articles_popular.sys.ini b/language/en-GB/en-GB.mod_articles_popular.sys.ini
index 29a69288014bb..f9921dad4eb28 100644
--- a/language/en-GB/en-GB.mod_articles_popular.sys.ini
+++ b/language/en-GB/en-GB.mod_articles_popular.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_banners.ini b/language/en-GB/en-GB.mod_banners.ini
index bbecd4e007fc0..2cb489223ed92 100644
--- a/language/en-GB/en-GB.mod_banners.ini
+++ b/language/en-GB/en-GB.mod_banners.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_banners.sys.ini b/language/en-GB/en-GB.mod_banners.sys.ini
index 25962c84e55b3..e048eeb003251 100644
--- a/language/en-GB/en-GB.mod_banners.sys.ini
+++ b/language/en-GB/en-GB.mod_banners.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_breadcrumbs.ini b/language/en-GB/en-GB.mod_breadcrumbs.ini
index ba16294c3f81a..4157716b90986 100644
--- a/language/en-GB/en-GB.mod_breadcrumbs.ini
+++ b/language/en-GB/en-GB.mod_breadcrumbs.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_breadcrumbs.sys.ini b/language/en-GB/en-GB.mod_breadcrumbs.sys.ini
index 5020bc62a5388..02669b353541d 100644
--- a/language/en-GB/en-GB.mod_breadcrumbs.sys.ini
+++ b/language/en-GB/en-GB.mod_breadcrumbs.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_custom.ini b/language/en-GB/en-GB.mod_custom.ini
index d6318ee5cb819..168733f71372f 100644
--- a/language/en-GB/en-GB.mod_custom.ini
+++ b/language/en-GB/en-GB.mod_custom.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_custom.sys.ini b/language/en-GB/en-GB.mod_custom.sys.ini
index 311fe1dc591f1..1bd76c62d1b9f 100644
--- a/language/en-GB/en-GB.mod_custom.sys.ini
+++ b/language/en-GB/en-GB.mod_custom.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_feed.ini b/language/en-GB/en-GB.mod_feed.ini
index ef01cdb3db0ec..3560c50987283 100644
--- a/language/en-GB/en-GB.mod_feed.ini
+++ b/language/en-GB/en-GB.mod_feed.ini
@@ -1,13 +1,15 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_FEED="Feed Display"
 MOD_FEED_ERR_FEED_NOT_RETRIEVED="Feed not found."
 MOD_FEED_ERR_NO_URL="No feed URL specified."
+MOD_FEED_FIELD_DATE_LABEL="Feed Date"
 MOD_FEED_FIELD_DESCRIPTION_LABEL="Feed Description"
 MOD_FEED_FIELD_IMAGE_LABEL="Feed Image"
+MOD_FEED_FIELD_ITEMDATE_LABEL="Publication Date"
 MOD_FEED_FIELD_ITEMDESCRIPTION_LABEL="Item Description"
 MOD_FEED_FIELD_ITEMS_LABEL="Items to Display"
 MOD_FEED_FIELD_RSSTITLE_LABEL="Feed Title"
diff --git a/language/en-GB/en-GB.mod_feed.sys.ini b/language/en-GB/en-GB.mod_feed.sys.ini
index 56b6f497f327e..9e8cf69d6021d 100644
--- a/language/en-GB/en-GB.mod_feed.sys.ini
+++ b/language/en-GB/en-GB.mod_feed.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_finder.ini b/language/en-GB/en-GB.mod_finder.ini
index 0f764ccfe5316..d35bbd3f056be 100644
--- a/language/en-GB/en-GB.mod_finder.ini
+++ b/language/en-GB/en-GB.mod_finder.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -24,7 +24,6 @@ MOD_FINDER_FIELDSET_BASIC_SHOW_ADVANCED_OPTION_LINK="Link to Component"
 MOD_FINDER_FIELD_OPENSEARCH_LABEL="Enable OpenSearch"
 MOD_FINDER_FIELD_OPENSEARCH_TEXT_LABEL="OpenSearch Name"
 MOD_FINDER_SEARCHBUTTON_TEXT="Search"
-MOD_FINDER_SEARCH_BUTTON="Go"
 MOD_FINDER_SEARCH_VALUE="Search ..."
 MOD_FINDER_SELECT_MENU_ITEMID="Select a menu item"
 MOD_FINDER_XML_DESCRIPTION="This is a Smart Search module."
diff --git a/language/en-GB/en-GB.mod_finder.sys.ini b/language/en-GB/en-GB.mod_finder.sys.ini
index 67a48ebbcaa8c..53bd404ab6b36 100644
--- a/language/en-GB/en-GB.mod_finder.sys.ini
+++ b/language/en-GB/en-GB.mod_finder.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_footer.ini b/language/en-GB/en-GB.mod_footer.ini
index 7efd5936d1405..73e00eb9236da 100644
--- a/language/en-GB/en-GB.mod_footer.ini
+++ b/language/en-GB/en-GB.mod_footer.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 ; Note : %date% will be auto replaced by current year !Don't translate
diff --git a/language/en-GB/en-GB.mod_footer.sys.ini b/language/en-GB/en-GB.mod_footer.sys.ini
index e28e2c8c8c7d5..dff5f2018b237 100644
--- a/language/en-GB/en-GB.mod_footer.sys.ini
+++ b/language/en-GB/en-GB.mod_footer.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 ; Note : %date% will be auto replaced by current year !Don't translate
diff --git a/language/en-GB/en-GB.mod_languages.ini b/language/en-GB/en-GB.mod_languages.ini
index 7476c6d0001be..ef451acc62dff 100644
--- a/language/en-GB/en-GB.mod_languages.ini
+++ b/language/en-GB/en-GB.mod_languages.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_languages.sys.ini b/language/en-GB/en-GB.mod_languages.sys.ini
index 9a7686199f562..18cc43232cb04 100644
--- a/language/en-GB/en-GB.mod_languages.sys.ini
+++ b/language/en-GB/en-GB.mod_languages.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_login.ini b/language/en-GB/en-GB.mod_login.ini
index 68b579f3603b8..350e940e71b56 100644
--- a/language/en-GB/en-GB.mod_login.ini
+++ b/language/en-GB/en-GB.mod_login.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_login.sys.ini b/language/en-GB/en-GB.mod_login.sys.ini
index 8e346b3c001da..6cdada9afa877 100644
--- a/language/en-GB/en-GB.mod_login.sys.ini
+++ b/language/en-GB/en-GB.mod_login.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_menu.ini b/language/en-GB/en-GB.mod_menu.ini
index a04226cff1f3f..d0e426bee8aa9 100644
--- a/language/en-GB/en-GB.mod_menu.ini
+++ b/language/en-GB/en-GB.mod_menu.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_menu.sys.ini b/language/en-GB/en-GB.mod_menu.sys.ini
index 95c8f32bd0816..e22f210c8f9d9 100644
--- a/language/en-GB/en-GB.mod_menu.sys.ini
+++ b/language/en-GB/en-GB.mod_menu.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_random_image.ini b/language/en-GB/en-GB.mod_random_image.ini
index 4cb0a0524d599..c1feae10136f4 100644
--- a/language/en-GB/en-GB.mod_random_image.ini
+++ b/language/en-GB/en-GB.mod_random_image.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_random_image.sys.ini b/language/en-GB/en-GB.mod_random_image.sys.ini
index e8214ed84b3f7..ec9ca88c2048b 100644
--- a/language/en-GB/en-GB.mod_random_image.sys.ini
+++ b/language/en-GB/en-GB.mod_random_image.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_related_items.ini b/language/en-GB/en-GB.mod_related_items.ini
index 33ba7338871e3..2fa7b5474e17e 100644
--- a/language/en-GB/en-GB.mod_related_items.ini
+++ b/language/en-GB/en-GB.mod_related_items.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_related_items.sys.ini b/language/en-GB/en-GB.mod_related_items.sys.ini
index 793841cdcdd36..9395c86cdbbe3 100644
--- a/language/en-GB/en-GB.mod_related_items.sys.ini
+++ b/language/en-GB/en-GB.mod_related_items.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_search.ini b/language/en-GB/en-GB.mod_search.ini
index d81ce7e756219..7876045e86638 100644
--- a/language/en-GB/en-GB.mod_search.ini
+++ b/language/en-GB/en-GB.mod_search.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_search.sys.ini b/language/en-GB/en-GB.mod_search.sys.ini
index 8fd6ad7aab70f..8ee1912751c9c 100644
--- a/language/en-GB/en-GB.mod_search.sys.ini
+++ b/language/en-GB/en-GB.mod_search.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_stats.ini b/language/en-GB/en-GB.mod_stats.ini
index 157b863c47e25..b27f7564d510b 100644
--- a/language/en-GB/en-GB.mod_stats.ini
+++ b/language/en-GB/en-GB.mod_stats.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_stats.sys.ini b/language/en-GB/en-GB.mod_stats.sys.ini
index 48954c3bbcce5..1a809c7ec9d2a 100644
--- a/language/en-GB/en-GB.mod_stats.sys.ini
+++ b/language/en-GB/en-GB.mod_stats.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_syndicate.ini b/language/en-GB/en-GB.mod_syndicate.ini
index 3063239b2b7a0..fbefcb1d0ab6b 100644
--- a/language/en-GB/en-GB.mod_syndicate.ini
+++ b/language/en-GB/en-GB.mod_syndicate.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_syndicate.sys.ini b/language/en-GB/en-GB.mod_syndicate.sys.ini
index e9b935b96c943..cd4f3db5306a1 100644
--- a/language/en-GB/en-GB.mod_syndicate.sys.ini
+++ b/language/en-GB/en-GB.mod_syndicate.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_tags_popular.ini b/language/en-GB/en-GB.mod_tags_popular.ini
index d2a3840543404..1d42bf9d1299c 100644
--- a/language/en-GB/en-GB.mod_tags_popular.ini
+++ b/language/en-GB/en-GB.mod_tags_popular.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_tags_popular.sys.ini b/language/en-GB/en-GB.mod_tags_popular.sys.ini
index 587e31b00c357..e9da12c84a6a6 100644
--- a/language/en-GB/en-GB.mod_tags_popular.sys.ini
+++ b/language/en-GB/en-GB.mod_tags_popular.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_tags_similar.ini b/language/en-GB/en-GB.mod_tags_similar.ini
index 13cff8994690f..5ea6b455052c3 100644
--- a/language/en-GB/en-GB.mod_tags_similar.ini
+++ b/language/en-GB/en-GB.mod_tags_similar.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_tags_similar.sys.ini b/language/en-GB/en-GB.mod_tags_similar.sys.ini
index 8500b87fdee8e..5b34b889a2704 100644
--- a/language/en-GB/en-GB.mod_tags_similar.sys.ini
+++ b/language/en-GB/en-GB.mod_tags_similar.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_users_latest.ini b/language/en-GB/en-GB.mod_users_latest.ini
index c91947f4c5a47..af9cbe31bfccc 100644
--- a/language/en-GB/en-GB.mod_users_latest.ini
+++ b/language/en-GB/en-GB.mod_users_latest.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_users_latest.sys.ini b/language/en-GB/en-GB.mod_users_latest.sys.ini
index 9546568bf62cb..7097e842311f3 100644
--- a/language/en-GB/en-GB.mod_users_latest.sys.ini
+++ b/language/en-GB/en-GB.mod_users_latest.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_whosonline.ini b/language/en-GB/en-GB.mod_whosonline.ini
index e0cb2acad6784..013ce2753bca5 100644
--- a/language/en-GB/en-GB.mod_whosonline.ini
+++ b/language/en-GB/en-GB.mod_whosonline.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_whosonline.sys.ini b/language/en-GB/en-GB.mod_whosonline.sys.ini
index f205a3b73a0e5..67eb1daca6182 100644
--- a/language/en-GB/en-GB.mod_whosonline.sys.ini
+++ b/language/en-GB/en-GB.mod_whosonline.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_wrapper.ini b/language/en-GB/en-GB.mod_wrapper.ini
index 4f2be7ea593a0..e697dd91bec20 100644
--- a/language/en-GB/en-GB.mod_wrapper.ini
+++ b/language/en-GB/en-GB.mod_wrapper.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_wrapper.sys.ini b/language/en-GB/en-GB.mod_wrapper.sys.ini
index 1e293bf23d023..049e8e35cab8c 100644
--- a/language/en-GB/en-GB.mod_wrapper.sys.ini
+++ b/language/en-GB/en-GB.mod_wrapper.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.tpl_cassiopeia.ini b/language/en-GB/en-GB.tpl_cassiopeia.ini
index fafdb477bbbda..3babd8cdbd00b 100644
--- a/language/en-GB/en-GB.tpl_cassiopeia.ini
+++ b/language/en-GB/en-GB.tpl_cassiopeia.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.tpl_cassiopeia.sys.ini b/language/en-GB/en-GB.tpl_cassiopeia.sys.ini
index b5e65b452da2a..2350f71b83671 100644
--- a/language/en-GB/en-GB.tpl_cassiopeia.sys.ini
+++ b/language/en-GB/en-GB.tpl_cassiopeia.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml
index a81c9f1bb404d..bf88e5881f99e 100644
--- a/language/en-GB/en-GB.xml
+++ b/language/en-GB/en-GB.xml
@@ -2,11 +2,11 @@
 <metafile version="3.9" client="site">
 	<name>English (en-GB)</name>
 	<version>4.0.0</version>
-	<creationDate>December 2018</creationDate>
+	<creationDate>March 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description><![CDATA[en-GB site language]]></description>
 	<metadata>
diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
index 8fb50bcf44ac3..deaea287ee627 100644
--- a/language/en-GB/install.xml
+++ b/language/en-GB/install.xml
@@ -3,11 +3,11 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>4.0.0</version>
-	<creationDate>December 2018</creationDate>
+	<creationDate>March 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>en-GB site language</description>
 	<files>
diff --git a/layouts/chromes/html5.php b/layouts/chromes/html5.php
new file mode 100644
index 0000000000000..5075c05617c79
--- /dev/null
+++ b/layouts/chromes/html5.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * html5 (chosen html5 tag and font header tags)
+ */
+
+defined('_JEXEC') or die;
+
+$module  = $displayData['module'];
+$params  = $displayData['params'];
+
+$moduleTag     = htmlspecialchars($params->get('module_tag', 'div'), ENT_QUOTES, 'UTF-8');
+$headerTag     = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');
+$bootstrapSize = (int) $params->get('bootstrap_size', 0);
+$moduleClass   = $bootstrapSize !== 0 ? ' span' . $bootstrapSize : '';
+
+// Temporarily store header class in variable
+$headerClass = $params->get('header_class');
+$headerClass = !empty($headerClass) ? ' class="' . htmlspecialchars($headerClass, ENT_COMPAT, 'UTF-8') . '"' : '';
+
+if (!empty ($module->content)) : ?>
+	<<?php echo $moduleTag; ?> class="moduletable <?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
+
+	<?php if ((bool) $module->showtitle) : ?>
+		<<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
+	<?php endif; ?>
+
+	<?php echo $module->content; ?>
+
+	</<?php echo $moduleTag; ?>>
+
+<?php endif;
\ No newline at end of file
diff --git a/layouts/chromes/none.php b/layouts/chromes/none.php
new file mode 100644
index 0000000000000..ab67a86bb0fae
--- /dev/null
+++ b/layouts/chromes/none.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo $displayData['module']->content;
diff --git a/layouts/chromes/outline.php b/layouts/chromes/outline.php
new file mode 100644
index 0000000000000..c058bfe51af3c
--- /dev/null
+++ b/layouts/chromes/outline.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+
+$module  = $displayData['module'];
+
+static $css = false;
+
+if (!$css)
+{
+	$css = true;
+	$doc = Factory::getDocument();
+
+	$doc->addStyleDeclaration('
+		.mod-preview {
+			background: rgba(100,100,100,.08);
+			box-shadow: 0 0 0 4px #f4f4f4, 0 0 0 5px rgba(100,100,100,.2);
+			border-radius: 1px;
+			margin: 8px 0;
+		}
+		.mod-preview-info {
+			padding: 4px 6px;
+			margin-bottom: 5px;
+			font-family: Arial, sans-serif;
+			font-size: .75rem;
+			line-height: 1rem;
+			color: white;
+			background-color: #33373f;
+			border-radius: 3px;
+			box-shadow: 0 -10px 20px rgba(0,0,0,.2) inset;
+		}
+		.mod-preview-info span {
+			font-weight: bold;
+			color: #ccc;
+		}
+		.mod-preview-wrapper {
+			margin-bottom: .5rem;
+		}
+		');
+}
+?>
+<div class="mod-preview">
+	<div class="mod-preview-info">
+		<div class="mod-preview-position">
+			<?php echo Text::sprintf('JGLOBAL_PREVIEW_POSITION', $module->position); ?>
+		</div>
+		<div class="mod-preview-style">
+			<?php echo Text::sprintf('JGLOBAL_PREVIEW_STYLE', $module->style); ?>
+		</div>
+	</div>
+	<div class="mod-preview-wrapper">
+		<?php echo $module->content; ?>
+	</div>
+</div>
diff --git a/layouts/chromes/sliders.php b/layouts/chromes/sliders.php
new file mode 100644
index 0000000000000..c907897bef728
--- /dev/null
+++ b/layouts/chromes/sliders.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * xhtml (divs and font header tags)
+ * With the new advanced parameter it does the same as the html5 chrome
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+
+$module  = $displayData['module'];
+
+$content = trim($module->content);
+
+if (!empty($content))
+{
+	echo HTMLHelper::_('sliders.panel', $module->title, 'module' . $module->id);
+	echo $content;
+}
diff --git a/layouts/chromes/table.php b/layouts/chromes/table.php
new file mode 100644
index 0000000000000..8ee0b583a895b
--- /dev/null
+++ b/layouts/chromes/table.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * Module chrome that wraps the module in a table
+ */
+defined('_JEXEC') or die;
+
+$module  = $displayData['module'];
+$params  = $displayData['params'];
+?>
+<table cellpadding="0" cellspacing="0"
+	class="moduletable <?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8'); ?>">
+	<?php if ((bool) $module->showtitle) : ?>
+		<tr>
+			<th>
+				<?php echo $module->title; ?>
+			</th>
+		</tr>
+	<?php endif; ?>
+	<tr>
+		<td>
+			<?php echo $module->content; ?>
+		</td>
+	</tr>
+</table>
diff --git a/layouts/chromes/tabs.php b/layouts/chromes/tabs.php
new file mode 100644
index 0000000000000..91a86630ed412
--- /dev/null
+++ b/layouts/chromes/tabs.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * xhtml (divs and font header tags)
+ * With the new advanced parameter it does the same as the html5 chrome
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+
+$module  = $displayData['module'];
+
+$content = trim($module->content);
+
+if (!empty($content))
+{
+	echo HTMLHelper::_('tabs.panel', $module->title, 'module' . $module->id);
+	echo $content;
+}
diff --git a/layouts/joomla/button/action-button.php b/layouts/joomla/button/action-button.php
index c2e173515dec1..61841f279769a 100644
--- a/layouts/joomla/button/action-button.php
+++ b/layouts/joomla/button/action-button.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/button/iconclass.php b/layouts/joomla/button/iconclass.php
index aef3b44351789..692ed05d46201 100644
--- a/layouts/joomla/button/iconclass.php
+++ b/layouts/joomla/button/iconclass.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/button/transition-button.php b/layouts/joomla/button/transition-button.php
index addf78cf92998..b91544d133553 100644
--- a/layouts/joomla/button/transition-button.php
+++ b/layouts/joomla/button/transition-button.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/associations.php b/layouts/joomla/content/associations.php
index 37e6278f2ef2a..9bd8cd3fa1138 100644
--- a/layouts/joomla/content/associations.php
+++ b/layouts/joomla/content/associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/blog_style_default_item_title.php b/layouts/joomla/content/blog_style_default_item_title.php
index 1559fb1bcca21..af0ae62682955 100644
--- a/layouts/joomla/content/blog_style_default_item_title.php
+++ b/layouts/joomla/content/blog_style_default_item_title.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/blog_style_default_links.php b/layouts/joomla/content/blog_style_default_links.php
index 8f93746d3b37e..2501cec694ab2 100644
--- a/layouts/joomla/content/blog_style_default_links.php
+++ b/layouts/joomla/content/blog_style_default_links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/categories_default.php b/layouts/joomla/content/categories_default.php
index a8912948a4696..d9c423c288be8 100644
--- a/layouts/joomla/content/categories_default.php
+++ b/layouts/joomla/content/categories_default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/categories_default_items.php b/layouts/joomla/content/categories_default_items.php
index 9a49c4ea3c68c..1715a35280f99 100644
--- a/layouts/joomla/content/categories_default_items.php
+++ b/layouts/joomla/content/categories_default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/category_default.php b/layouts/joomla/content/category_default.php
index 42eee736be11d..a73fce771b08a 100644
--- a/layouts/joomla/content/category_default.php
+++ b/layouts/joomla/content/category_default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/full_image.php b/layouts/joomla/content/full_image.php
index a92e368effaa2..e86e6feb4d455 100644
--- a/layouts/joomla/content/full_image.php
+++ b/layouts/joomla/content/full_image.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/icons.php b/layouts/joomla/content/icons.php
index c85937cae058e..c2e0486708fb3 100644
--- a/layouts/joomla/content/icons.php
+++ b/layouts/joomla/content/icons.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/icons/create.php b/layouts/joomla/content/icons/create.php
index 936a3d2c28b19..3e6831df9660f 100644
--- a/layouts/joomla/content/icons/create.php
+++ b/layouts/joomla/content/icons/create.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/icons/edit.php b/layouts/joomla/content/icons/edit.php
index aae7ce41a710d..c144060c10b5c 100644
--- a/layouts/joomla/content/icons/edit.php
+++ b/layouts/joomla/content/icons/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/icons/edit_lock.php b/layouts/joomla/content/icons/edit_lock.php
index 9cdfe274bfb0d..841a502b529f7 100644
--- a/layouts/joomla/content/icons/edit_lock.php
+++ b/layouts/joomla/content/icons/edit_lock.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/icons/email.php b/layouts/joomla/content/icons/email.php
index 583f6fda012e4..0497f081d7464 100644
--- a/layouts/joomla/content/icons/email.php
+++ b/layouts/joomla/content/icons/email.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/icons/print_popup.php b/layouts/joomla/content/icons/print_popup.php
index 91e506e5053e4..ddccb3c882d5a 100644
--- a/layouts/joomla/content/icons/print_popup.php
+++ b/layouts/joomla/content/icons/print_popup.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/icons/print_screen.php b/layouts/joomla/content/icons/print_screen.php
index 91e506e5053e4..ddccb3c882d5a 100644
--- a/layouts/joomla/content/icons/print_screen.php
+++ b/layouts/joomla/content/icons/print_screen.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/info_block.php b/layouts/joomla/content/info_block.php
index 86c2d80ce95c0..8acd8374f24f2 100644
--- a/layouts/joomla/content/info_block.php
+++ b/layouts/joomla/content/info_block.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/info_block/associations.php b/layouts/joomla/content/info_block/associations.php
index a10d195a3b731..1ade13532ba71 100644
--- a/layouts/joomla/content/info_block/associations.php
+++ b/layouts/joomla/content/info_block/associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/info_block/author.php b/layouts/joomla/content/info_block/author.php
index 223e0d80fd5cf..83d04a4dd0bda 100644
--- a/layouts/joomla/content/info_block/author.php
+++ b/layouts/joomla/content/info_block/author.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/info_block/category.php b/layouts/joomla/content/info_block/category.php
index 5f87cd5986c29..54b574881502f 100644
--- a/layouts/joomla/content/info_block/category.php
+++ b/layouts/joomla/content/info_block/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/info_block/create_date.php b/layouts/joomla/content/info_block/create_date.php
index 18dfd506b4078..d311643712789 100644
--- a/layouts/joomla/content/info_block/create_date.php
+++ b/layouts/joomla/content/info_block/create_date.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/info_block/hits.php b/layouts/joomla/content/info_block/hits.php
index 239bfe7bb780f..dfc5a75730a15 100644
--- a/layouts/joomla/content/info_block/hits.php
+++ b/layouts/joomla/content/info_block/hits.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/info_block/modify_date.php b/layouts/joomla/content/info_block/modify_date.php
index 2dfed0a8da12f..dad96b8ef7382 100644
--- a/layouts/joomla/content/info_block/modify_date.php
+++ b/layouts/joomla/content/info_block/modify_date.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/info_block/parent_category.php b/layouts/joomla/content/info_block/parent_category.php
index 4b60d7b20ddb6..4751835dffe72 100644
--- a/layouts/joomla/content/info_block/parent_category.php
+++ b/layouts/joomla/content/info_block/parent_category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/info_block/publish_date.php b/layouts/joomla/content/info_block/publish_date.php
index d98c81232d15b..d395afb315720 100644
--- a/layouts/joomla/content/info_block/publish_date.php
+++ b/layouts/joomla/content/info_block/publish_date.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/intro_image.php b/layouts/joomla/content/intro_image.php
index b630f9265ab03..da31044d8fab3 100644
--- a/layouts/joomla/content/intro_image.php
+++ b/layouts/joomla/content/intro_image.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/language.php b/layouts/joomla/content/language.php
index e40ae70696a7c..fceb4086c4497 100644
--- a/layouts/joomla/content/language.php
+++ b/layouts/joomla/content/language.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/options_default.php b/layouts/joomla/content/options_default.php
index c8101d8b0a185..48c1c8a124406 100644
--- a/layouts/joomla/content/options_default.php
+++ b/layouts/joomla/content/options_default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/readmore.php b/layouts/joomla/content/readmore.php
index 5c7590c7d42b0..78ceec1d11ffd 100644
--- a/layouts/joomla/content/readmore.php
+++ b/layouts/joomla/content/readmore.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/tags.php b/layouts/joomla/content/tags.php
index 899018829f88c..0c9c811ededd3 100644
--- a/layouts/joomla/content/tags.php
+++ b/layouts/joomla/content/tags.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/text_filters.php b/layouts/joomla/content/text_filters.php
index 7a47550774628..f0397d6f04438 100644
--- a/layouts/joomla/content/text_filters.php
+++ b/layouts/joomla/content/text_filters.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/edit/admin_modules.php b/layouts/joomla/edit/admin_modules.php
index ac6ef7aa5b8c2..d1f1ce66135d5 100644
--- a/layouts/joomla/edit/admin_modules.php
+++ b/layouts/joomla/edit/admin_modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/edit/associations.php b/layouts/joomla/edit/associations.php
index 17093dbf7dc5f..059d1085594a8 100644
--- a/layouts/joomla/edit/associations.php
+++ b/layouts/joomla/edit/associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/edit/fieldset.php b/layouts/joomla/edit/fieldset.php
index b5a7b1da6ae1f..f23f3ef674f06 100644
--- a/layouts/joomla/edit/fieldset.php
+++ b/layouts/joomla/edit/fieldset.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/edit/frontediting_modules.php b/layouts/joomla/edit/frontediting_modules.php
index 55239854222d4..c18a10443f776 100644
--- a/layouts/joomla/edit/frontediting_modules.php
+++ b/layouts/joomla/edit/frontediting_modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/edit/global.php b/layouts/joomla/edit/global.php
index 3b7f29f0d70ce..5ccea4014578e 100644
--- a/layouts/joomla/edit/global.php
+++ b/layouts/joomla/edit/global.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -28,24 +28,22 @@
 $saveHistory = ComponentHelper::getParams($component)->get('save_history', 0);
 
 $fields = $displayData->get('fields') ?: array(
+	'transition',
 	array('parent', 'parent_id'),
 	array('published', 'state', 'enabled'),
 	array('category', 'catid'),
 	'featured',
 	'sticky',
 	'access',
+	'id',
 	'language',
 	'tags',
 	'note',
 	'version_note',
 );
 
-if (isset($displayData->get('item')->id) && ($displayData->get('item')->id !== null))
-{
-	array_unshift($fields, 'transition');
-}
-
-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields   = $displayData->get('hidden_fields') ?: array();
+$hiddenFields[] = 'id';
 
 if (!$saveHistory)
 {
diff --git a/layouts/joomla/edit/metadata.php b/layouts/joomla/edit/metadata.php
index a4c1260d79f64..dffcfa0e468b5 100644
--- a/layouts/joomla/edit/metadata.php
+++ b/layouts/joomla/edit/metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/edit/params.php b/layouts/joomla/edit/params.php
index f3224e3dbf9b5..47dc00ee2a8f5 100644
--- a/layouts/joomla/edit/params.php
+++ b/layouts/joomla/edit/params.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/edit/publishingdata.php b/layouts/joomla/edit/publishingdata.php
index 83d06092db4b2..84c25a914b76d 100644
--- a/layouts/joomla/edit/publishingdata.php
+++ b/layouts/joomla/edit/publishingdata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/edit/title_alias.php b/layouts/joomla/edit/title_alias.php
index 0ff2307dfc0d6..4564d9f227019 100644
--- a/layouts/joomla/edit/title_alias.php
+++ b/layouts/joomla/edit/title_alias.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/editors/buttons.php b/layouts/joomla/editors/buttons.php
index 071d1f4385d23..60591a7bfffe0 100644
--- a/layouts/joomla/editors/buttons.php
+++ b/layouts/joomla/editors/buttons.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/editors/buttons/button.php b/layouts/joomla/editors/buttons/button.php
index 30aabb0239066..fb8b12871baa0 100644
--- a/layouts/joomla/editors/buttons/button.php
+++ b/layouts/joomla/editors/buttons/button.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/editors/buttons/modal.php b/layouts/joomla/editors/buttons/modal.php
index 691333e620e41..51cfadb2ca1dc 100644
--- a/layouts/joomla/editors/buttons/modal.php
+++ b/layouts/joomla/editors/buttons/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -55,7 +55,7 @@
 		'width'  => array_key_exists('width', $options) ? $options['width'] : '800px',
 		'bodyHeight'  => array_key_exists('bodyHeight', $options) ? $options['bodyHeight'] : '70',
 		'modalWidth'  => array_key_exists('modalWidth', $options) ? $options['modalWidth'] : '80',
-		'footer' => $confirm . '<button class="btn btn-secondary" data-dismiss="modal" aria-hidden="true">'
+		'footer' => $confirm . '<button type="button" class="btn btn-secondary" data-dismiss="modal" aria-hidden="true">'
 			. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>'
 	)
 );
diff --git a/layouts/joomla/error/backtrace.php b/layouts/joomla/error/backtrace.php
index 7312e24eb2cea..46643e4df7ccf 100644
--- a/layouts/joomla/error/backtrace.php
+++ b/layouts/joomla/error/backtrace.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/form/field/accesslevel-fancy-select.php b/layouts/joomla/form/field/accesslevel-fancy-select.php
index 554856737d827..9fe3310fc4d3f 100644
--- a/layouts/joomla/form/field/accesslevel-fancy-select.php
+++ b/layouts/joomla/form/field/accesslevel-fancy-select.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -70,7 +70,7 @@
 Text::script('JGLOBAL_SELECT_PRESS_TO_SELECT');
 
 Factory::getDocument()->getWebAssetManager()->enableAsset('choicesjs');
-HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);
+HTMLHelper::_('webcomponent', 'system/fields/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);
 
 ?>
 
diff --git a/layouts/joomla/form/field/accesslevel.php b/layouts/joomla/form/field/accesslevel.php
index cdf2eda51cf1a..d38ec26d2bb63 100644
--- a/layouts/joomla/form/field/accesslevel.php
+++ b/layouts/joomla/form/field/accesslevel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -55,5 +55,6 @@
 $attr .= $required ? ' required' : '';
 $attr .= $autofocus ? ' autofocus' : '';
 $attr .= $onchange ? ' onchange="' . $onchange . '"' : '';
+$attr .= !empty($description) ? ' aria-describedby="' . $name . '-desc"' : '';
 
 echo HTMLHelper::_('access.level', $name, $value, $attr, $options, $id);
diff --git a/layouts/joomla/form/field/calendar.php b/layouts/joomla/form/field/calendar.php
index 18cb8100ac326..de03e5a6ddb36 100644
--- a/layouts/joomla/form/field/calendar.php
+++ b/layouts/joomla/form/field/calendar.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -110,6 +110,7 @@
             id="<?php echo $id; ?>"
             name="<?php echo $name; ?>"
 			value="<?php echo htmlspecialchars(($value !== '0000-00-00 00:00:00') ? $value : '', ENT_COMPAT, 'UTF-8'); ?>"
+			<?php echo !empty($description) ? ' aria-describedby="' . $name . '-desc"' : ''; ?>
 			<?php echo $attributes; ?>
 			<?php echo !empty($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : ''; ?>
 			data-alt-value="<?php echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>" autocomplete="off">
diff --git a/layouts/joomla/form/field/checkboxes.php b/layouts/joomla/form/field/checkboxes.php
index 57442d15238c3..9b166f6a6fe8b 100644
--- a/layouts/joomla/form/field/checkboxes.php
+++ b/layouts/joomla/form/field/checkboxes.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -58,6 +58,7 @@
 <fieldset id="<?php echo $id; ?>" class="<?php echo trim($class . ' checkboxes'); ?>"
 	<?php echo $required ? 'required' : ''; ?>
 	<?php echo $autofocus ? 'autofocus' : ''; ?>>
+	<legend><?php echo $label; ?></legend>
 
 	<?php foreach ($options as $i => $option) : ?>
 		<?php
@@ -78,8 +79,8 @@
 			$attributes = array_filter(array($checked, $optionClass, $optionDisabled, $onchange, $onclick));
 		?>
 		<div class="form-check form-check-inline">
+		<?php echo sprintf($format, $oid, $name, $value, implode(' ', $attributes)); ?>
 			<label for="<?php echo $oid; ?>" class="form-check-label">
-				<?php echo sprintf($format, $oid, $name, $value, implode(' ', $attributes)); ?>
 				<?php echo $option->text; ?>
 			</label>
 		</div>
diff --git a/layouts/joomla/form/field/color/advanced.php b/layouts/joomla/form/field/color/advanced.php
index 118a57ed27947..58a9af39cc8f7 100644
--- a/layouts/joomla/form/field/color/advanced.php
+++ b/layouts/joomla/form/field/color/advanced.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -65,7 +65,7 @@
 $validate     = $validate ? ' data-validate="' . $validate . '"' : '';
 $disabled     = $disabled ? ' disabled' : '';
 $readonly     = $readonly ? ' readonly' : '';
-$hint         = strlen($hint) ? ' placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : ' placeholder="' . $placeholder . '"';
+$hint         = strlen($hint) ? ' placeholder="' . $this->escape($hint) . '"' : ' placeholder="' . $placeholder . '"';
 $autocomplete = ! $autocomplete ? ' autocomplete="off"' : '';
 
 // Force LTR input value in RTL, due to display issues with rgba/hex colors
@@ -76,5 +76,19 @@
 HTMLHelper::_('stylesheet', 'vendor/minicolors/jquery.minicolors.css', array('version' => 'auto', 'relative' => true));
 HTMLHelper::_('script', 'system/fields/color-field-adv-init.min.js', array('version' => 'auto', 'relative' => true));
 ?>
-<input type="text" name="<?php echo $name; ?>" id="<?php echo $id; ?>" value="<?php echo htmlspecialchars($color, ENT_COMPAT, 'UTF-8'); ?>" <?php
-echo $hint . $class . $position . $control . $readonly . $disabled . $onchange . $autocomplete . $autofocus . $format . $keywords . $direction . $validate; ?>/>
+<input type="text" name="<?php echo $name; ?>" id="<?php echo $id; ?>" value="<?php echo $this->escape($color); ?>"<?php
+	echo $hint,
+		$class,
+		$position,
+		$control,
+		$readonly,
+		$disabled,
+		$required,
+		$onchange,
+		$autocomplete,
+		$autofocus,
+		$format,
+		$keywords,
+		$direction,
+		$validate;
+?>/>
diff --git a/layouts/joomla/form/field/color/simple.php b/layouts/joomla/form/field/color/simple.php
index da83925ad5f5a..8fe1c3f45dcf0 100644
--- a/layouts/joomla/form/field/color/simple.php
+++ b/layouts/joomla/form/field/color/simple.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -53,7 +53,7 @@
 $disabled = $disabled ? ' disabled' : '';
 $readonly = $readonly ? ' readonly' : '';
 
-HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-field-simple-color.min.js', ['version' => 'auto', 'relative' => true]);
+HTMLHelper::_('webcomponent', 'system/fields/joomla-field-simple-color.min.js', ['version' => 'auto', 'relative' => true]);
 ?>
 <joomla-field-simple-color text-select="<?php echo Text::_('JFIELD_COLOR_SELECT'); ?>" text-color="<?php echo Text::_('JFIELD_COLOR_VALUE'); ?>" text-close="<?php echo Text::_('JLIB_HTML_BEHAVIOR_CLOSE'); ?>" text-transparent="<?php echo Text::_('JFIELD_COLOR_TRANSPARENT'); ?>">
 	<select name="<?php echo $name; ?>" id="<?php echo $id; ?>"<?php
diff --git a/layouts/joomla/form/field/combo.php b/layouts/joomla/form/field/combo.php
index 0f02f53bca426..4ade26bef3c63 100644
--- a/layouts/joomla/form/field/combo.php
+++ b/layouts/joomla/form/field/combo.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -52,6 +52,7 @@
 $attr .= !empty($readonly) ? ' readonly' : '';
 $attr .= !empty($disabled) ? ' disabled' : '';
 $attr .= !empty($required) ? ' required' : '';
+$attr .= !empty($description) ? ' aria-describedby="' . $name . '-desc"' : '';
 
 // Initialize JavaScript field attributes.
 $attr .= !empty($onchange) ? ' onchange="' . $onchange . '"' : '';
diff --git a/layouts/joomla/form/field/contenthistory.php b/layouts/joomla/form/field/contenthistory.php
index 7ee5832578739..8cc4e84dbb4a3 100644
--- a/layouts/joomla/form/field/contenthistory.php
+++ b/layouts/joomla/form/field/contenthistory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -63,7 +63,7 @@
 );
 
 ?>
-<button type="button" onclick="document.getElementById('versionsModal').open()" class="btn btn-secondary" data-toggle="modal" title="<?php echo $label; ?>">
+<button type="button" onclick="document.getElementById('versionsModal').open()" class="btn btn-secondary" data-toggle="modal">
 	<span class="fa fa-code-fork" aria-hidden="true"></span>
 	<?php echo $label; ?>
 </button>
diff --git a/layouts/joomla/form/field/email.php b/layouts/joomla/form/field/email.php
index e9404f00218b5..c1c62f72a2137 100644
--- a/layouts/joomla/form/field/email.php
+++ b/layouts/joomla/form/field/email.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -53,6 +53,7 @@
 $attributes = array(
 	$spellcheck ? '' : 'spellcheck="false"',
 	!empty($size) ? 'size="' . $size . '"' : '',
+	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',
 	$onchange ? 'onchange="' . $onchange . '"' : '',
diff --git a/layouts/joomla/form/field/file.php b/layouts/joomla/form/field/file.php
index ff96b80f7e520..d613b2c6dc65b 100644
--- a/layouts/joomla/form/field/file.php
+++ b/layouts/joomla/form/field/file.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/form/field/hidden.php b/layouts/joomla/form/field/hidden.php
index 8e2f8841a2564..df80630813a23 100644
--- a/layouts/joomla/form/field/hidden.php
+++ b/layouts/joomla/form/field/hidden.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/form/field/list-fancy-select.php b/layouts/joomla/form/field/list-fancy-select.php
index 794c951f1bc63..2dcf4bf4ce848 100644
--- a/layouts/joomla/form/field/list-fancy-select.php
+++ b/layouts/joomla/form/field/list-fancy-select.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -105,7 +105,7 @@
 Text::script('JGLOBAL_SELECT_PRESS_TO_SELECT');
 
 Factory::getDocument()->getWebAssetManager()->enableAsset('choicesjs');
-HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);
+HTMLHelper::_('webcomponent', 'system/fields/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);
 
 ?>
 
diff --git a/layouts/joomla/form/field/list.php b/layouts/joomla/form/field/list.php
index a23785d3f065d..01917a7c16b4e 100644
--- a/layouts/joomla/form/field/list.php
+++ b/layouts/joomla/form/field/list.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -55,6 +55,7 @@
 $attr .= $required ? ' required' : '';
 $attr .= $autofocus ? ' autofocus' : '';
 $attr .= $onchange ? ' onchange="' . $onchange . '"' : '';
+$attr .= !empty($description) ? ' aria-describedby="' . $name . '-desc"' : '';
 
 // To avoid user's confusion, readonly="readonly" should imply disabled="disabled".
 if ($readonly || $disabled)
@@ -86,9 +87,17 @@
 	}
 }
 else
-// Create a regular list.
+// Create a regular list passing the arguments in an array.
 {
-	$html[] = HTMLHelper::_('select.genericlist', $options, $name, trim($attr), 'value', 'text', $value, $id);
+	$listoptions = array();
+	$listoptions['option.key'] = 'value';
+	$listoptions['option.text'] = 'text';
+	$listoptions['list.select'] = $value;
+	$listoptions['id'] = $id;
+	$listoptions['list.translate'] = false;
+	$listoptions['option.attr'] = 'optionattr';
+	$listoptions['list.attr'] = trim($attr);
+	$html[] = HTMLHelper::_('select.genericlist', $options, $name, $listoptions);
 }
 
 echo implode($html);
diff --git a/layouts/joomla/form/field/media.php b/layouts/joomla/form/field/media.php
index 91179f47abb80..7b9c9929e1fe1 100644
--- a/layouts/joomla/form/field/media.php
+++ b/layouts/joomla/form/field/media.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Admin
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -131,11 +131,12 @@
 			'width'  => '100%',
 			'modalWidth'  => '80',
 			'bodyHeight'  => '60',
-			'footer'      => '<button class="btn btn-secondary button-save-selected">' . Text::_('JSELECT') . '</button><button class="btn btn-secondary" data-dismiss="modal">' . Text::_('JCANCEL') . '</button>'
+			'footer'      => '<button type="button" class="btn btn-secondary button-save-selected">' . Text::_('JSELECT') . '</button>'
+				. '<button type="button" class="btn btn-secondary" data-dismiss="modal">' . Text::_('JCANCEL') . '</button>',
 		)
 	);
 
-	HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-field-media.min.js', ['version' => 'auto', 'relative' => true]);
+	HTMLHelper::_('webcomponent', 'system/fields/joomla-field-media.min.js', ['version' => 'auto', 'relative' => true]);
 	Text::script('JLIB_FORM_MEDIA_PREVIEW_EMPTY', true);
 	?>
 	<?php if ($showPreview) : ?>
diff --git a/layouts/joomla/form/field/meter.php b/layouts/joomla/form/field/meter.php
index da8ad1831eff0..539d3c60be8b0 100644
--- a/layouts/joomla/form/field/meter.php
+++ b/layouts/joomla/form/field/meter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/form/field/moduleorder.php b/layouts/joomla/form/field/moduleorder.php
index aadc7bcc2b59d..26e17117ca46d 100644
--- a/layouts/joomla/form/field/moduleorder.php
+++ b/layouts/joomla/form/field/moduleorder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -76,6 +76,6 @@
 	$attributes['onchange'] = 'onchange="' . $onchange . '"';
 }
 
-HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-field-module-order.min.js', ['version' => 'auto', 'relative' => true]);
+HTMLHelper::_('webcomponent', 'system/fields/joomla-field-module-order.min.js', ['version' => 'auto', 'relative' => true]);
 ?>
 <joomla-field-module-order <?php echo implode($attributes, ' '); ?>></joomla-field-module-order>
diff --git a/layouts/joomla/form/field/number.php b/layouts/joomla/form/field/number.php
index cfd7b8c0e905c..5f97b56709eb5 100644
--- a/layouts/joomla/form/field/number.php
+++ b/layouts/joomla/form/field/number.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -49,6 +49,7 @@
 
 $attributes = array(
 	!empty($class) ? 'class="form-control ' . $class . '"' : 'class="form-control"',
+	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',
 	strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
diff --git a/layouts/joomla/form/field/password.php b/layouts/joomla/form/field/password.php
index 9bfa6d6398618..3357db95822c4 100644
--- a/layouts/joomla/form/field/password.php
+++ b/layouts/joomla/form/field/password.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/form/field/radio/buttons.php b/layouts/joomla/form/field/radio/buttons.php
index e08c815d6c09e..c0dca3b815257 100644
--- a/layouts/joomla/form/field/radio/buttons.php
+++ b/layouts/joomla/form/field/radio/buttons.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/form/field/radio/switcher.php b/layouts/joomla/form/field/radio/switcher.php
index 0d5cd9debbc05..ebb2872fe64df 100644
--- a/layouts/joomla/form/field/radio/switcher.php
+++ b/layouts/joomla/form/field/radio/switcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -58,10 +58,7 @@
 $format     = '<input type="radio" id="%1$s" name="%2$s" value="%3$s" %4$s>';
 $alt        = preg_replace('/[^a-zA-Z0-9_\-]/', '_', $name);
 
-HTMLHelper::_('webcomponent',
-	'system/webcomponents/joomla-field-switcher.min.js',
-	['version' => 'auto', 'relative' => true]
-);
+HTMLHelper::_('webcomponent', 'system/fields/joomla-field-switcher.min.js', ['version' => 'auto', 'relative' => true]);
 
 // Set the type of switcher
 $type = '';
diff --git a/layouts/joomla/form/field/radiobasic.php b/layouts/joomla/form/field/radiobasic.php
index f7368b9a3b788..122c753eeb064 100644
--- a/layouts/joomla/form/field/radiobasic.php
+++ b/layouts/joomla/form/field/radiobasic.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/form/field/range.php b/layouts/joomla/form/field/range.php
index 21b9e9becf134..44d0e5db44780 100644
--- a/layouts/joomla/form/field/range.php
+++ b/layouts/joomla/form/field/range.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -45,8 +45,10 @@
  */
 
 // Initialize some field attributes.
+
 $attributes = array(
 	$class ? 'class="form-control ' . $class . '"' : 'class="form-control"',
+	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',
 	!empty($onchange) ? 'onchange="' . $onchange . '"' : '',
diff --git a/layouts/joomla/form/field/rules.php b/layouts/joomla/form/field/rules.php
index 4331527ddb3cd..01de1546753a0 100644
--- a/layouts/joomla/form/field/rules.php
+++ b/layouts/joomla/form/field/rules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -52,7 +52,7 @@
 
 // Add Javascript for permission change
 HTMLHelper::_('form.csrf');
-HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-field-permissions.min.js', ['version' => 'auto', 'relative' => true]);
+HTMLHelper::_('webcomponent', 'system/fields/joomla-field-permissions.min.js', ['version' => 'auto', 'relative' => true]);
 HTMLHelper::_('webcomponent', 'vendor/joomla-custom-elements/joomla-tab.min.js', ['version' => 'auto', 'relative' => true]);
 
 // Load JavaScript message titles
diff --git a/layouts/joomla/form/field/subform/default.php b/layouts/joomla/form/field/subform/default.php
index fbc443390d093..9fa66709f5086 100644
--- a/layouts/joomla/form/field/subform/default.php
+++ b/layouts/joomla/form/field/subform/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/form/field/subform/repeatable-table.php b/layouts/joomla/form/field/subform/repeatable-table.php
index 0becf3704deb9..b8336a59216fe 100644
--- a/layouts/joomla/form/field/subform/repeatable-table.php
+++ b/layouts/joomla/form/field/subform/repeatable-table.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -34,7 +34,7 @@
 // Add script
 if ($multiple)
 {
-	HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-field-subform.min.js', ['version' => 'auto', 'relative' => true]);
+	HTMLHelper::_('webcomponent', 'system/fields/joomla-field-subform.min.js', ['version' => 'auto', 'relative' => true]);
 }
 
 // Build heading
diff --git a/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php b/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php
index e32df3a2f654c..d54733d41832b 100644
--- a/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php
+++ b/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/form/field/subform/repeatable-table/section.php b/layouts/joomla/form/field/subform/repeatable-table/section.php
index 1d6487adf7cb8..adb3fe6c93fa9 100644
--- a/layouts/joomla/form/field/subform/repeatable-table/section.php
+++ b/layouts/joomla/form/field/subform/repeatable-table/section.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/form/field/subform/repeatable.php b/layouts/joomla/form/field/subform/repeatable.php
index 736b62e5a2644..b4b90f677bbaf 100644
--- a/layouts/joomla/form/field/subform/repeatable.php
+++ b/layouts/joomla/form/field/subform/repeatable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -33,7 +33,7 @@
 // Add script
 if ($multiple)
 {
-	HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-field-subform.min.js', ['version' => 'auto', 'relative' => true]);
+	HTMLHelper::_('webcomponent', 'system/fields/joomla-field-subform.min.js', ['version' => 'auto', 'relative' => true]);
 }
 $sublayout = empty($groupByFieldset) ? 'section' : 'section-byfieldsets';
 ?>
diff --git a/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php b/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
index f04f9e3c58757..2a9890b945ed4 100644
--- a/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
+++ b/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/form/field/subform/repeatable/section.php b/layouts/joomla/form/field/subform/repeatable/section.php
index d00b4268349bc..30a673c201489 100644
--- a/layouts/joomla/form/field/subform/repeatable/section.php
+++ b/layouts/joomla/form/field/subform/repeatable/section.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/form/field/tag.php b/layouts/joomla/form/field/tag.php
index 1f26b4b9e0ab2..ce256ae6236e4 100644
--- a/layouts/joomla/form/field/tag.php
+++ b/layouts/joomla/form/field/tag.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -122,7 +122,7 @@
 Text::script('JGLOBAL_SELECT_PRESS_TO_SELECT');
 
 Factory::getDocument()->getWebAssetManager()->enableAsset('choicesjs');
-HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);
+HTMLHelper::_('webcomponent', 'system/fields/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);
 
 ?>
 
diff --git a/layouts/joomla/form/field/tel.php b/layouts/joomla/form/field/tel.php
index f346ee508f881..c551807e6315e 100644
--- a/layouts/joomla/form/field/tel.php
+++ b/layouts/joomla/form/field/tel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -45,18 +45,19 @@
  * @var   integer  $maxLength       The maximum length that the field shall accept.
  */
 
-$autocomplete = !$autocomplete ? ' autocomplete="off"' : ' autocomplete="' . $autocomplete . '"';
-$autocomplete = $autocomplete === ' autocomplete="on"' ? '' : $autocomplete;
+$autocomplete = !$autocomplete ? 'autocomplete="off"' : 'autocomplete="' . $autocomplete . '"';
+$autocomplete = $autocomplete === 'autocomplete="on"' ? '' : $autocomplete;
 
 $attributes = array(
 	!empty($size) ? 'size="' . $size . '"' : '',
+	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',
 	strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
 	$autocomplete,
-	$autofocus ? ' autofocus' : '',
+	$autofocus ? 'autofocus' : '',
 	$spellcheck ? '' : 'spellcheck="false"',
-	$onchange ? ' onchange="' . $onchange . '"' : '',
+	$onchange ? 'onchange="' . $onchange . '"' : '',
 	!empty($maxLength) ? $maxLength : '',
 	$required ? 'required' : '',
 );
diff --git a/layouts/joomla/form/field/text.php b/layouts/joomla/form/field/text.php
index 48c9134df3121..6da1c6f8e331d 100644
--- a/layouts/joomla/form/field/text.php
+++ b/layouts/joomla/form/field/text.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -59,7 +59,7 @@
 $attributes = array(
 	!empty($class) ? 'class="form-control ' . $class . '"' : 'class="form-control"',
 	!empty($size) ? 'size="' . $size . '"' : '',
-	!empty($description) ? 'title="' . $description . '"' : '',
+	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',
 	$list,
diff --git a/layouts/joomla/form/field/textarea.php b/layouts/joomla/form/field/textarea.php
index 4b38b6e0e7f72..ae184a0dd0d15 100644
--- a/layouts/joomla/form/field/textarea.php
+++ b/layouts/joomla/form/field/textarea.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -52,6 +52,7 @@
 	$columns ?: '',
 	$rows ?: '',
 	!empty($class) ? 'class="form-control ' . $class . '"' : 'class="form-control"',
+	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
 	strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',
diff --git a/layouts/joomla/form/field/url.php b/layouts/joomla/form/field/url.php
index 345a8e63a062a..6500c08deb39c 100644
--- a/layouts/joomla/form/field/url.php
+++ b/layouts/joomla/form/field/url.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -51,6 +51,7 @@
 
 $attributes = array(
 	!empty($size) ? ' size="' . $size . '"' : '',
+	!empty($description) ? ' aria-describedby="' . $name . '-desc"' : '',
 	$disabled ? ' disabled' : '',
 	$readonly ? ' readonly' : '',
 	strlen($hint) ? ' placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
diff --git a/layouts/joomla/form/field/user.php b/layouts/joomla/form/field/user.php
index 240317f369487..d3f1e812efde4 100644
--- a/layouts/joomla/form/field/user.php
+++ b/layouts/joomla/form/field/user.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -50,7 +50,7 @@
 
 if (!$readonly)
 {
-	HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-field-user.min.js', ['version' => 'auto', 'relative' => true]);
+	HTMLHelper::_('webcomponent', 'system/fields/joomla-field-user.min.js', ['version' => 'auto', 'relative' => true]);
 }
 
 $uri = new Uri('index.php?option=com_users&view=users&layout=modal&tmpl=component&required=0');
diff --git a/layouts/joomla/form/renderfield.php b/layouts/joomla/form/renderfield.php
index b23255d4c4f89..a5fcc02df21b3 100644
--- a/layouts/joomla/form/renderfield.php
+++ b/layouts/joomla/form/renderfield.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -36,7 +36,7 @@
 	<?php if (empty($options['hiddenLabel'])) : ?>
 		<div class="control-label"><?php echo $label; ?></div>
 	<?php endif; ?>
-	<div class="controls"<?php if (!empty($description)) : ?> aria-describedby="<?php echo $id; ?>"<?php endif; ?>>
+	<div class="controls">
 		<?php echo $input; ?>
 	</div>
 	<?php if (!empty($description)) : ?>
diff --git a/layouts/joomla/form/renderlabel.php b/layouts/joomla/form/renderlabel.php
index 084805bd378a1..b26a69ff2bb0c 100644
--- a/layouts/joomla/form/renderlabel.php
+++ b/layouts/joomla/form/renderlabel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/html/batch/access.php b/layouts/joomla/html/batch/access.php
index 9817b24cda605..e03f2b2e8de12 100644
--- a/layouts/joomla/html/batch/access.php
+++ b/layouts/joomla/html/batch/access.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/html/batch/adminlanguage.php b/layouts/joomla/html/batch/adminlanguage.php
index dafb128407706..8f6616a3fb190 100644
--- a/layouts/joomla/html/batch/adminlanguage.php
+++ b/layouts/joomla/html/batch/adminlanguage.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/html/batch/item.php b/layouts/joomla/html/batch/item.php
index 8b25bcfa49512..bb6d6af891c44 100644
--- a/layouts/joomla/html/batch/item.php
+++ b/layouts/joomla/html/batch/item.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/html/batch/language.php b/layouts/joomla/html/batch/language.php
index f910a42d2d63a..b3ac7d138f398 100644
--- a/layouts/joomla/html/batch/language.php
+++ b/layouts/joomla/html/batch/language.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/html/batch/tag.php b/layouts/joomla/html/batch/tag.php
index 784b7e6dbaa41..01c009eee0a68 100644
--- a/layouts/joomla/html/batch/tag.php
+++ b/layouts/joomla/html/batch/tag.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/html/batch/user.php b/layouts/joomla/html/batch/user.php
index 2ad5cda7adcaf..edf3cb08bf35a 100644
--- a/layouts/joomla/html/batch/user.php
+++ b/layouts/joomla/html/batch/user.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/html/batch/workflowstage.php b/layouts/joomla/html/batch/workflowstage.php
index 600ccf278f9af..e3a7809f217d9 100644
--- a/layouts/joomla/html/batch/workflowstage.php
+++ b/layouts/joomla/html/batch/workflowstage.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/html/treeprefix.php b/layouts/joomla/html/treeprefix.php
index cfcd3a715c1d7..1990990cfda77 100644
--- a/layouts/joomla/html/treeprefix.php
+++ b/layouts/joomla/html/treeprefix.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/installer/changelog.php b/layouts/joomla/installer/changelog.php
new file mode 100644
index 0000000000000..67de92f2f152a
--- /dev/null
+++ b/layouts/joomla/installer/changelog.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Language\Text;
+
+defined('JPATH_BASE') or die;
+
+array_walk(
+	$displayData,
+	function ($items, $changeType) {
+		// If there are no items, continue
+		if (empty($items))
+		{
+			return;
+		}
+
+		switch ($changeType)
+		{
+			case 'security':
+				$class = 'badge-danger';
+				break;
+			case 'fix':
+				$class = 'badge-dark';
+				break;
+			case 'language':
+				$class = 'badge-jlanguage';
+				break;
+			case 'addition':
+				$class = 'badge-success';
+				break;
+			case 'change':
+				$class = 'badge-warning';
+				break;
+			case 'removed':
+				$class = 'badge-light';
+				break;
+			default:
+			case 'note':
+				$class = 'badge-info';
+				break;
+		}
+
+		?>
+		<div class="changelog">
+			<div class="changelog__item">
+				<div class="changelog__tag">
+					<span class="badge <?php echo $class; ?>"><?php echo Text::_('COM_INSTALLER_CHANGELOG_' . $changeType); ?></span>
+				</div>
+				<div class="changelog__list">
+					<ul>
+						<li><?php echo implode('</li><li>', $items); ?></li>
+					</ul>
+				</div>
+			</div>
+		</div>
+		<?php
+	}
+);
diff --git a/layouts/joomla/links/groupclose.php b/layouts/joomla/links/groupclose.php
index 2d994e8c5965d..f03eafeb1580e 100644
--- a/layouts/joomla/links/groupclose.php
+++ b/layouts/joomla/links/groupclose.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/links/groupopen.php b/layouts/joomla/links/groupopen.php
index 5e5b70b12dce1..20aa161ca7270 100644
--- a/layouts/joomla/links/groupopen.php
+++ b/layouts/joomla/links/groupopen.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/links/groupsclose.php b/layouts/joomla/links/groupsclose.php
index 5e84c660ab473..81a78b5c491ed 100644
--- a/layouts/joomla/links/groupsclose.php
+++ b/layouts/joomla/links/groupsclose.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/links/groupseparator.php b/layouts/joomla/links/groupseparator.php
index 1b6df93d162ba..64ecbceaf214a 100644
--- a/layouts/joomla/links/groupseparator.php
+++ b/layouts/joomla/links/groupseparator.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/links/groupsopen.php b/layouts/joomla/links/groupsopen.php
index 8aa839511ee20..66e5765de173d 100644
--- a/layouts/joomla/links/groupsopen.php
+++ b/layouts/joomla/links/groupsopen.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/links/link.php b/layouts/joomla/links/link.php
index 58eeb996e7418..78b66c0b7fb84 100644
--- a/layouts/joomla/links/link.php
+++ b/layouts/joomla/links/link.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/modal/body.php b/layouts/joomla/modal/body.php
index df7af5d8af079..74b38a0b1b71b 100644
--- a/layouts/joomla/modal/body.php
+++ b/layouts/joomla/modal/body.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/modal/footer.php b/layouts/joomla/modal/footer.php
index e1a9af022abf5..098dae16129a3 100644
--- a/layouts/joomla/modal/footer.php
+++ b/layouts/joomla/modal/footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/modal/header.php b/layouts/joomla/modal/header.php
index da211f58b9541..818953bf096ae 100644
--- a/layouts/joomla/modal/header.php
+++ b/layouts/joomla/modal/header.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/modal/iframe.php b/layouts/joomla/modal/iframe.php
index c1cb6c6c305a0..590dc6d1c6896 100644
--- a/layouts/joomla/modal/iframe.php
+++ b/layouts/joomla/modal/iframe.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/modal/main.php b/layouts/joomla/modal/main.php
index f88b4f9da6cfe..8ea3a68be30f6 100644
--- a/layouts/joomla/modal/main.php
+++ b/layouts/joomla/modal/main.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/pagination/link.php b/layouts/joomla/pagination/link.php
index 07473048dbd17..bf21a0a6913a5 100644
--- a/layouts/joomla/pagination/link.php
+++ b/layouts/joomla/pagination/link.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -64,7 +64,6 @@
 	}
 
 	$class = 'active';
-	$title = 'title="' . $item->text . '"';
 	$onClick = 'document.adminForm.' . $item->prefix . 'limitstart.value=' . ($item->base > 0 ? $item->base : '0') . '; Joomla.submitform();return false;';
 }
 else
@@ -74,7 +73,7 @@
 ?>
 <?php if ($displayData['active']) : ?>
 	<li class="<?php echo $class; ?> page-link">
-		<a <?php echo $title; ?> aria-label="<?php echo $aria; ?>" href="#" onclick="<?php echo $onClick; ?>">
+		<a aria-label="<?php echo $aria; ?>" href="#" onclick="<?php echo $onClick; ?>">
 			<?php echo $display; ?>
 		</a>
 	</li>
diff --git a/layouts/joomla/pagination/links.php b/layouts/joomla/pagination/links.php
index 8d8073ba81a5d..58466c3db79aa 100644
--- a/layouts/joomla/pagination/links.php
+++ b/layouts/joomla/pagination/links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/pagination/list.php b/layouts/joomla/pagination/list.php
index 35742ac7de44a..7bb24ba00c649 100644
--- a/layouts/joomla/pagination/list.php
+++ b/layouts/joomla/pagination/list.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/quickicons/icon.php b/layouts/joomla/quickicons/icon.php
index 72b504c92e216..d36fbc8def87a 100644
--- a/layouts/joomla/quickicons/icon.php
+++ b/layouts/joomla/quickicons/icon.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/searchtools/default.php b/layouts/joomla/searchtools/default.php
index 790eaf3b9b1bd..0c93556305bac 100644
--- a/layouts/joomla/searchtools/default.php
+++ b/layouts/joomla/searchtools/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/searchtools/default/bar.php b/layouts/joomla/searchtools/default/bar.php
index e16739a619051..498ef901c9b36 100644
--- a/layouts/joomla/searchtools/default/bar.php
+++ b/layouts/joomla/searchtools/default/bar.php
@@ -3,13 +3,12 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('JPATH_BASE') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\Registry\Registry;
 
@@ -44,18 +43,18 @@
 					</label>
 					<?php echo $filters['filter_search']->input; ?>
 					<span class="input-group-append">
-						<button type="submit" class="btn btn-primary hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'JSEARCH_FILTER_SUBMIT'); ?>"  aria-label="<?php echo Text::_('JSEARCH_FILTER_SUBMIT'); ?>">
+						<button type="submit" class="btn btn-primary" aria-label="<?php echo Text::_('JSEARCH_FILTER_SUBMIT'); ?>">
 							<span class="fa fa-search" aria-hidden="true"></span>
 						</button>
 					</span>
 				</div>
 			</div>
-			<button type="button" class="btn btn-primary hasTooltip js-stools-btn-clear mr-2" title="<?php echo HTMLHelper::_('tooltipText', 'JSEARCH_FILTER_CLEAR'); ?>">
+			<button type="button" class="btn btn-primary js-stools-btn-clear mr-2">
 				<?php echo Text::_('JSEARCH_FILTER_CLEAR'); ?>
 			</button>
 			<div class="btn-group">
 				<button type="button" class="btn btn-primary hasTooltip js-stools-btn-filter">
-					<?php echo Text::_('JTABLE_OPTIONS'); ?>
+					<?php echo Text::_('JFILTER_OPTIONS'); ?>
 					<span class="fa fa-caret-down" aria-hidden="true"></span>
 				</button>
 			</div>
diff --git a/layouts/joomla/searchtools/default/filters.php b/layouts/joomla/searchtools/default/filters.php
index 842b52c3761e2..f0778128920f6 100644
--- a/layouts/joomla/searchtools/default/filters.php
+++ b/layouts/joomla/searchtools/default/filters.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/searchtools/default/list.php b/layouts/joomla/searchtools/default/list.php
index 9e535d394f962..087f0c385f144 100644
--- a/layouts/joomla/searchtools/default/list.php
+++ b/layouts/joomla/searchtools/default/list.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/searchtools/default/noitems.php b/layouts/joomla/searchtools/default/noitems.php
index fa552a7f2a123..9f636a45b28e7 100644
--- a/layouts/joomla/searchtools/default/noitems.php
+++ b/layouts/joomla/searchtools/default/noitems.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/searchtools/default/selector.php b/layouts/joomla/searchtools/default/selector.php
index 8ff36d1d0f6ca..11a8f4a9a2c75 100644
--- a/layouts/joomla/searchtools/default/selector.php
+++ b/layouts/joomla/searchtools/default/selector.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/searchtools/grid/sort.php b/layouts/joomla/searchtools/grid/sort.php
index 0ca23f6032552..ca622242d0fe4 100644
--- a/layouts/joomla/searchtools/grid/sort.php
+++ b/layouts/joomla/searchtools/grid/sort.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/sidebars/submenu.php b/layouts/joomla/sidebars/submenu.php
index 9b10129a129af..99ca38b162d3b 100644
--- a/layouts/joomla/sidebars/submenu.php
+++ b/layouts/joomla/sidebars/submenu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/system/message.php b/layouts/joomla/system/message.php
index a8b2acd66633e..cd8de6de9c32d 100644
--- a/layouts/joomla/system/message.php
+++ b/layouts/joomla/system/message.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/tinymce/textarea.php b/layouts/joomla/tinymce/textarea.php
index d150cef02f079..50d6522b939aa 100644
--- a/layouts/joomla/tinymce/textarea.php
+++ b/layouts/joomla/tinymce/textarea.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/tinymce/togglebutton.php b/layouts/joomla/tinymce/togglebutton.php
index 626c622f11cb9..bb7d4399e7e57 100644
--- a/layouts/joomla/tinymce/togglebutton.php
+++ b/layouts/joomla/tinymce/togglebutton.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -18,7 +18,6 @@
 	<div class="btn-group">
 		<button type="button" class="btn btn-secondary" href="#"
 			onclick="tinyMCE.execCommand('mceToggleEditor', false, '<?php echo $name; ?>');return false;"
-			title="<?php echo Text::_('PLG_TINY_BUTTON_TOGGLE_EDITOR'); ?>"
 		>
 			<span class="icon-eye" aria-hidden="true"></span>
 			<?php echo Text::_('PLG_TINY_BUTTON_TOGGLE_EDITOR'); ?>
diff --git a/layouts/joomla/toolbar/base.php b/layouts/joomla/toolbar/base.php
index 70353ba842def..99d527415efb5 100644
--- a/layouts/joomla/toolbar/base.php
+++ b/layouts/joomla/toolbar/base.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/basic.php b/layouts/joomla/toolbar/basic.php
index 25b2ce53fcdb5..5d0ba3534e11b 100644
--- a/layouts/joomla/toolbar/basic.php
+++ b/layouts/joomla/toolbar/basic.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,7 +12,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 
 HTMLHelper::_('behavior.core');
-HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-toolbar-button.min.js', ['relative' => true, 'version' => 'auto', 'detectDebug' => true]);
+HTMLHelper::_('webcomponent', 'system/joomla-toolbar-button.min.js', ['relative' => true, 'version' => 'auto', 'detectDebug' => true]);
 
 /**
  * @var  int     $id
diff --git a/layouts/joomla/toolbar/batch.php b/layouts/joomla/toolbar/batch.php
index ea68b3abaf0dd..7e3db54138d32 100644
--- a/layouts/joomla/toolbar/batch.php
+++ b/layouts/joomla/toolbar/batch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/containerclose.php b/layouts/joomla/toolbar/containerclose.php
index 5e84c660ab473..8df11791be645 100644
--- a/layouts/joomla/toolbar/containerclose.php
+++ b/layouts/joomla/toolbar/containerclose.php
@@ -3,10 +3,11 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('JPATH_BASE') or die;
 ?>
 </div>
+</nav>
diff --git a/layouts/joomla/toolbar/containeropen.php b/layouts/joomla/toolbar/containeropen.php
index 40503fd3ac3a7..dda6f9881eaf1 100644
--- a/layouts/joomla/toolbar/containeropen.php
+++ b/layouts/joomla/toolbar/containeropen.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,4 +14,5 @@
 
 HTMLHelper::_('script', 'legacy/toolbar.min.js', array('version' => 'auto', 'relative' => true));
 ?>
-<div class="btn-toolbar d-flex" role="toolbar" aria-label="<?php echo Text::_('JTOOLBAR'); ?>" id="<?php echo $displayData['id']; ?>">
+<nav aria-label="<?php echo Text::_('JTOOLBAR'); ?>">
+<div class="btn-toolbar d-flex" role="toolbar" id="<?php echo $displayData['id']; ?>">
diff --git a/layouts/joomla/toolbar/dropdown.php b/layouts/joomla/toolbar/dropdown.php
index 8c7a194af85c9..f0e69fccc8679 100644
--- a/layouts/joomla/toolbar/dropdown.php
+++ b/layouts/joomla/toolbar/dropdown.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/iconclass.php b/layouts/joomla/toolbar/iconclass.php
index aef3b44351789..692ed05d46201 100644
--- a/layouts/joomla/toolbar/iconclass.php
+++ b/layouts/joomla/toolbar/iconclass.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/link.php b/layouts/joomla/toolbar/link.php
index 3dd6133234579..6b12ff1b006af 100644
--- a/layouts/joomla/toolbar/link.php
+++ b/layouts/joomla/toolbar/link.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/modal.php b/layouts/joomla/toolbar/modal.php
index 36e9610cedbf8..2c2a68921874c 100644
--- a/layouts/joomla/toolbar/modal.php
+++ b/layouts/joomla/toolbar/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -48,7 +48,7 @@
 	]
 );
 ?>
-<button<?php echo $id; ?> onclick="document.getElementById('modal_<?php echo $selector; ?>').open()" class="<?php echo $class; ?>" data-toggle="modal" title="<?php echo $text; ?>">
+<button<?php echo $id; ?> onclick="document.getElementById('modal_<?php echo $selector; ?>').open()" class="<?php echo $class; ?>" data-toggle="modal">
 	<span class="<?php echo $icon; ?>" aria-hidden="true"></span>
 	<?php echo $text; ?>
 </button>
diff --git a/layouts/joomla/toolbar/popup.php b/layouts/joomla/toolbar/popup.php
index 43d3f133f4a88..f55084bbba160 100644
--- a/layouts/joomla/toolbar/popup.php
+++ b/layouts/joomla/toolbar/popup.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 HTMLHelper::_('behavior.core');
-HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-toolbar-button.min.js', ['version' => 'auto', 'relative' => true]);
+HTMLHelper::_('webcomponent', 'system/joomla-toolbar-button.min.js', ['version' => 'auto', 'relative' => true]);
 
 /**
  * @var  int     $id
diff --git a/layouts/joomla/toolbar/separator.php b/layouts/joomla/toolbar/separator.php
index 7fe4c3f03c520..298e5895c1080 100644
--- a/layouts/joomla/toolbar/separator.php
+++ b/layouts/joomla/toolbar/separator.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/slider.php b/layouts/joomla/toolbar/slider.php
deleted file mode 100644
index 7aef8bc4e5253..0000000000000
--- a/layouts/joomla/toolbar/slider.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @package     Joomla.Site
- * @subpackage  Layout
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('JPATH_BASE') or die;
-
-use Joomla\CMS\HTML\HTMLHelper;
-
-HTMLHelper::_('behavior.core');
-
-$id      = $displayData['id'] ?? '';
-$doTask  = $displayData['doTask'];
-$class   = $displayData['class'];
-$text    = $displayData['text'];
-$name    = $displayData['name'];
-$onClose = $displayData['onClose'];
-?>
-<button<?php echo $id; ?> onclick="<?php echo $doTask; ?>" class="btn btn-secondary" data-toggle="collapse" data-target="#collapse-<?php echo $name; ?>"<?php echo $onClose; ?>>
-	<span class="fa fa-cog" aria-hidden="true"></span>
-	<?php echo $text; ?>
-</button>
diff --git a/layouts/joomla/toolbar/standard.php b/layouts/joomla/toolbar/standard.php
index 2392c569998fc..baf08d432e231 100644
--- a/layouts/joomla/toolbar/standard.php
+++ b/layouts/joomla/toolbar/standard.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,7 +12,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 
 HTMLHelper::_('behavior.core');
-HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-toolbar-button.min.js', ['version' => 'auto', 'relative' => true]);
+HTMLHelper::_('webcomponent', 'system/joomla-toolbar-button.min.js', ['version' => 'auto', 'relative' => true]);
 
 /**
  * @var  string  $id
diff --git a/layouts/joomla/toolbar/title.php b/layouts/joomla/toolbar/title.php
index 283934c38730e..23bfe557a6bcf 100644
--- a/layouts/joomla/toolbar/title.php
+++ b/layouts/joomla/toolbar/title.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/versions.php b/layouts/joomla/toolbar/versions.php
index 3f12ebded17db..1627da4f91c74 100644
--- a/layouts/joomla/toolbar/versions.php
+++ b/layouts/joomla/toolbar/versions.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -51,7 +51,6 @@
 <button<?php echo $id ?? ''; ?>
 	onclick="document.getElementById('versionsModal').open()"
 	class="btn btn-primary"
-	data-toggle="modal"
-	title="<?php echo $title; ?>">
+	data-toggle="modal">
 	<span class="fa fa-code-fork" aria-hidden="true"></span><?php echo $title; ?>
 </button>
diff --git a/layouts/libraries/cms/html/bootstrap/addtab.php b/layouts/libraries/cms/html/bootstrap/addtab.php
index c24895b206630..b2f64b4da201b 100644
--- a/layouts/libraries/cms/html/bootstrap/addtab.php
+++ b/layouts/libraries/cms/html/bootstrap/addtab.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/libraries/cms/html/bootstrap/endtab.php b/layouts/libraries/cms/html/bootstrap/endtab.php
index 6e0d076ad8539..304d93ca63931 100644
--- a/layouts/libraries/cms/html/bootstrap/endtab.php
+++ b/layouts/libraries/cms/html/bootstrap/endtab.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/libraries/cms/html/bootstrap/endtabset.php b/layouts/libraries/cms/html/bootstrap/endtabset.php
index 6e0d076ad8539..304d93ca63931 100644
--- a/layouts/libraries/cms/html/bootstrap/endtabset.php
+++ b/layouts/libraries/cms/html/bootstrap/endtabset.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/libraries/cms/html/bootstrap/starttabset.php b/layouts/libraries/cms/html/bootstrap/starttabset.php
index b07a58edacd37..7fa17b4e70d14 100644
--- a/layouts/libraries/cms/html/bootstrap/starttabset.php
+++ b/layouts/libraries/cms/html/bootstrap/starttabset.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/plugins/editors/tinymce/field/tinymcebuilder.php b/layouts/plugins/editors/tinymce/field/tinymcebuilder.php
index 1b8c6dacb9803..077257627eb25 100644
--- a/layouts/plugins/editors/tinymce/field/tinymcebuilder.php
+++ b/layouts/plugins/editors/tinymce/field/tinymcebuilder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors.tinymce
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/plugins/editors/tinymce/field/tinymcebuilder/setoptions.php b/layouts/plugins/editors/tinymce/field/tinymcebuilder/setoptions.php
index e3d28115dd3e8..c7ca814c1bd33 100644
--- a/layouts/plugins/editors/tinymce/field/tinymcebuilder/setoptions.php
+++ b/layouts/plugins/editors/tinymce/field/tinymcebuilder/setoptions.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors.tinymce
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/plugins/user/profile/fields/dob.php b/layouts/plugins/user/profile/fields/dob.php
index 0c8eb14785df2..902d288f7870b 100644
--- a/layouts/plugins/user/profile/fields/dob.php
+++ b/layouts/plugins/user/profile/fields/dob.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/bootstrap.php b/libraries/bootstrap.php
index 06d5a20c28a02..f219c68539382 100644
--- a/libraries/bootstrap.php
+++ b/libraries/bootstrap.php
@@ -3,7 +3,7 @@
  * Bootstrap file for the Joomla! CMS [with legacy libraries].
  * Including this file into your application will make Joomla libraries available for use.
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -62,19 +62,9 @@
 	JLog::addLogger(['logger' => 'messagequeue'], JLog::ALL, ['jerror']);
 }
 
-// Register classes that don't follow the autoloader convention.
-JLoader::register('JText', JPATH_PLATFORM . '/joomla/language/text.php');
-JLoader::register('JRoute', JPATH_PLATFORM . '/joomla/application/route.php');
-
 // Register the Crypto lib
 JLoader::register('Crypto', JPATH_PLATFORM . '/php-encryption/Crypto.php');
 
-// Check if the JsonSerializable interface exists already
-if (!interface_exists('JsonSerializable'))
-{
-	JLoader::register('JsonSerializable', JPATH_PLATFORM . '/vendor/joomla/compat/src/JsonSerializable.php');
-}
-
 // Register the PasswordHash library.
 JLoader::register('PasswordHash', JPATH_PLATFORM . '/phpass/PasswordHash.php');
 
diff --git a/libraries/classmap.php b/libraries/classmap.php
index 7d7fac98659e7..01369cc8df2a5 100644
--- a/libraries/classmap.php
+++ b/libraries/classmap.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Libraries
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -157,7 +157,6 @@
 JLoader::registerAlias('JToolbarButtonLink',                '\\Joomla\\CMS\\Toolbar\\Button\\LinkButton', '5.0');
 JLoader::registerAlias('JToolbarButtonPopup',               '\\Joomla\\CMS\\Toolbar\\Button\\PopupButton', '5.0');
 JLoader::registerAlias('JToolbarButtonSeparator',           '\\Joomla\\CMS\\Toolbar\\Button\\SeparatorButton', '5.0');
-JLoader::registerAlias('JToolbarButtonSlider',              '\\Joomla\\CMS\\Toolbar\\Button\\SliderButton', '5.0');
 JLoader::registerAlias('JToolbarButtonStandard',            '\\Joomla\\CMS\\Toolbar\\Button\\StandardButton', '5.0');
 JLoader::registerAlias('JToolbarHelper',                    '\\Joomla\\CMS\\Toolbar\\ToolbarHelper', '5.0');
 JLoader::registerAlias('JButton',                           '\\Joomla\\CMS\\Toolbar\\ToolbarButton', '5.0');
diff --git a/libraries/cms.php b/libraries/cms.php
index 77ef3f1aacf21..1f7fd70ff3f7f 100644
--- a/libraries/cms.php
+++ b/libraries/cms.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Libraries
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/class/loader.php b/libraries/cms/class/loader.php
index e91ef9752828e..f72be64a100ca 100644
--- a/libraries/cms/class/loader.php
+++ b/libraries/cms/class/loader.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Class
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/access.php b/libraries/cms/html/access.php
index 0d82398ff1264..6433bbc328155 100644
--- a/libraries/cms/html/access.php
+++ b/libraries/cms/html/access.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/actionsdropdown.php b/libraries/cms/html/actionsdropdown.php
index 33b0b45b1e08e..a04c1f3d65ad7 100644
--- a/libraries/cms/html/actionsdropdown.php
+++ b/libraries/cms/html/actionsdropdown.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/adminlanguage.php b/libraries/cms/html/adminlanguage.php
index 3e21ead078f7b..e80bcbd015bcd 100644
--- a/libraries/cms/html/adminlanguage.php
+++ b/libraries/cms/html/adminlanguage.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php
index 518f4335dacaf..a53f31fba9f0f 100644
--- a/libraries/cms/html/behavior.php
+++ b/libraries/cms/html/behavior.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/bootstrap.php b/libraries/cms/html/bootstrap.php
index 3e37cbd6f764f..b97ec85754c6a 100644
--- a/libraries/cms/html/bootstrap.php
+++ b/libraries/cms/html/bootstrap.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/category.php b/libraries/cms/html/category.php
index caf5cc11cea04..b0009573a0444 100644
--- a/libraries/cms/html/category.php
+++ b/libraries/cms/html/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/content.php b/libraries/cms/html/content.php
index b9387cf85719c..4fe0c82fd06ba 100644
--- a/libraries/cms/html/content.php
+++ b/libraries/cms/html/content.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -45,4 +45,38 @@ public static function prepare($text, $params = null, $context = 'text')
 
 		return $article->text;
 	}
+
+	/**
+	 * Returns an array of months.
+	 *
+	 * @param   Registry  $state  The state object.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.9.0
+	 */
+	public static function months($state)
+	{
+		$model = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
+
+		foreach ($state as $key => $value) 
+		{
+			$model->setState($key, $value);
+		}
+
+		$model->setState('filter.category_id', $state->get('category.id'));
+		$model->setState('list.start', 0);
+		$model->setState('list.limit', -1);
+		$model->setState('list.direction', 'asc');
+		$model->setState('list.filter', '');
+
+		$items = array();
+
+		foreach ($model->countItemsByMonth() as $item)
+		{
+			$items[] = JHtml::_('select.option', $item->d, (new JDate($item->d))->format('F Y') . ' [' . $item->c . ']');
+		}
+
+		return $items;
+	}
 }
diff --git a/libraries/cms/html/contentlanguage.php b/libraries/cms/html/contentlanguage.php
index 4b198b0f95fd0..0c93b68759e23 100644
--- a/libraries/cms/html/contentlanguage.php
+++ b/libraries/cms/html/contentlanguage.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/date.php b/libraries/cms/html/date.php
index 99ce1891857a5..f6467e8b490fe 100644
--- a/libraries/cms/html/date.php
+++ b/libraries/cms/html/date.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/debug.php b/libraries/cms/html/debug.php
index 0fd829ea45541..897c9f0e7f02f 100644
--- a/libraries/cms/html/debug.php
+++ b/libraries/cms/html/debug.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/draggablelist.php b/libraries/cms/html/draggablelist.php
index 09df8beff20e6..d8a3e45139567 100644
--- a/libraries/cms/html/draggablelist.php
+++ b/libraries/cms/html/draggablelist.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/html/dropdown.php b/libraries/cms/html/dropdown.php
index f0a91df44881e..7654ad19a3f52 100644
--- a/libraries/cms/html/dropdown.php
+++ b/libraries/cms/html/dropdown.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/email.php b/libraries/cms/html/email.php
index b19a0331f3b8e..11b03d710a774 100644
--- a/libraries/cms/html/email.php
+++ b/libraries/cms/html/email.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -57,7 +57,7 @@ public static function cloak($mail, $mailto = true, $text = '', $email = true, $
 		$domain = @$mail[1];
 
 		// Include the email cloaking script
-		HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-hidden-mail.js', ['version' => 'auto', 'relative' => true]);
+		HTMLHelper::_('webcomponent', 'system/joomla-hidden-mail.js', ['version' => 'auto', 'relative' => true]);
 
 		return '<joomla-hidden-mail '
 			. $attribsBefore . ' is-link="'
diff --git a/libraries/cms/html/form.php b/libraries/cms/html/form.php
index e094c930d3d69..80c0166337111 100644
--- a/libraries/cms/html/form.php
+++ b/libraries/cms/html/form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/formbehavior.php b/libraries/cms/html/formbehavior.php
index 79e29ac160916..0eb7466c98ea1 100644
--- a/libraries/cms/html/formbehavior.php
+++ b/libraries/cms/html/formbehavior.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/grid.php b/libraries/cms/html/grid.php
index 2ad8c8ae5dfec..a824fd418391a 100644
--- a/libraries/cms/html/grid.php
+++ b/libraries/cms/html/grid.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/icons.php b/libraries/cms/html/icons.php
index 7932e03f4395e..e2680cd91df4d 100644
--- a/libraries/cms/html/icons.php
+++ b/libraries/cms/html/icons.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/jgrid.php b/libraries/cms/html/jgrid.php
index 54523ed50ca1d..2053192d3923e 100644
--- a/libraries/cms/html/jgrid.php
+++ b/libraries/cms/html/jgrid.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/jquery.php b/libraries/cms/html/jquery.php
index 3a3473fcdf05d..1198e9cfec551 100644
--- a/libraries/cms/html/jquery.php
+++ b/libraries/cms/html/jquery.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/links.php b/libraries/cms/html/links.php
index 6d5961ac12f26..f2e5a750639d9 100644
--- a/libraries/cms/html/links.php
+++ b/libraries/cms/html/links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/list.php b/libraries/cms/html/list.php
index 5c75acfa94c60..bf341b58e5265 100644
--- a/libraries/cms/html/list.php
+++ b/libraries/cms/html/list.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/menu.php b/libraries/cms/html/menu.php
index ff6b20aef302e..5c8a5a9e106aa 100644
--- a/libraries/cms/html/menu.php
+++ b/libraries/cms/html/menu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -130,6 +130,12 @@ public static function menuItems($config = array())
 
 				$lookup[$item->menutype][] = &$item;
 
+				// Translate the menu item title when client is administrator
+				if ($clientId === 1)
+				{
+					$item->text = JText::_($item->text);
+				}
+
 				$item->text = str_repeat('- ', $item->level) . $item->text;
 			}
 
diff --git a/libraries/cms/html/number.php b/libraries/cms/html/number.php
index c319b2e8608b3..1449db7f00994 100644
--- a/libraries/cms/html/number.php
+++ b/libraries/cms/html/number.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/searchtools.php b/libraries/cms/html/searchtools.php
index 403b689cbb76c..df182e71d1fd8 100644
--- a/libraries/cms/html/searchtools.php
+++ b/libraries/cms/html/searchtools.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/select.php b/libraries/cms/html/select.php
index 5ece3d6e8834c..4e2c3a6fc3af6 100644
--- a/libraries/cms/html/select.php
+++ b/libraries/cms/html/select.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/sidebar.php b/libraries/cms/html/sidebar.php
index 3aaefaffc2a58..0bece0ded4192 100644
--- a/libraries/cms/html/sidebar.php
+++ b/libraries/cms/html/sidebar.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/sortablelist.php b/libraries/cms/html/sortablelist.php
index a76a47f361ecd..11d729453c619 100644
--- a/libraries/cms/html/sortablelist.php
+++ b/libraries/cms/html/sortablelist.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/string.php b/libraries/cms/html/string.php
index 73303b04c879e..6e264f4719a86 100644
--- a/libraries/cms/html/string.php
+++ b/libraries/cms/html/string.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/tag.php b/libraries/cms/html/tag.php
index c436bcaee735e..3c2e3c6e1cc83 100644
--- a/libraries/cms/html/tag.php
+++ b/libraries/cms/html/tag.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/tel.php b/libraries/cms/html/tel.php
index e12047f06ff62..ce6d768459e89 100644
--- a/libraries/cms/html/tel.php
+++ b/libraries/cms/html/tel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/uitab.php b/libraries/cms/html/uitab.php
index 3fa424dbfb8a7..49799c11c008e 100644
--- a/libraries/cms/html/uitab.php
+++ b/libraries/cms/html/uitab.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/user.php b/libraries/cms/html/user.php
index 6383b8fef80f7..aac2d665aaa15 100644
--- a/libraries/cms/html/user.php
+++ b/libraries/cms/html/user.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/html/workflowstage.php b/libraries/cms/html/workflowstage.php
index 3a40ae6ddd329..bf951e0708af6 100644
--- a/libraries/cms/html/workflowstage.php
+++ b/libraries/cms/html/workflowstage.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/extensions.classmap.php b/libraries/extensions.classmap.php
index 85bcffe76112c..25b50fe39a702 100644
--- a/libraries/extensions.classmap.php
+++ b/libraries/extensions.classmap.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Libraries
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/import.legacy.php b/libraries/import.legacy.php
index 9794b6706ba21..b737d7f81f38d 100644
--- a/libraries/import.legacy.php
+++ b/libraries/import.legacy.php
@@ -5,7 +5,7 @@
  *
  * @package    Joomla.Platform
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -52,11 +52,5 @@
 // Setup the autoloaders.
 JLoader::setup();
 
-// Check if the JsonSerializable interface exists already
-if (!interface_exists('JsonSerializable'))
-{
-	JLoader::register('JsonSerializable', JPATH_PLATFORM . '/vendor/joomla/compat/src/JsonSerializable.php');
-}
-
 // Register the PasswordHash lib
 JLoader::register('PasswordHash', JPATH_PLATFORM . '/phpass/PasswordHash.php');
diff --git a/libraries/import.php b/libraries/import.php
index 63c59f4cd206d..ce31b567f8f54 100644
--- a/libraries/import.php
+++ b/libraries/import.php
@@ -5,7 +5,7 @@
  *
  * @package    Joomla.Platform
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -52,11 +52,5 @@
 // Setup the autoloaders.
 JLoader::setup();
 
-// Check if the JsonSerializable interface exists already
-if (!interface_exists('JsonSerializable'))
-{
-	JLoader::register('JsonSerializable', JPATH_PLATFORM . '/vendor/joomla/compat/src/JsonSerializable.php');
-}
-
 // Register the PasswordHash lib
 JLoader::register('PasswordHash', JPATH_PLATFORM . '/phpass/PasswordHash.php');
diff --git a/libraries/joomla/base/adapter.php b/libraries/joomla/base/adapter.php
index d5ac3ca74af50..579ad9bf429dc 100644
--- a/libraries/joomla/base/adapter.php
+++ b/libraries/joomla/base/adapter.php
@@ -3,41 +3,45 @@
  * @package     Joomla.Platform
  * @subpackage  Base
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Factory as JFactory;
+use Joomla\CMS\Factory;
 
 /**
  * Adapter Class
  * Retains common adapter pattern functions
  * Class harvested from joomla.installer.installer
  *
- * @since  1.7.0
+ * @since       1.6
+ * @deprecated  5.0 Will be removed without replacement
  */
 class JAdapter extends JObject
 {
 	/**
 	 * Associative array of adapters
 	 *
-	 * @var    array
-	 * @since  1.7.0
+	 * @var    JAdapterInstance[]
+	 * @since  1.6
 	 */
 	protected $_adapters = array();
 
 	/**
 	 * Adapter Folder
+	 *
 	 * @var    string
-	 * @since  1.7.0
+	 * @since  1.6
 	 */
 	protected $_adapterfolder = 'adapters';
 
 	/**
-	 * @var    string	Adapter Class Prefix
-	 * @since  1.7.0
+	 * Adapter Class Prefix
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
 	protected $_classprefix = 'J';
 
@@ -45,7 +49,7 @@ class JAdapter extends JObject
 	 * Base Path for the adapter instance
 	 *
 	 * @var    string
-	 * @since  1.7.0
+	 * @since  1.6
 	 */
 	protected $_basepath = null;
 
@@ -53,7 +57,7 @@ class JAdapter extends JObject
 	 * Database Connector Object
 	 *
 	 * @var    JDatabaseDriver
-	 * @since  1.7.0
+	 * @since  1.6
 	 */
 	protected $_db;
 
@@ -64,7 +68,7 @@ class JAdapter extends JObject
 	 * @param   string  $classprefix    Class prefix of adapters
 	 * @param   string  $adapterfolder  Name of folder to append to base path
 	 *
-	 * @since   1.7.0
+	 * @since   1.6
 	 */
 	public function __construct($basepath, $classprefix = null, $adapterfolder = null)
 	{
@@ -72,7 +76,7 @@ public function __construct($basepath, $classprefix = null, $adapterfolder = nul
 		$this->_classprefix = $classprefix ? $classprefix : 'J';
 		$this->_adapterfolder = $adapterfolder ? $adapterfolder : 'adapters';
 
-		$this->_db = JFactory::getDbo();
+		$this->_db = Factory::getDbo();
 	}
 
 	/**
@@ -80,7 +84,7 @@ public function __construct($basepath, $classprefix = null, $adapterfolder = nul
 	 *
 	 * @return  \Joomla\Database\DatabaseDriver  Database connector object
 	 *
-	 * @since   1.7.0
+	 * @since   1.6
 	 */
 	public function getDbo()
 	{
@@ -93,9 +97,9 @@ public function getDbo()
 	 * @param   string  $name     Name of adapter to return
 	 * @param   array   $options  Adapter options
 	 *
-	 * @return  object  Adapter of type 'name' or false
+	 * @return  JAdapterInstance|boolean  Adapter of type 'name' or false
 	 *
-	 * @since   1.7.0
+	 * @since   1.6
 	 */
 	public function getAdapter($name, $options = array())
 	{
@@ -121,7 +125,7 @@ public function getAdapter($name, $options = array())
 	 *
 	 * @return  boolean  True if successful
 	 *
-	 * @since   1.7.0
+	 * @since   1.6
 	 */
 	public function setAdapter($name, &$adapter = null, $options = array())
 	{
@@ -168,9 +172,9 @@ public function setAdapter($name, &$adapter = null, $options = array())
 		}
 
 		// Check for a possible service from the container otherwise manually instantiate the class
-		if (JFactory::getContainer()->exists($class))
+		if (Factory::getContainer()->has($class))
 		{
-			$this->_adapters[$name] = JFactory::getContainer()->get($class);
+			$this->_adapters[$name] = Factory::getContainer()->get($class);
 		}
 		else
 		{
@@ -187,7 +191,7 @@ public function setAdapter($name, &$adapter = null, $options = array())
 	 *
 	 * @return  void
 	 *
-	 * @since   1.7.0
+	 * @since   1.6
 	 */
 	public function loadAllAdapters($options = array())
 	{
diff --git a/libraries/joomla/base/adapterinstance.php b/libraries/joomla/base/adapterinstance.php
index 0fb62b8b041e2..d80a5363ada64 100644
--- a/libraries/joomla/base/adapterinstance.php
+++ b/libraries/joomla/base/adapterinstance.php
@@ -3,16 +3,19 @@
  * @package     Joomla.Platform
  * @subpackage  Base
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Factory;
+
 /**
  * Adapter Instance Class
  *
- * @since  1.7.0
+ * @since       1.6
+ * @deprecated  5.0 Will be removed without replacement
  */
 class JAdapterInstance extends JObject
 {
@@ -20,7 +23,7 @@ class JAdapterInstance extends JObject
 	 * Parent
 	 *
 	 * @var    JAdapter
-	 * @since  1.7.0
+	 * @since  1.6
 	 */
 	protected $parent = null;
 
@@ -28,7 +31,7 @@ class JAdapterInstance extends JObject
 	 * Database
 	 *
 	 * @var    JDatabaseDriver
-	 * @since  1.7.0
+	 * @since  1.6
 	 */
 	protected $db = null;
 
@@ -39,7 +42,7 @@ class JAdapterInstance extends JObject
 	 * @param   JDatabaseDriver  $db       Database object
 	 * @param   array            $options  Configuration Options
 	 *
-	 * @since   1.7.0
+	 * @since   1.6
 	 */
 	public function __construct(JAdapter $parent, JDatabaseDriver $db, array $options = array())
 	{
@@ -50,15 +53,15 @@ public function __construct(JAdapter $parent, JDatabaseDriver $db, array $option
 		$this->parent = $parent;
 
 		// Pull in the global dbo in case something happened to it.
-		$this->db = $db ?: JFactory::getDbo();
+		$this->db = $db ?: Factory::getDbo();
 	}
 
 	/**
 	 * Retrieves the parent object
 	 *
-	 * @return  JAdapter parent
+	 * @return  JAdapter
 	 *
-	 * @since   1.7.0
+	 * @since   1.6
 	 */
 	public function getParent()
 	{
diff --git a/libraries/joomla/controller/base.php b/libraries/joomla/controller/base.php
index 496fc86982b9e..3eee2ad6508be 100644
--- a/libraries/joomla/controller/base.php
+++ b/libraries/joomla/controller/base.php
@@ -3,20 +3,22 @@
  * @package     Joomla.Platform
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\Application\AbstractApplication;
+use Joomla\CMS\Factory;
 use Joomla\Controller\AbstractController;
 use Joomla\Input\Input;
 
 /**
  * Joomla Platform Base Controller Class
  *
- * @since  3.0.0
+ * @since       3.0.0
+ * @deprecated  5.0 Use the default MVC library
  */
 abstract class JControllerBase extends AbstractController implements JController
 {
@@ -58,7 +60,7 @@ public function __construct(Input $input = null, AbstractApplication $app = null
 	 */
 	protected function loadApplication()
 	{
-		$this->setApplication(JFactory::getApplication());
+		$this->setApplication(Factory::getApplication());
 	}
 
 	/**
diff --git a/libraries/joomla/controller/controller.php b/libraries/joomla/controller/controller.php
index 93e1e0400b48f..f2f57bd64fc06 100644
--- a/libraries/joomla/controller/controller.php
+++ b/libraries/joomla/controller/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/model/base.php b/libraries/joomla/model/base.php
index 113f101bc246c..fe9b709f6501c 100644
--- a/libraries/joomla/model/base.php
+++ b/libraries/joomla/model/base.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -14,7 +14,8 @@
 /**
  * Joomla Platform Base Model Class
  *
- * @since  3.0.0
+ * @since       3.0.0
+ * @deprecated  5.0 Use the default MVC library
  */
 abstract class JModelBase implements JModel
 {
diff --git a/libraries/joomla/model/database.php b/libraries/joomla/model/database.php
index b6a6f6f8785e1..55808b83d20ad 100644
--- a/libraries/joomla/model/database.php
+++ b/libraries/joomla/model/database.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -15,7 +15,8 @@
 /**
  * Joomla Platform Database Model Class
  *
- * @since  3.0.0
+ * @since       3.0.0
+ * @deprecated  5.0 Use the default MVC library
  */
 abstract class JModelDatabase extends JModelBase
 {
diff --git a/libraries/joomla/model/model.php b/libraries/joomla/model/model.php
index a25035759b2fb..1f6e4d9928cb8 100644
--- a/libraries/joomla/model/model.php
+++ b/libraries/joomla/model/model.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -14,7 +14,8 @@
 /**
  * Joomla Platform Model Interface
  *
- * @since  3.0.0
+ * @since       3.0.0
+ * @deprecated  5.0 Use the default MVC library
  */
 interface JModel
 {
diff --git a/libraries/joomla/view/base.php b/libraries/joomla/view/base.php
index 49d7db95a58e4..146b906b25c55 100644
--- a/libraries/joomla/view/base.php
+++ b/libraries/joomla/view/base.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -12,7 +12,8 @@
 /**
  * Joomla Platform Base View Class
  *
- * @since  3.0.0
+ * @since       3.0.0
+ * @deprecated  5.0 Use the default MVC library
  */
 abstract class JViewBase implements JView
 {
diff --git a/libraries/joomla/view/genericdataexception.php b/libraries/joomla/view/genericdataexception.php
index aec6946a0679e..da5572608a9bd 100644
--- a/libraries/joomla/view/genericdataexception.php
+++ b/libraries/joomla/view/genericdataexception.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/view/html.php b/libraries/joomla/view/html.php
index 1ef8d971a5208..e6df6f5ae9015 100644
--- a/libraries/joomla/view/html.php
+++ b/libraries/joomla/view/html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -12,7 +12,8 @@
 /**
  * Joomla Platform HTML View Class
  *
- * @since  3.0.0
+ * @since       3.0.0
+ * @deprecated  5.0 Use the default MVC library
  */
 abstract class JViewHtml extends JViewBase
 {
@@ -67,6 +68,8 @@ public function __toString()
 	 *
 	 * @return  string  The escaped output.
 	 *
+	 * @note the ENT_COMPAT flag will be replaced by ENT_QUOTES in Joomla 4.0 to also escape single quotes
+	 *
 	 * @see     JView::escape()
 	 * @since   3.0.0
 	 */
diff --git a/libraries/joomla/view/view.php b/libraries/joomla/view/view.php
index 8ee4975f71fe3..f6ebce2f00926 100644
--- a/libraries/joomla/view/view.php
+++ b/libraries/joomla/view/view.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -12,7 +12,8 @@
 /**
  * Joomla Platform View Interface
  *
- * @since  3.0.0
+ * @since       3.0.0
+ * @deprecated  5.0  Implement Joomla\CMS\MVC\View\ViewInterface instead
  */
 interface JView
 {
diff --git a/libraries/loader.php b/libraries/loader.php
index 1b84c784a1378..99c222462826b 100644
--- a/libraries/loader.php
+++ b/libraries/loader.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Platform
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/namespacemap.php b/libraries/namespacemap.php
index 1281881c794cc..9adb7b063d00f 100644
--- a/libraries/namespacemap.php
+++ b/libraries/namespacemap.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Libraries
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -63,6 +63,7 @@ public function ensureMapFileExists()
 	public function create()
 	{
 		$extensions = $this->getNamespaces('administrator/components');
+		$extensions = array_merge($extensions, $this->getNamespaces('api/components'));
 		$extensions = array_merge($extensions, $this->getNamespaces('modules'));
 		$extensions = array_merge($extensions, $this->getNamespaces('administrator/modules'));
 
@@ -160,17 +161,29 @@ private function getNamespaces(string $dir): array
 			// Compile the extension path
 			$extensionPath = JPATH_ROOT . '/' . $dir . '/' . $extension . '/';
 
-			// The extension name
-			$name = str_replace('com_', '', $extension);
+			// Strip the com_ from the extension name for components
+			$name = str_replace('com_', '', $extension, $count);
+			$file = $extensionPath . $name . '.xml';
 
-			// If there is no manifest file, ignore
-			if (!file_exists($extensionPath . $name . '.xml'))
+			// If there is no manifest file, ignore. If it was a component check if the xml was named with the com_
+			// prefix.
+			if (!file_exists($file))
 			{
-				continue;
+				if (!$count)
+				{
+					continue;
+				}
+
+				$file = $extensionPath . $extension . '.xml';
+
+				if (!file_exists($file))
+				{
+					continue;
+				}
 			}
 
 			// Load the manifest file
-			$xml = simplexml_load_file($extensionPath . $name . '.xml');
+			$xml = simplexml_load_file($file);
 
 			// When invalid, ignore
 			if (!$xml)
@@ -200,6 +213,13 @@ private function getNamespaces(string $dir): array
 			if (strpos($extension, 'com_') === 0)
 			{
 				$extensions[$namespace . 'Site\\\\'] = str_replace('administrator/', '', $namespacePath) . $namespaceNode->attributes()->path;
+
+				$apiPath = str_replace('administrator/', 'api/', $namespacePath);
+
+				if (is_dir(JPATH_ROOT . $apiPath))
+				{
+					$extensions[$namespace . 'Api\\\\'] = str_replace('administrator/', 'api/', $namespacePath) . $namespaceNode->attributes()->path;
+				}
 			}
 
 			// Add the application specific segment when not a plugin
diff --git a/libraries/src/Access/Access.php b/libraries/src/Access/Access.php
index e69145f6151ef..3b1ea0138129b 100644
--- a/libraries/src/Access/Access.php
+++ b/libraries/src/Access/Access.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,8 +12,11 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Helper\UserGroupsHelper;
 use Joomla\CMS\Log\Log;
+use Joomla\CMS\Profiler\Profiler;
 use Joomla\CMS\Table\Asset;
+use Joomla\CMS\User\User;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -281,7 +284,7 @@ protected static function preloadPermissions($assetType, $reload = false)
 			return;
 		}
 
-		!JDEBUG ?: \JProfiler::getInstance('Application')->mark('Before Access::preloadPermissions (' . $extensionName . ')');
+		!JDEBUG ?: Profiler::getInstance('Application')->mark('Before Access::preloadPermissions (' . $extensionName . ')');
 
 		// Get the database connection object.
 		$db         = Factory::getDbo();
@@ -308,7 +311,7 @@ protected static function preloadPermissions($assetType, $reload = false)
 		self::$preloadedAssetTypes[$assetType]     = true;
 		self::$preloadedAssetTypes[$extensionName] = true;
 
-		!JDEBUG ?: \JProfiler::getInstance('Application')->mark('After Access::preloadPermissions (' . $extensionName . ')');
+		!JDEBUG ?: Profiler::getInstance('Application')->mark('After Access::preloadPermissions (' . $extensionName . ')');
 	}
 
 	/**
@@ -330,7 +333,7 @@ protected static function preloadComponents()
 			return array();
 		}
 
-		!JDEBUG ?: \JProfiler::getInstance('Application')->mark('Before Access::preloadComponents (all components)');
+		!JDEBUG ?: Profiler::getInstance('Application')->mark('Before Access::preloadComponents (all components)');
 
 		// Add root to asset names list.
 		$components = array('root.1');
@@ -387,7 +390,7 @@ protected static function preloadComponents()
 		// Mark all components asset type as preloaded.
 		self::$preloadedAssetTypes['components'] = true;
 
-		!JDEBUG ?: \JProfiler::getInstance('Application')->mark('After Access::preloadComponents (all components)');
+		!JDEBUG ?: Profiler::getInstance('Application')->mark('After Access::preloadComponents (all components)');
 
 		return $components;
 	}
@@ -426,7 +429,7 @@ public static function checkGroup($groupId, $action, $assetKey = null, $preload
 	protected static function getGroupPath($groupId)
 	{
 		// Load all the groups to improve performance on intensive groups checks
-		$groups = \JHelperUsergroups::getInstance()->getAll();
+		$groups = UserGroupsHelper::getInstance()->getAll();
 
 		if (!isset($groups[$groupId]))
 		{
@@ -502,7 +505,7 @@ public static function getAssetRules($assetKey, $recursive = false, $recursivePa
 		// Almost all calls can take advantage of preloading.
 		if ($assetId && isset(self::$preloadedAssets[$assetId]))
 		{
-			!JDEBUG ?: \JProfiler::getInstance('Application')->mark('Before Access::getAssetRules (id:' . $assetId . ' name:' . $assetName . ')');
+			!JDEBUG ?: Profiler::getInstance('Application')->mark('Before Access::getAssetRules (id:' . $assetId . ' name:' . $assetName . ')');
 
 			// Collects permissions for each asset
 			$collected = array();
@@ -564,7 +567,7 @@ public static function getAssetRules($assetKey, $recursive = false, $recursivePa
 				self::$assetRules[$assetId] = self::$assetRulesIdentities[$hash];
 			}
 
-			!JDEBUG ?: \JProfiler::getInstance('Application')->mark('After Access::getAssetRules (id:' . $assetId . ' name:' . $assetName . ')');
+			!JDEBUG ?: Profiler::getInstance('Application')->mark('After Access::getAssetRules (id:' . $assetId . ' name:' . $assetName . ')');
 
 			return self::$assetRulesIdentities[$hash];
 		}
@@ -572,7 +575,7 @@ public static function getAssetRules($assetKey, $recursive = false, $recursivePa
 		// Non preloading code. Use old slower method, slower. Only used in rare cases (if any) or without preloading chosen.
 		Log::add('Asset ' . $assetKey . ' permissions fetch without preloading (slower method).', Log::INFO, 'assets');
 
-		!JDEBUG ?: \JProfiler::getInstance('Application')->mark('Before Access::getAssetRules (assetKey:' . $assetKey . ')');
+		!JDEBUG ?: Profiler::getInstance('Application')->mark('Before Access::getAssetRules (assetKey:' . $assetKey . ')');
 
 		// There's no need to process it with the recursive method for the Root Asset ID.
 		if ((int) $assetKey === 1)
@@ -636,7 +639,7 @@ public static function getAssetRules($assetKey, $recursive = false, $recursivePa
 		$rules = new Rules;
 		$rules->mergeCollection($collected);
 
-		!JDEBUG ?: \JProfiler::getInstance('Application')->mark('Before Access::getAssetRules <strong>Slower</strong> (assetKey:' . $assetKey . ')');
+		!JDEBUG ?: Profiler::getInstance('Application')->mark('Before Access::getAssetRules <strong>Slower</strong> (assetKey:' . $assetKey . ')');
 
 		return $rules;
 	}
@@ -991,7 +994,7 @@ public static function getAuthorisedViewLevels($userId)
 		$authorised = array(1);
 
 		// Check for the recovery mode setting and return early.
-		$user      = \JUser::getInstance($userId);
+		$user      = User::getInstance($userId);
 		$root_user = Factory::getApplication()->get('root_user');
 
 		if (($user->username && $user->username == $root_user) || (is_numeric($root_user) && $user->id > 0 && $user->id == $root_user))
diff --git a/libraries/src/Access/Exception/AuthenticationFailed.php b/libraries/src/Access/Exception/AuthenticationFailed.php
new file mode 100644
index 0000000000000..7d6fa9d5a4a15
--- /dev/null
+++ b/libraries/src/Access/Exception/AuthenticationFailed.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Access\Exception;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Exception class defining an authentication failed event
+ *
+ * @since  4.0.0
+ */
+class AuthenticationFailed extends \RuntimeException
+{
+}
diff --git a/libraries/src/Access/Exception/NotAllowed.php b/libraries/src/Access/Exception/NotAllowed.php
index 789f2e1c92ede..28e656ba6a700 100644
--- a/libraries/src/Access/Exception/NotAllowed.php
+++ b/libraries/src/Access/Exception/NotAllowed.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Access/Rule.php b/libraries/src/Access/Rule.php
index 55fdeadad7007..6a134a059aab5 100644
--- a/libraries/src/Access/Rule.php
+++ b/libraries/src/Access/Rule.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Access/Rules.php b/libraries/src/Access/Rules.php
index 20c048209447b..575563141dab1 100644
--- a/libraries/src/Access/Rules.php
+++ b/libraries/src/Access/Rules.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Application/AdministratorApplication.php b/libraries/src/Application/AdministratorApplication.php
index 0e6dfcfc3bdc4..f2d4eeaf5d119 100644
--- a/libraries/src/Application/AdministratorApplication.php
+++ b/libraries/src/Application/AdministratorApplication.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Application/ApiApplication.php b/libraries/src/Application/ApiApplication.php
new file mode 100644
index 0000000000000..24240c7d1ed94
--- /dev/null
+++ b/libraries/src/Application/ApiApplication.php
@@ -0,0 +1,338 @@
+<?php
+/**
+ * @package    Joomla.API
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\CMS\Application;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Application\Web\WebClient;
+use Joomla\CMS\Access\Exception\AuthenticationFailed;
+use Joomla\CMS\Router\Exception\RouteNotFoundException;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\Input\Json as JInputJson;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Router\ApiRouter;
+use Joomla\DI\Container;
+use Joomla\Registry\Registry;
+use Negotiation\Accept;
+use Negotiation\Exception\InvalidArgument;
+use Negotiation\Negotiator;
+
+/**
+ * Joomla! API Application class
+ *
+ * @since  4.0.0
+ */
+final class ApiApplication extends CMSApplication
+{
+	/**
+	 * Maps extension types to their
+	 *
+	 * @var    array
+	 * @since  4.0.0
+	 */
+	protected $formatMapper = array();
+
+	/**
+	 * The authentication plugin type
+	 *
+	 * @type   string
+	 * @since  4.0.0
+	 */
+	protected $authenticationPluginType = 'api-authentication';
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   JInputJson  $input      An optional argument to provide dependency injection for the application's input
+	 *                                  object.  If the argument is a JInput object that object will become the
+	 *                                  application's input object, otherwise a default input object is created.
+	 * @param   Registry    $config     An optional argument to provide dependency injection for the application's config
+	 *                                  object.  If the argument is a Registry object that object will become the
+	 *                                  application's config object, otherwise a default config object is created.
+	 * @param   WebClient   $client     An optional argument to provide dependency injection for the application's client
+	 *                                  object.  If the argument is a WebClient object that object will become the
+	 *                                  application's client object, otherwise a default client object is created.
+	 * @param   Container   $container  Dependency injection container.
+	 *
+	 * @since   4.0.0
+	 */
+	public function __construct(JInputJson $input = null, Registry $config = null, WebClient $client = null, Container $container = null)
+	{
+		// Register the application name
+		$this->name = 'api';
+
+		// Register the client ID
+		$this->clientId = 3;
+
+		// Execute the parent constructor
+		parent::__construct($input, $config, $client, $container);
+
+		$this->addFormatMap('application/json', 'json');
+		$this->addFormatMap('application/vnd.api+json', 'jsonapi');
+
+		// Set the root in the URI based on the application name
+		\JUri::root(null, str_ireplace('/' . $this->getName(), '', \JUri::base(true)));
+	}
+
+
+	/**
+	 * Method to run the application routines.
+	 *
+	 * Most likely you will want to instantiate a controller and execute it, or perform some sort of task directly.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	protected function doExecute()
+	{
+		// Initialise the application
+		$this->initialiseApp();
+
+		// Mark afterInitialise in the profiler.
+		JDEBUG ? $this->profiler->mark('afterInitialise') : null;
+
+		// Route the application
+		$this->route();
+
+		// Mark afterApiRoute in the profiler.
+		JDEBUG ? $this->profiler->mark('afterApiRoute') : null;
+
+		// Dispatch the application
+		$this->dispatch();
+
+		// Mark afterDispatch in the profiler.
+		JDEBUG ? $this->profiler->mark('afterDispatch') : null;
+	}
+
+	/**
+	 * Adds a mapping from a content type to the format stored. Note the format type cannot be overwritten.
+	 *
+	 * @param   string  $contentHeader  The content header
+	 * @param   string  $format         The content type format
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function addFormatMap($contentHeader, $format)
+	{
+		if (!array_key_exists($contentHeader, $this->formatMapper))
+		{
+			$this->formatMapper[$contentHeader] = $format;
+		}
+	}
+
+	/**
+	 * Rendering is the process of pushing the document buffers into the template
+	 * placeholders, retrieving data from the document and pushing it into
+	 * the application response buffer.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 *
+	 * @note    Rendering should be overridden to get rid of the theme files.
+	 */
+	protected function render()
+	{
+		// Render the document
+		$this->setBody($this->document->render($this->allowCache()));
+	}
+
+	/**
+	 * Method to send the application response to the client.  All headers will be sent prior to the main application output data.
+	 *
+	 * @param   array  $options  An optional argument to enable CORS. (Temporary)
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	protected function respond($options = array())
+	{
+		// Set the Joomla! API signature
+		$this->setHeader('X-Powered-By', 'JoomlaAPI/1.0', true);
+
+		if (array_key_exists('cors', $options))
+		{
+			// Enable CORS (Cross-origin resource sharing)
+			$this->setHeader('Access-Control-Allow-Origin', '*', true);
+			$this->setHeader('Access-Control-Allow-Headers', 'Authorization');
+		}
+
+		// Parent function can be overridden later on for debugging.
+		parent::respond();
+
+	}
+
+	/**
+	 * Gets the name of the current template.
+	 *
+	 * @param   boolean  $params  True to return the template parameters
+	 *
+	 * @return  string
+	 *
+	 * @since   4.0.0
+	 */
+	public function getTemplate($params = false)
+	{
+		// The API application should not need to use a template
+		return 'system';
+	}
+
+	/**
+	 * Route the application.
+	 *
+	 * Routing is the process of examining the request environment to determine which
+	 * component should receive the request. The component optional parameters
+	 * are then set in the request object to be processed when the application is being
+	 * dispatched.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	protected function route()
+	{
+		$router = $this->getApiRouter();
+
+		// Trigger the onBeforeApiRoute event.
+		PluginHelper::importPlugin('webservices');
+		$this->triggerEvent('onBeforeApiRoute', array(&$router, $this));
+		$caught404 = false;
+
+		try
+		{
+			$route = $router->parseApiRoute($this->input->getMethod());
+		}
+		catch (RouteNotFoundException $e)
+		{
+			$caught404 = true;
+		}
+
+		/**
+		 * Now we have an API perform content negotiation to ensure we have a valid header. Assume if the route doesn't
+		 * tell us otherwise it uses the plain JSON API
+		 */
+		$priorities = array('application/vnd.api+json');
+
+		if (!$caught404 && array_key_exists('format', $route['vars']))
+		{
+			$priorities = $route['vars']['format'];
+		}
+
+		$negotiator = new Negotiator;
+
+		try
+		{
+			$mediaType = $negotiator->getBest($this->input->server->getString('HTTP_ACCEPT'), $priorities);
+		}
+		catch (InvalidArgument $e)
+		{
+			$mediaType = null;
+		}
+
+		// If we can't find a match bail with a 406 - Not Acceptable
+		if ($mediaType === null)
+		{
+			throw new Exception\NotAcceptable('Could not match accept header', 406);
+		}
+
+		/** @var $mediaType Accept */
+		$format = $mediaType->getValue();
+
+		if (array_key_exists($mediaType->getValue(), $this->formatMapper))
+		{
+			$format = $this->formatMapper[$mediaType->getValue()];
+		}
+
+		$this->input->set('format', $format);
+
+		if ($caught404)
+		{
+			throw $e;
+		}
+
+		$this->input->set('option', $route['vars']['component']);
+		$this->input->set('controller', $route['controller']);
+		$this->input->set('task', $route['task']);
+
+		foreach ($route['vars'] as $key => $value)
+		{
+			if ($key !== 'component')
+			{
+				if ($this->input->getMethod() === 'POST')
+				{
+					$this->input->post->set($key, $value);
+				}
+				else
+				{
+					$this->input->set($key, $value);
+				}
+			}
+		}
+
+		$this->triggerEvent('onAfterApiRoute', array($this));
+
+		if (!isset($route['vars']['public']) || $route['vars']['public'] === false)
+		{
+			if (!$this->login(array('username' => ''), array('silent' => true, 'action' => 'core.login.api')))
+			{
+				throw new AuthenticationFailed;
+			}
+		}
+	}
+
+	/**
+	 * Returns the application Router object.
+	 *
+	 * @return  ApiRouter
+	 *
+	 * @since   4.0.0
+	 */
+	public function getApiRouter()
+	{
+		return $this->getContainer()->get('ApiRouter');
+	}
+
+	/**
+	 * Dispatch the application
+	 *
+	 * @param   string  $component  The component which is being rendered.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function dispatch($component = null)
+	{
+		// Get the component if not set.
+		if (!$component)
+		{
+			$component = $this->input->get('option', null);
+		}
+
+		// Load the document to the API
+		$this->loadDocument();
+
+		// Set up the params
+		$document = \JFactory::getDocument();
+
+		// Register the document object with \JFactory
+		\JFactory::$document = $document;
+
+		$contents = ComponentHelper::renderComponent($component);
+		$document->setBuffer($contents, 'component');
+
+		// Trigger the onAfterDispatch event.
+		PluginHelper::importPlugin('system');
+		$this->triggerEvent('onAfterDispatch');
+	}
+}
diff --git a/libraries/src/Application/ApplicationHelper.php b/libraries/src/Application/ApplicationHelper.php
index f212819485435..96837dbaca185 100644
--- a/libraries/src/Application/ApplicationHelper.php
+++ b/libraries/src/Application/ApplicationHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -144,6 +144,12 @@ public static function getClientInfo($id = null, $byName = false)
 			$obj->name = 'installation';
 			$obj->path = JPATH_INSTALLATION;
 			self::$_clients[2] = clone $obj;
+
+			// API Client
+			$obj->id = 3;
+			$obj->name = 'api';
+			$obj->path = JPATH_API;
+			self::$_clients[3] = clone $obj;
 		}
 
 		// If no client id has been passed return the whole array
diff --git a/libraries/src/Application/BaseApplication.php b/libraries/src/Application/BaseApplication.php
index 20cf66a366c39..38ec28db1cee3 100644
--- a/libraries/src/Application/BaseApplication.php
+++ b/libraries/src/Application/BaseApplication.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Application/CLI/CliInput.php b/libraries/src/Application/CLI/CliInput.php
index ef63abf4e7587..942e28c780592 100644
--- a/libraries/src/Application/CLI/CliInput.php
+++ b/libraries/src/Application/CLI/CliInput.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Application/CLI/CliOutput.php b/libraries/src/Application/CLI/CliOutput.php
index 5ec1a8f605484..80da0343bcb99 100644
--- a/libraries/src/Application/CLI/CliOutput.php
+++ b/libraries/src/Application/CLI/CliOutput.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Application/CLI/ColorStyle.php b/libraries/src/Application/CLI/ColorStyle.php
index d81e72bc7f567..cdb7d100940f5 100644
--- a/libraries/src/Application/CLI/ColorStyle.php
+++ b/libraries/src/Application/CLI/ColorStyle.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Application/CLI/Output/Processor/ColorProcessor.php b/libraries/src/Application/CLI/Output/Processor/ColorProcessor.php
index bbb6bb7651f41..eecb1c731276c 100644
--- a/libraries/src/Application/CLI/Output/Processor/ColorProcessor.php
+++ b/libraries/src/Application/CLI/Output/Processor/ColorProcessor.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Application/CLI/Output/Processor/ProcessorInterface.php b/libraries/src/Application/CLI/Output/Processor/ProcessorInterface.php
index 55b5e7c29ec2e..9093fc654e712 100644
--- a/libraries/src/Application/CLI/Output/Processor/ProcessorInterface.php
+++ b/libraries/src/Application/CLI/Output/Processor/ProcessorInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Application/CLI/Output/Stdout.php b/libraries/src/Application/CLI/Output/Stdout.php
index b56aee68a5177..3bd86d97f63c8 100644
--- a/libraries/src/Application/CLI/Output/Stdout.php
+++ b/libraries/src/Application/CLI/Output/Stdout.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Application/CLI/Output/Xml.php b/libraries/src/Application/CLI/Output/Xml.php
index d6b4543ed172d..40d1063065bc7 100644
--- a/libraries/src/Application/CLI/Output/Xml.php
+++ b/libraries/src/Application/CLI/Output/Xml.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php
index aee25a573a6fb..6ec12f6ef7bd0 100644
--- a/libraries/src/Application/CMSApplication.php
+++ b/libraries/src/Application/CMSApplication.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -34,6 +34,7 @@
 use Joomla\DI\ContainerAwareInterface;
 use Joomla\DI\ContainerAwareTrait;
 use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 
 /**
  * Joomla! CMS Application class
@@ -116,6 +117,14 @@ abstract class CMSApplication extends WebApplication implements ContainerAwareIn
 	 */
 	protected $pathway = null;
 
+	/**
+	 * The authentication plugin type
+	 *
+	 * @type   string
+	 * @since  4.0.0
+	 */
+	protected $authenticationPluginType = 'authentication';
+
 	/**
 	 * Class constructor.
 	 *
@@ -398,7 +407,7 @@ public static function getInstance($name = null, $prefix = '\JApplication', Cont
 				$container = Factory::getContainer();
 			}
 
-			if ($container->exists($classname))
+			if ($container->has($classname))
 			{
 				static::$instances[$name] = $container->get($classname);
 			}
@@ -534,6 +543,8 @@ public static function getRouter($name = null, array $options = array())
 			$name = $app->getName();
 		}
 
+		$options['mode'] = Factory::getConfig()->get('sef');
+
 		return Router::getInstance($name, $options);
 	}
 
@@ -739,7 +750,7 @@ protected function loadLibraryLanguage()
 	public function login($credentials, $options = array())
 	{
 		// Get the global Authentication object.
-		$authenticate = Authentication::getInstance();
+		$authenticate = Authentication::getInstance($this->authenticationPluginType);
 		$response = $authenticate->authenticate($credentials, $options);
 
 		// Import the user plugin group.
@@ -988,6 +999,42 @@ protected function route()
 		$router = static::getRouter();
 		$result = $router->parse($uri, true);
 
+		$active = $this->getMenu()->getActive();
+
+		if ($active !== null && $active->type === 'alias')
+		{
+			$item = $this->getMenu()->getItem($active->params->get('aliasoptions'));
+
+			if ($item !== null)
+			{
+				$oldUri = clone \JUri::getInstance();
+
+				if ($oldUri->getVar('Itemid') == $active->id)
+				{
+					$oldUri->setVar('Itemid', $item->id);
+				}
+
+				$base = \JUri::base(true);
+				$oldPath = StringHelper::strtolower(substr($oldUri->getPath(), strlen($base) + 1));
+				$activePathPrefix = StringHelper::strtolower($active->route);
+
+				$position = strpos($oldPath, $activePathPrefix);
+
+				if ($position !== false)
+				{
+					$oldUri->setPath($base . '/' . substr_replace($oldPath, $item->route, $position, strlen($activePathPrefix)));
+
+					$this->setHeader('Expires', 'Wed, 17 Aug 2005 00:00:00 GMT', true);
+					$this->setHeader('Last-Modified', gmdate('D, d M Y H:i:s') . ' GMT', true);
+					$this->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0', false);
+					$this->setHeader('Pragma', 'no-cache');
+					$this->sendHeaders();
+
+					$this->redirect((string) $oldUri, 301);
+				}
+			}
+		}
+
 		foreach ($result as $key => $value)
 		{
 			$this->input->def($key, $value);
diff --git a/libraries/src/Application/CMSApplicationInterface.php b/libraries/src/Application/CMSApplicationInterface.php
index c06250f363e96..e310b2193261c 100644
--- a/libraries/src/Application/CMSApplicationInterface.php
+++ b/libraries/src/Application/CMSApplicationInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Application/CliApplication.php b/libraries/src/Application/CliApplication.php
index 7cccbcce1e3e4..d0a2ae11f9ab8 100644
--- a/libraries/src/Application/CliApplication.php
+++ b/libraries/src/Application/CliApplication.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Application/ConsoleApplication.php b/libraries/src/Application/ConsoleApplication.php
index 66b626abd36d5..9e62faf3e499a 100644
--- a/libraries/src/Application/ConsoleApplication.php
+++ b/libraries/src/Application/ConsoleApplication.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -20,7 +20,6 @@
 use Joomla\Event\DispatcherAwareInterface;
 use Joomla\Event\DispatcherAwareTrait;
 use Joomla\Event\DispatcherInterface;
-use Joomla\Input\Cli;
 use Joomla\Registry\Registry;
 use Joomla\Session\SessionInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
@@ -53,23 +52,31 @@ class ConsoleApplication extends Application implements DispatcherAwareInterface
 	/**
 	 * Class constructor.
 	 *
-	 * @param   Cli                  $input       An optional argument to provide dependency injection for the application's
-	 *                                            input object.  If the argument is a JInputCli object that object will become
-	 *                                            the application's input object, otherwise a default input object is created.
-	 * @param   Registry             $config      An optional argument to provide dependency injection for the application's
-	 *                                            config object.  If the argument is a Registry object that object will become
-	 *                                            the application's config object, otherwise a default config object is created.
-	 * @param   DispatcherInterface  $dispatcher  An optional argument to provide dependency injection for the application's
-	 *                                            event dispatcher.  If the argument is a DispatcherInterface object that object will become
-	 *                                            the application's event dispatcher, if it is null then the default event dispatcher
-	 *                                            will be created based on the application's loadDispatcher() method.
+	 * @param   InputInterface       $input       An optional argument to provide dependency injection for the application's input object. If the
+	 *                                            argument is an InputInterface object that object will become the application's input object,
+	 *                                            otherwise a default input object is created.
+	 * @param   OutputInterface      $output      An optional argument to provide dependency injection for the application's output object. If the
+	 *                                            argument is an OutputInterface object that object will become the application's output object,
+	 *                                            otherwise a default output object is created.
+	 * @param   Registry             $config      An optional argument to provide dependency injection for the application's config object. If the
+	 *                                            argument is a Registry object that object will become the application's config object,
+	 *                                            otherwise a default config object is created.
+	 * @param   DispatcherInterface  $dispatcher  An optional argument to provide dependency injection for the application's event dispatcher. If the
+	 *                                            argument is a DispatcherInterface object that object will become the application's event dispatcher,
+	 *                                            if it is null then the default event dispatcher will be created based on the application's
+	 *                                            loadDispatcher() method.
 	 * @param   Container            $container   Dependency injection container.
 	 *
 	 * @since   4.0.0
 	 */
-	public function __construct(Cli $input = null, Registry $config = null, DispatcherInterface $dispatcher = null, Container $container = null)
+	public function __construct(
+		InputInterface $input = null,
+		OutputInterface $output = null,
+		Registry $config = null,
+		DispatcherInterface $dispatcher = null,
+		Container $container = null)
 	{
-		parent::__construct($input, $config);
+		parent::__construct($input, $output, $config);
 
 		$this->setName('Joomla!');
 		$this->setVersion(JVERSION);
@@ -97,25 +104,26 @@ public function __construct(Cli $input = null, Registry $config = null, Dispatch
 	/**
 	 * Method to run the application routines.
 	 *
-	 * @return  void
+	 * @return  integer  The exit code for the application
 	 *
 	 * @since   4.0.0
+	 * @throws  \Throwable
 	 */
 	protected function doExecute()
 	{
-		parent::doExecute();
+		$exitCode = parent::doExecute();
 
 		$style = new SymfonyStyle($this->getConsoleInput(), $this->getConsoleOutput());
 
 		$methodMap = [
-			self::MSG_ALERT => 'error',
-			self::MSG_CRITICAL => 'caution',
-			self::MSG_DEBUG => 'comment',
+			self::MSG_ALERT     => 'error',
+			self::MSG_CRITICAL  => 'caution',
+			self::MSG_DEBUG     => 'comment',
 			self::MSG_EMERGENCY => 'caution',
-			self::MSG_ERROR => 'error',
-			self::MSG_INFO => 'note',
-			self::MSG_NOTICE => 'note',
-			self::MSG_WARNING => 'warning',
+			self::MSG_ERROR     => 'error',
+			self::MSG_INFO      => 'note',
+			self::MSG_NOTICE    => 'note',
+			self::MSG_WARNING   => 'warning',
 		];
 
 		// Output any enqueued messages before the app exits
@@ -125,6 +133,8 @@ protected function doExecute()
 
 			$style->$method($messages);
 		}
+
+		return $exitCode;
 	}
 
 	/**
@@ -208,29 +218,29 @@ public function getMessageQueue()
 	}
 
 	/**
-	 * Check the client interface by name.
-	 *
-	 * @param   string  $identifier  String identifier for the application interface
+	 * Method to get the application session object.
 	 *
-	 * @return  boolean  True if this application is of the given type client interface.
+	 * @return  SessionInterface  The session object
 	 *
 	 * @since   4.0.0
 	 */
-	public function isClient($identifier)
+	public function getSession()
 	{
-		return $identifier === 'cli';
+		return $this->session;
 	}
 
 	/**
-	 * Method to get the application session object.
+	 * Check the client interface by name.
 	 *
-	 * @return  SessionInterface  The session object
+	 * @param   string  $identifier  String identifier for the application interface
+	 *
+	 * @return  boolean  True if this application is of the given type client interface.
 	 *
 	 * @since   4.0.0
 	 */
-	public function getSession()
+	public function isClient($identifier)
 	{
-		return $this->session;
+		return $identifier === 'cli';
 	}
 
 	/**
diff --git a/libraries/src/Application/DaemonApplication.php b/libraries/src/Application/DaemonApplication.php
index 50be690270287..1ed311bf1a9d0 100644
--- a/libraries/src/Application/DaemonApplication.php
+++ b/libraries/src/Application/DaemonApplication.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Application/EventAware.php b/libraries/src/Application/EventAware.php
index 9849b0a7c28a2..dddd102e4f1d3 100644
--- a/libraries/src/Application/EventAware.php
+++ b/libraries/src/Application/EventAware.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Application/Exception/NotAcceptable.php b/libraries/src/Application/Exception/NotAcceptable.php
new file mode 100644
index 0000000000000..fdb13c14ea1f7
--- /dev/null
+++ b/libraries/src/Application/Exception/NotAcceptable.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Application\Exception;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Exception class defining a not acceptable class
+ *
+ * @since  4.0.0
+ */
+class NotAcceptable extends \RuntimeException
+{
+}
diff --git a/libraries/src/Application/ExtensionNamespaceMapper.php b/libraries/src/Application/ExtensionNamespaceMapper.php
index addc3aa67300a..72e3d57f22756 100644
--- a/libraries/src/Application/ExtensionNamespaceMapper.php
+++ b/libraries/src/Application/ExtensionNamespaceMapper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Application/IdentityAware.php b/libraries/src/Application/IdentityAware.php
index a05af95a5c5b3..7281b5833e348 100644
--- a/libraries/src/Application/IdentityAware.php
+++ b/libraries/src/Application/IdentityAware.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -11,6 +11,7 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryInterface;
 
 /**
  * Trait for application classes which are identity (user) aware
@@ -27,6 +28,14 @@ trait IdentityAware
 	 */
 	protected $identity;
 
+	/**
+	 * UserFactoryInterface
+	 *
+	 * @var    UserFactoryInterface
+	 * @since  4.0.0
+	 */
+	private $userFactory;
+
 	/**
 	 * Get the application identity.
 	 *
@@ -50,8 +59,22 @@ public function getIdentity()
 	 */
 	public function loadIdentity(User $identity = null)
 	{
-		$this->identity = $identity ?: User::getInstance();
+		$this->identity = $identity ?: $this->userFactory->loadUserById(0);
 
 		return $this;
 	}
+
+	/**
+	 * Set the user factory to use.
+	 *
+	 * @param   UserFactoryInterface  $userFactory  The user factory to use
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function setUserFactory(UserFactoryInterface $userFactory)
+	{
+		$this->userFactory = $userFactory;
+	}
 }
diff --git a/libraries/src/Application/SiteApplication.php b/libraries/src/Application/SiteApplication.php
index 705a38cb5d8e4..25cb4918a4ecc 100644
--- a/libraries/src/Application/SiteApplication.php
+++ b/libraries/src/Application/SiteApplication.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -396,14 +396,12 @@ public function getPathway($name = 'site', $options = array())
 	 * @param   string  $name     The name of the application.
 	 * @param   array   $options  An optional associative array of configuration settings.
 	 *
-	 * @return	Router
+	 * @return	\Joomla\CMS\Router\Router
 	 *
 	 * @since	3.2
 	 */
 	public static function getRouter($name = 'site', array $options = array())
 	{
-		$options['mode'] = Factory::getApplication()->get('sef');
-
 		return parent::getRouter($name, $options);
 	}
 
diff --git a/libraries/src/Application/WebApplication.php b/libraries/src/Application/WebApplication.php
index d6040c8fa113a..3d433e7d3763b 100644
--- a/libraries/src/Application/WebApplication.php
+++ b/libraries/src/Application/WebApplication.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Association/AssociationExtensionHelper.php b/libraries/src/Association/AssociationExtensionHelper.php
index af4c4ccea012c..95b706c25df56 100644
--- a/libraries/src/Association/AssociationExtensionHelper.php
+++ b/libraries/src/Association/AssociationExtensionHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Association/AssociationExtensionInterface.php b/libraries/src/Association/AssociationExtensionInterface.php
index 6a7df22306aa4..33802a0bbcc2b 100644
--- a/libraries/src/Association/AssociationExtensionInterface.php
+++ b/libraries/src/Association/AssociationExtensionInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Association/AssociationServiceInterface.php b/libraries/src/Association/AssociationServiceInterface.php
index c064f3beb941f..b6b2b863dedfd 100644
--- a/libraries/src/Association/AssociationServiceInterface.php
+++ b/libraries/src/Association/AssociationServiceInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Association/AssociationServiceTrait.php b/libraries/src/Association/AssociationServiceTrait.php
index d2bd282e1b82b..70e79ef5979cc 100644
--- a/libraries/src/Association/AssociationServiceTrait.php
+++ b/libraries/src/Association/AssociationServiceTrait.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Authentication/Authentication.php b/libraries/src/Authentication/Authentication.php
index e408cf6a8c60c..bbec0eeac05e2 100644
--- a/libraries/src/Authentication/Authentication.php
+++ b/libraries/src/Authentication/Authentication.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -23,7 +23,7 @@
  *
  * @since  1.7.0
  */
-class Authentication extends CMSObject
+class Authentication
 {
 	use DispatcherAwareTrait;
 
@@ -70,19 +70,28 @@ class Authentication extends CMSObject
 	const STATUS_UNKNOWN = 32;
 
 	/**
-	 * @var    Authentication  JAuthentication instances container.
+	 * @var    Authentication[]  JAuthentication instances container.
 	 * @since  1.7.3
 	 */
-	protected static $instance;
+	protected static $instance = [];
+
+	/**
+	 * Plugin Type to run
+	 *
+	 * @type   string
+	 * @since  4.0.0
+	 */
+	protected $pluginType;
 
 	/**
 	 * Constructor
 	 *
+	 * @param   string               $pluginType  The plugin type to run authorisation and authentication on
 	 * @param   DispatcherInterface  $dispatcher  The event dispatcher we're going to use
 	 *
 	 * @since   1.7.0
 	 */
-	public function __construct(DispatcherInterface $dispatcher = null)
+	public function __construct(string $pluginType = 'authentication', DispatcherInterface $dispatcher = null)
 	{
 		// Set the dispatcher
 		if (!is_object($dispatcher))
@@ -91,8 +100,9 @@ public function __construct(DispatcherInterface $dispatcher = null)
 		}
 
 		$this->setDispatcher($dispatcher);
+		$this->pluginType = $pluginType;
 
-		$isLoaded = PluginHelper::importPlugin('authentication');
+		$isLoaded = PluginHelper::importPlugin($this->pluginType);
 
 		if (!$isLoaded)
 		{
@@ -104,18 +114,20 @@ public function __construct(DispatcherInterface $dispatcher = null)
 	 * Returns the global authentication object, only creating it
 	 * if it doesn't already exist.
 	 *
+	 * @param   string  $pluginType  The plugin type to run authorisation and authentication on
+	 *
 	 * @return  Authentication  The global Authentication object
 	 *
 	 * @since   1.7.0
 	 */
-	public static function getInstance()
+	public static function getInstance(string $pluginType = 'authentication')
 	{
-		if (empty(self::$instance))
+		if (empty(self::$instance[$pluginType]))
 		{
-			self::$instance = new static;
+			self::$instance[$pluginType] = new static($pluginType);
 		}
 
-		return self::$instance;
+		return self::$instance[$pluginType];
 	}
 
 	/**
@@ -133,7 +145,7 @@ public static function getInstance()
 	public function authenticate($credentials, $options = array())
 	{
 		// Get plugins
-		$plugins = PluginHelper::getPlugin('authentication');
+		$plugins = PluginHelper::getPlugin($this->pluginType);
 
 		// Create authentication response
 		$response = new AuthenticationResponse;
@@ -150,7 +162,7 @@ public function authenticate($credentials, $options = array())
 		 */
 		foreach ($plugins as $plugin)
 		{
-			$className = 'plg' . $plugin->type . $plugin->name;
+			$className = 'plg' . str_replace('-', '', $plugin->type) . $plugin->name;
 
 			if (class_exists($className))
 			{
@@ -205,12 +217,12 @@ public function authenticate($credentials, $options = array())
 	 * @return  AuthenticationResponse[]  Array of authentication response objects
 	 *
 	 * @since  1.7.0
+	 * @throws \Exception
 	 */
-	public static function authorise($response, $options = array())
+	public function authorise($response, $options = array())
 	{
 		// Get plugins in case they haven't been imported already
 		PluginHelper::importPlugin('user');
-		PluginHelper::importPlugin('authentication');
 		$results = Factory::getApplication()->triggerEvent('onUserAuthorisation', array($response, $options));
 
 		return $results;
diff --git a/libraries/src/Authentication/AuthenticationResponse.php b/libraries/src/Authentication/AuthenticationResponse.php
index e4db414b7f326..8ef3a04ab9153 100644
--- a/libraries/src/Authentication/AuthenticationResponse.php
+++ b/libraries/src/Authentication/AuthenticationResponse.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Authentication/Password/Argon2iHandler.php b/libraries/src/Authentication/Password/Argon2iHandler.php
index 54dbfbf32a7ea..c27bced5d4ca6 100644
--- a/libraries/src/Authentication/Password/Argon2iHandler.php
+++ b/libraries/src/Authentication/Password/Argon2iHandler.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Authentication/Password/Argon2idHandler.php b/libraries/src/Authentication/Password/Argon2idHandler.php
index decf696def50a..f3fe2df21dfc6 100644
--- a/libraries/src/Authentication/Password/Argon2idHandler.php
+++ b/libraries/src/Authentication/Password/Argon2idHandler.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Authentication/Password/BCryptHandler.php b/libraries/src/Authentication/Password/BCryptHandler.php
index 04d96948d979d..eae75813aa9ef 100644
--- a/libraries/src/Authentication/Password/BCryptHandler.php
+++ b/libraries/src/Authentication/Password/BCryptHandler.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Authentication/Password/ChainedHandler.php b/libraries/src/Authentication/Password/ChainedHandler.php
index 75636443f2aa8..5b0f929aa3566 100644
--- a/libraries/src/Authentication/Password/ChainedHandler.php
+++ b/libraries/src/Authentication/Password/ChainedHandler.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Authentication/Password/CheckIfRehashNeededHandlerInterface.php b/libraries/src/Authentication/Password/CheckIfRehashNeededHandlerInterface.php
index 0256f10dc06c0..3e0219bd2ef14 100644
--- a/libraries/src/Authentication/Password/CheckIfRehashNeededHandlerInterface.php
+++ b/libraries/src/Authentication/Password/CheckIfRehashNeededHandlerInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Authentication/Password/MD5Handler.php b/libraries/src/Authentication/Password/MD5Handler.php
index 15c46186fa91a..b036f5c606b27 100644
--- a/libraries/src/Authentication/Password/MD5Handler.php
+++ b/libraries/src/Authentication/Password/MD5Handler.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Authentication/Password/PHPassHandler.php b/libraries/src/Authentication/Password/PHPassHandler.php
index 67076d5cf5b47..273cff54c8934 100644
--- a/libraries/src/Authentication/Password/PHPassHandler.php
+++ b/libraries/src/Authentication/Password/PHPassHandler.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Authentication/Password/SHA256Handler.php b/libraries/src/Authentication/Password/SHA256Handler.php
index eeeb246b87e37..af3704dc9575a 100644
--- a/libraries/src/Authentication/Password/SHA256Handler.php
+++ b/libraries/src/Authentication/Password/SHA256Handler.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Button/ActionButton.php b/libraries/src/Button/ActionButton.php
index 65d32eff95be5..6cd6f7c76e650 100644
--- a/libraries/src/Button/ActionButton.php
+++ b/libraries/src/Button/ActionButton.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Button/PublishedButton.php b/libraries/src/Button/PublishedButton.php
index 23ba2e3346b79..dcb3aac21ed35 100644
--- a/libraries/src/Button/PublishedButton.php
+++ b/libraries/src/Button/PublishedButton.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/Cache.php b/libraries/src/Cache/Cache.php
index c3a8cf05e0027..7d672fcb0422d 100644
--- a/libraries/src/Cache/Cache.php
+++ b/libraries/src/Cache/Cache.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/CacheController.php b/libraries/src/Cache/CacheController.php
index 21d8d144579f5..319e067bd59e7 100644
--- a/libraries/src/Cache/CacheController.php
+++ b/libraries/src/Cache/CacheController.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/CacheControllerFactory.php b/libraries/src/Cache/CacheControllerFactory.php
index 404bfc70eee8e..133c7013f37aa 100644
--- a/libraries/src/Cache/CacheControllerFactory.php
+++ b/libraries/src/Cache/CacheControllerFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/CacheControllerFactoryInterface.php b/libraries/src/Cache/CacheControllerFactoryInterface.php
index fd94230937a93..2118dcebf7196 100644
--- a/libraries/src/Cache/CacheControllerFactoryInterface.php
+++ b/libraries/src/Cache/CacheControllerFactoryInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/CacheStorage.php b/libraries/src/Cache/CacheStorage.php
index 8bf0e81fde151..94eb1d16ab88a 100644
--- a/libraries/src/Cache/CacheStorage.php
+++ b/libraries/src/Cache/CacheStorage.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/Controller/CallbackController.php b/libraries/src/Cache/Controller/CallbackController.php
index b842a2617503e..8574a03028354 100644
--- a/libraries/src/Cache/Controller/CallbackController.php
+++ b/libraries/src/Cache/Controller/CallbackController.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/Controller/OutputController.php b/libraries/src/Cache/Controller/OutputController.php
index ed0fa6c2fc168..2ac5067045a92 100644
--- a/libraries/src/Cache/Controller/OutputController.php
+++ b/libraries/src/Cache/Controller/OutputController.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/Controller/PageController.php b/libraries/src/Cache/Controller/PageController.php
index edee434e5e5eb..252a1af8a6ffe 100644
--- a/libraries/src/Cache/Controller/PageController.php
+++ b/libraries/src/Cache/Controller/PageController.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/Controller/ViewController.php b/libraries/src/Cache/Controller/ViewController.php
index d86893ae0cb1c..0bb45e8b22054 100644
--- a/libraries/src/Cache/Controller/ViewController.php
+++ b/libraries/src/Cache/Controller/ViewController.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/Exception/CacheConnectingException.php b/libraries/src/Cache/Exception/CacheConnectingException.php
index 9d0288cab3fb7..9acb2b0119f02 100644
--- a/libraries/src/Cache/Exception/CacheConnectingException.php
+++ b/libraries/src/Cache/Exception/CacheConnectingException.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/Exception/CacheExceptionInterface.php b/libraries/src/Cache/Exception/CacheExceptionInterface.php
index b396ddd304842..a4f944f95239a 100644
--- a/libraries/src/Cache/Exception/CacheExceptionInterface.php
+++ b/libraries/src/Cache/Exception/CacheExceptionInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/Exception/UnsupportedCacheException.php b/libraries/src/Cache/Exception/UnsupportedCacheException.php
index 5607bcd23f2c7..0430f2e21402d 100644
--- a/libraries/src/Cache/Exception/UnsupportedCacheException.php
+++ b/libraries/src/Cache/Exception/UnsupportedCacheException.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/Storage/ApcuStorage.php b/libraries/src/Cache/Storage/ApcuStorage.php
index 1b36852f5d5d7..a84b6ddafb8e4 100644
--- a/libraries/src/Cache/Storage/ApcuStorage.php
+++ b/libraries/src/Cache/Storage/ApcuStorage.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/Storage/CacheStorageHelper.php b/libraries/src/Cache/Storage/CacheStorageHelper.php
index 6f1b634c66c4c..762abb45cd51a 100644
--- a/libraries/src/Cache/Storage/CacheStorageHelper.php
+++ b/libraries/src/Cache/Storage/CacheStorageHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/Storage/FileStorage.php b/libraries/src/Cache/Storage/FileStorage.php
index 043f86c433d6a..2a17e21936611 100644
--- a/libraries/src/Cache/Storage/FileStorage.php
+++ b/libraries/src/Cache/Storage/FileStorage.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/Storage/MemcachedStorage.php b/libraries/src/Cache/Storage/MemcachedStorage.php
index d28d96c5d57ff..4150f750bc354 100644
--- a/libraries/src/Cache/Storage/MemcachedStorage.php
+++ b/libraries/src/Cache/Storage/MemcachedStorage.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/Storage/RedisStorage.php b/libraries/src/Cache/Storage/RedisStorage.php
index 5d9167bd88dbe..725c3dbc53361 100644
--- a/libraries/src/Cache/Storage/RedisStorage.php
+++ b/libraries/src/Cache/Storage/RedisStorage.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Cache/Storage/WincacheStorage.php b/libraries/src/Cache/Storage/WincacheStorage.php
index d2c3c66ed37f1..bdbc1a9bb5e49 100644
--- a/libraries/src/Cache/Storage/WincacheStorage.php
+++ b/libraries/src/Cache/Storage/WincacheStorage.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Captcha/Captcha.php b/libraries/src/Captcha/Captcha.php
index 4786edd48978c..3f514aea5620a 100644
--- a/libraries/src/Captcha/Captcha.php
+++ b/libraries/src/Captcha/Captcha.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -59,10 +59,11 @@ class Captcha implements DispatcherAwareInterface
 	/**
 	 * Class constructor.
 	 *
-	 * @param   string  $captcha  The editor to use.
+	 * @param   string  $captcha  The plugin to use.
 	 * @param   array   $options  Associative array of options.
 	 *
 	 * @since   2.5
+	 * @throws  \RuntimeException
 	 */
 	public function __construct($captcha, $options)
 	{
@@ -81,6 +82,7 @@ public function __construct($captcha, $options)
 	 * @return  Captcha|null  Instance of this class.
 	 *
 	 * @since   2.5
+	 * @throws  \RuntimeException
 	 */
 	public static function getInstance($captcha, array $options = array())
 	{
@@ -88,16 +90,7 @@ public static function getInstance($captcha, array $options = array())
 
 		if (empty(self::$_instances[$signature]))
 		{
-			try
-			{
-				self::$_instances[$signature] = new static($captcha, $options);
-			}
-			catch (\RuntimeException $e)
-			{
-				Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
-
-				return;
-			}
+			self::$_instances[$signature] = new Captcha($captcha, $options);
 		}
 
 		return self::$_instances[$signature];
@@ -111,6 +104,7 @@ public static function getInstance($captcha, array $options = array())
 	 * @return  boolean  True on success
 	 *
 	 * @since	2.5
+	 * @throws  \RuntimeException
 	 */
 	public function initialise($id)
 	{
@@ -119,16 +113,7 @@ public function initialise($id)
 			['id' => $id]
 		);
 
-		try
-		{
-			$this->getDispatcher()->dispatch('onInit', $event);
-		}
-		catch (\Exception $e)
-		{
-			Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
-
-			return false;
-		}
+		$this->getDispatcher()->dispatch('onInit', $event);
 
 		return true;
 	}
@@ -143,6 +128,7 @@ public function initialise($id)
 	 * @return  string  The return value of the function "onDisplay" of the selected Plugin.
 	 *
 	 * @since   2.5
+	 * @throws  \RuntimeException
 	 */
 	public function display($name, $id, $class = '')
 	{
@@ -163,7 +149,7 @@ public function display($name, $id, $class = '')
 			[
 				'name'  => $name,
 				'id'    => $id ?: $name,
-				'class' => $class ? 'class="' . $class . '"' : '',
+				'class' => $class,
 			]
 		);
 
@@ -178,9 +164,10 @@ public function display($name, $id, $class = '')
 	 *
 	 * @param   string  $code  The answer.
 	 *
-	 * @return  bool   The return value of the function "onCheckAnswer" of the selected Plugin.
+	 * @return  bool    Whether the provided answer was correct
 	 *
 	 * @since	2.5
+	 * @throws  \RuntimeException
 	 */
 	public function checkAnswer($code)
 	{
@@ -201,6 +188,36 @@ public function checkAnswer($code)
 		return $result['result'][0];
 	}
 
+	/**
+	 * Method to react on the setup of a captcha field. Gives the possibility
+	 * to change the field and/or the XML element for the field.
+	 *
+	 * @param   \Joomla\CMS\Form\Field\CaptchaField  $field    Captcha field instance
+	 * @param   \SimpleXMLElement                    $element  XML form definition
+	 *
+	 * @return void
+	 */
+	public function setupField(\Joomla\CMS\Form\Field\CaptchaField $field, \SimpleXMLElement $element)
+	{
+		if ($this->_captcha === null)
+		{
+			return;
+		}
+
+		$event = new Event(
+			'onSetupField',
+			[
+				'field' => $field,
+				'element' => $element,
+			]
+		);
+
+		$result = $this->getDispatcher()->dispatch('onCheckAnswer', $event);
+
+		// TODO REFACTOR ME! This is Ye Olde Way of returning plugin results
+		return $result['result'][0];
+	}
+
 	/**
 	 * Load the Captcha plugin.
 	 *
diff --git a/libraries/src/Captcha/Google/HttpBridgePostRequestMethod.php b/libraries/src/Captcha/Google/HttpBridgePostRequestMethod.php
index 00ab8995275fd..030086f7f6123 100644
--- a/libraries/src/Captcha/Google/HttpBridgePostRequestMethod.php
+++ b/libraries/src/Captcha/Google/HttpBridgePostRequestMethod.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -19,7 +19,7 @@
 /**
  * Bridges the Joomla! HTTP API to the Google Recaptcha RequestMethod interface for a POST request.
  *
- * @since  4.0.0
+ * @since  3.9.0
  */
 final class HttpBridgePostRequestMethod implements RequestMethod
 {
@@ -27,7 +27,7 @@ final class HttpBridgePostRequestMethod implements RequestMethod
 	 * URL to which requests are sent.
 	 *
 	 * @const  string
-	 * @since  4.0.0
+	 * @since  3.9.0
 	 */
 	const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify';
 
@@ -35,7 +35,7 @@ final class HttpBridgePostRequestMethod implements RequestMethod
 	 * The HTTP adapter
 	 *
 	 * @var    Http
-	 * @since  4.0.0
+	 * @since  3.9.0
 	 */
 	private $http;
 
@@ -44,7 +44,7 @@ final class HttpBridgePostRequestMethod implements RequestMethod
 	 *
 	 * @param   Http|null  $http  The HTTP adapter
 	 *
-	 * @since   4.0.0
+	 * @since   3.9.0
 	 */
 	public function __construct(Http $http = null)
 	{
@@ -58,7 +58,7 @@ public function __construct(Http $http = null)
 	 *
 	 * @return  string  Body of the reCAPTCHA response
 	 *
-	 * @since   4.0.0
+	 * @since   3.9.0
 	 */
 	public function submit(RequestParameters $params)
 	{
diff --git a/libraries/src/Categories/Categories.php b/libraries/src/Categories/Categories.php
index 322bf387b27d9..ed39b62c70854 100644
--- a/libraries/src/Categories/Categories.php
+++ b/libraries/src/Categories/Categories.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -194,6 +194,18 @@ public function get($id = 'root', $forceload = false)
 		return null;
 	}
 
+	/**
+	 * Returns the extension of the category.
+	 *
+	 * @return   string  The extension
+	 *
+	 * @since   3.9.0
+	 */
+	public function getExtension()
+	{
+		return $this->_extension;
+	}
+
 	/**
 	 * Load method
 	 *
diff --git a/libraries/src/Categories/CategoryFactory.php b/libraries/src/Categories/CategoryFactory.php
index b810021a01d11..93cd899ac00e9 100644
--- a/libraries/src/Categories/CategoryFactory.php
+++ b/libraries/src/Categories/CategoryFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Categories/CategoryFactoryInterface.php b/libraries/src/Categories/CategoryFactoryInterface.php
index d8f977fd11756..953f68aeec246 100644
--- a/libraries/src/Categories/CategoryFactoryInterface.php
+++ b/libraries/src/Categories/CategoryFactoryInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Categories/CategoryInterface.php b/libraries/src/Categories/CategoryInterface.php
index c77404e03ca3f..e431959082db0 100644
--- a/libraries/src/Categories/CategoryInterface.php
+++ b/libraries/src/Categories/CategoryInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Categories/CategoryNode.php b/libraries/src/Categories/CategoryNode.php
index 7d1c4d8c6d474..f0eb020e4bc23 100644
--- a/libraries/src/Categories/CategoryNode.php
+++ b/libraries/src/Categories/CategoryNode.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,6 +12,8 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Tree\NodeInterface;
+use Joomla\CMS\Tree\NodeTrait;
 use Joomla\Registry\Registry;
 
 /**
@@ -19,8 +21,10 @@
  *
  * @since  1.6
  */
-class CategoryNode extends CMSObject
+class CategoryNode extends CMSObject implements NodeInterface
 {
+	use NodeTrait;
+
 	/**
 	 * Primary key
 	 *
@@ -245,22 +249,6 @@ class CategoryNode extends CMSObject
 	 */
 	public $assets = null;
 
-	/**
-	 * Parent Category object
-	 *
-	 * @var    CategoryNode
-	 * @since  1.6
-	 */
-	protected $_parent = null;
-
-	/**
-	 * Array of Children
-	 *
-	 * @var    CategoryNode[]
-	 * @since  1.6
-	 */
-	protected $_children = array();
-
 	/**
 	 * Path from root to this category
 	 *
@@ -269,22 +257,6 @@ class CategoryNode extends CMSObject
 	 */
 	protected $_path = array();
 
-	/**
-	 * Category left of this one
-	 *
-	 * @var    CategoryNode
-	 * @since  1.6
-	 */
-	protected $_leftSibling = null;
-
-	/**
-	 * Category right of this one
-	 *
-	 * @var    CategoryNode
-	 * @since  1.6
-	 */
-	protected $_rightSibling = null;
-
 	/**
 	 * Flag if all children have been loaded
 	 *
@@ -296,7 +268,7 @@ class CategoryNode extends CMSObject
 	/**
 	 * Constructor of this tree
 	 *
-	 * @var    CategoryNode
+	 * @var    Categories
 	 * @since  1.6
 	 */
 	protected $_constructor = null;
@@ -304,8 +276,8 @@ class CategoryNode extends CMSObject
 	/**
 	 * Class constructor
 	 *
-	 * @param   array         $category     The category data.
-	 * @param   CategoryNode  $constructor  The tree constructor.
+	 * @param   array       $category     The category data.
+	 * @param   Categories  $constructor  The tree constructor.
 	 *
 	 * @since   1.6
 	 */
@@ -337,74 +309,31 @@ public function __construct($category = null, $constructor = null)
 	 *
 	 * @since   1.6
 	 */
-	public function setParent($parent)
+	public function setParent(NodeInterface $parent)
 	{
-		if ($parent instanceof CategoryNode || is_null($parent))
+		if (!is_null($this->_parent))
 		{
-			if (!is_null($this->_parent))
-			{
-				$key = array_search($this, $this->_parent->_children);
-				unset($this->_parent->_children[$key]);
-			}
-
-			if (!is_null($parent))
-			{
-				$parent->_children[] = & $this;
-			}
-
-			$this->_parent = $parent;
+			$key = array_search($this, $this->_parent->_children);
+			unset($this->_parent->_children[$key]);
+		}
 
-			if ($this->id != 'root')
-			{
-				if ($this->parent_id != 1)
-				{
-					$this->_path = $parent->getPath();
-				}
+		$this->_parent = $parent;
 
-				$this->_path[$this->id] = $this->id . ':' . $this->alias;
-			}
+		$this->_parent->_children[] = & $this;
 
-			if (count($parent->_children) > 1)
-			{
-				end($parent->_children);
-				$this->_leftSibling = prev($parent->_children);
-				$this->_leftSibling->_rightsibling = & $this;
-			}
+		if (count($this->_parent->_children) > 1)
+		{
+			end($this->_parent->_children);
+			$this->_leftSibling = prev($this->_parent->_children);
+			$this->_leftSibling->_rightsibling = & $this;
 		}
-	}
 
-	/**
-	 * Add child to this node
-	 *
-	 * If the child already has a parent, the link is unset
-	 *
-	 * @param   CategoryNode  $child  The child to be added.
-	 *
-	 * @return  void
-	 *
-	 * @since   1.6
-	 */
-	public function addChild($child)
-	{
-		if ($child instanceof CategoryNode)
+		if ($this->parent_id != 1)
 		{
-			$child->setParent($this);
+			$this->_path = $parent->getPath();
 		}
-	}
 
-	/**
-	 * Remove a specific child
-	 *
-	 * @param   integer  $id  ID of a category
-	 *
-	 * @return  void
-	 *
-	 * @since   1.6
-	 */
-	public function removeChild($id)
-	{
-		$key = array_search($this, $this->_parent->_children);
-		unset($this->_parent->_children[$key]);
+		$this->_path[$this->id] = $this->id . ':' . $this->alias;
 	}
 
 	/**
@@ -447,64 +376,6 @@ public function &getChildren($recursive = false)
 		return $this->_children;
 	}
 
-	/**
-	 * Get the parent of this node
-	 *
-	 * @return  CategoryNode
-	 *
-	 * @since   1.6
-	 */
-	public function getParent()
-	{
-		return $this->_parent;
-	}
-
-	/**
-	 * Test if this node has children
-	 *
-	 * @return  boolean  True if there is a child
-	 *
-	 * @since   1.6
-	 */
-	public function hasChildren()
-	{
-		return count($this->_children);
-	}
-
-	/**
-	 * Test if this node has a parent
-	 *
-	 * @return  boolean  True if there is a parent
-	 *
-	 * @since   1.6
-	 */
-	public function hasParent()
-	{
-		return $this->getParent() != null;
-	}
-
-	/**
-	 * Function to set the left or right sibling of a category
-	 *
-	 * @param   CategoryNode  $sibling  CategoryNode object for the sibling
-	 * @param   boolean       $right    If set to false, the sibling is the left one
-	 *
-	 * @return  void
-	 *
-	 * @since   1.6
-	 */
-	public function setSibling($sibling, $right = true)
-	{
-		if ($right)
-		{
-			$this->_rightSibling = $sibling;
-		}
-		else
-		{
-			$this->_leftSibling = $sibling;
-		}
-	}
-
 	/**
 	 * Returns the right or left sibling of a category
 	 *
diff --git a/libraries/src/Categories/CategoryServiceInterface.php b/libraries/src/Categories/CategoryServiceInterface.php
index 61f8813bb0a4d..6f5a126b26a6d 100644
--- a/libraries/src/Categories/CategoryServiceInterface.php
+++ b/libraries/src/Categories/CategoryServiceInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Categories/CategoryServiceTrait.php b/libraries/src/Categories/CategoryServiceTrait.php
index d13690fe99091..0a15839f9cea4 100644
--- a/libraries/src/Categories/CategoryServiceTrait.php
+++ b/libraries/src/Categories/CategoryServiceTrait.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Categories/SectionNotFoundException.php b/libraries/src/Categories/SectionNotFoundException.php
index e206e1fd88a23..6e1b483cb10d5 100644
--- a/libraries/src/Categories/SectionNotFoundException.php
+++ b/libraries/src/Categories/SectionNotFoundException.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Changelog/Changelog.php b/libraries/src/Changelog/Changelog.php
new file mode 100644
index 0000000000000..bcea38e6a613c
--- /dev/null
+++ b/libraries/src/Changelog/Changelog.php
@@ -0,0 +1,395 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Changelog;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Filter\InputFilter;
+use Joomla\CMS\Http\HttpFactory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Version;
+use Joomla\Registry\Registry;
+use RuntimeException;
+
+/**
+ * Changelog class.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class Changelog extends CMSObject
+{
+	/**
+	 * Update manifest `<element>` element
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $element;
+
+	/**
+	 * Update manifest `<type>` element
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $type;
+
+	/**
+	 * Update manifest `<version>` element
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $version;
+
+	/**
+	 * Update manifest `<security>` element
+	 *
+	 * @var    array
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $security = array();
+
+	/**
+	 * Update manifest `<fix>` element
+	 *
+	 * @var    array
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $fix = array();
+
+	/**
+	 * Update manifest `<language>` element
+	 *
+	 * @var    array
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $language = array();
+
+	/**
+	 * Update manifest `<addition>` element
+	 *
+	 * @var    array
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $addition = array();
+
+	/**
+	 * Update manifest `<change>` elements
+	 *
+	 * @var    array
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $change = array();
+
+	/**
+	 * Update manifest `<remove>` element
+	 *
+	 * @var    array
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $remove = array();
+
+	/**
+	 * Update manifest `<maintainer>` element
+	 *
+	 * @var    array
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $note = array();
+
+	/**
+	 * List of node items
+	 *
+	 * @var    array
+	 * @since  __DEPLOY_VERSION__
+	 */
+	private $items = array();
+
+	/**
+	 * Resource handle for the XML Parser
+	 *
+	 * @var    resource
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $xmlParser;
+
+	/**
+	 * Element call stack
+	 *
+	 * @var    array
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $stack = array('base');
+
+	/**
+	 * Object containing the current update data
+	 *
+	 * @var    \stdClass
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $currentChangelog;
+
+	/**
+	 * The version to match the changelog
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	private $matchVersion = '';
+
+	/**
+	 * Object containing the latest changelog data
+	 *
+	 * @var    \stdClass
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $latest;
+
+	/**
+	 * Gets the reference to the current direct parent
+	 *
+	 * @return  object
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function getStackLocation()
+	{
+		return implode('->', $this->stack);
+	}
+
+	/**
+	 * Get the last position in stack count
+	 *
+	 * @return  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function getLastTag()
+	{
+		return $this->stack[count($this->stack) - 1];
+	}
+
+	/**
+	 * Set the version to match.
+	 *
+	 * @param   string  $version  The version to match
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION_
+	 */
+	public function setVersion(string $version)
+	{
+		$this->matchVersion = $version;
+	}
+
+	/**
+	 * XML Start Element callback
+	 *
+	 * @param   object  $parser  Parser object
+	 * @param   string  $name    Name of the tag found
+	 * @param   array   $attrs   Attributes of the tag
+	 *
+	 * @return  void
+	 *
+	 * @note    This is public because it is called externally
+	 * @since   1.7.0
+	 */
+	public function startElement($parser, $name, $attrs = array())
+	{
+		$this->stack[] = $name;
+		$tag           = $this->getStackLocation();
+
+		// Reset the data
+		if (isset($this->$tag))
+		{
+			$this->$tag->data = '';
+		}
+
+		switch ($name)
+		{
+			default:
+				$name = strtolower($name);
+
+				if (!isset($this->currentChangelog->$name))
+				{
+					$this->currentChangelog->$name = new \stdClass;
+				}
+
+				$this->currentChangelog->$name->data = '';
+
+				foreach ($attrs as $key => $data)
+				{
+					$key                                 = strtolower($key);
+					$this->currentChangelog->$name->$key = $data;
+				}
+				break;
+		}
+	}
+
+	/**
+	 * Callback for closing the element
+	 *
+	 * @param   object  $parser  Parser object
+	 * @param   string  $name    Name of element that was closed
+	 *
+	 * @return  void
+	 *
+	 * @note    This is public because it is called externally
+	 * @since   1.7.0
+	 */
+	public function endElement($parser, $name)
+	{
+		array_pop($this->stack);
+
+		switch ($name)
+		{
+			case 'SECURITY':
+			case 'FIX':
+			case 'LANGUAGE':
+			case 'ADDITION':
+			case 'CHANGE':
+			case 'REMOVE':
+			case 'NOTE':
+				$name = strtolower($name);
+				$this->currentChangelog->$name->data = $this->items;
+				$this->items = array();
+				break;
+			case 'CHANGELOG':
+				if (version_compare($this->currentChangelog->version->data, $this->matchVersion, '==') === true)
+				{
+					$this->latest = $this->currentChangelog;
+				}
+
+				// No version match, empty it
+				$this->currentChangelog = new \stdClass;
+				break;
+			case 'CHANGELOGS':
+				// If the latest item is set then we transfer it to where we want to
+				if (isset($this->latest))
+				{
+					foreach (get_object_vars($this->latest) as $key => $val)
+					{
+						$this->$key = $val;
+					}
+
+					unset($this->latest);
+					unset($this->currentChangelog);
+				}
+				elseif (isset($this->currentChangelog))
+				{
+					// The update might be for an older version of j!
+					unset($this->currentChangelog);
+				}
+				break;
+		}
+	}
+
+	/**
+	 * Character Parser Function
+	 *
+	 * @param   object  $parser  Parser object.
+	 * @param   object  $data    The data.
+	 *
+	 * @return  void
+	 *
+	 * @note    This is public because its called externally.
+	 * @since   1.7.0
+	 */
+	public function characterData($parser, $data)
+	{
+		$tag = $this->getLastTag();
+
+		switch ($tag)
+		{
+			case 'ITEM':
+				$this->items[] = $data;
+				break;
+			case 'SECURITY':
+			case 'FIX':
+			case 'LANGUAGE':
+			case 'ADDITION':
+			case 'CHANGE':
+			case 'REMOVE':
+			case 'NOTE':
+				break;
+			default:
+				// Throw the data for this item together
+				$tag = strtolower($tag);
+
+				if (isset($this->currentChangelog->$tag))
+				{
+					$this->currentChangelog->$tag->data .= $data;
+				}
+				break;
+		}
+	}
+
+	/**
+	 * Loads an XML file from a URL.
+	 *
+	 * @param   string  $url  The URL.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function loadFromXml($url)
+	{
+		$version    = new Version;
+		$httpOption = new Registry;
+		$httpOption->set('userAgent', $version->getUserAgent('Joomla', true, false));
+
+		try
+		{
+			$http     = HttpFactory::getHttp($httpOption);
+			$response = $http->get($url);
+		}
+		catch (RuntimeException $e)
+		{
+			$response = null;
+		}
+
+		if ($response === null || $response->code !== 200)
+		{
+			// TODO: Add a 'mark bad' setting here somehow
+			Log::add(Text::sprintf('JLIB_UPDATER_ERROR_EXTENSION_OPEN_URL', $url), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		$this->currentChangelog = new \stdClass;
+
+		$this->xmlParser = xml_parser_create('');
+		xml_set_object($this->xmlParser, $this);
+		xml_set_element_handler($this->xmlParser, 'startElement', 'endElement');
+		xml_set_character_data_handler($this->xmlParser, 'characterData');
+
+		if (!xml_parse($this->xmlParser, $response->body))
+		{
+			Log::add(
+				sprintf(
+					'XML error: %s at line %d', xml_error_string(xml_get_error_code($this->xmlParser)),
+					xml_get_current_line_number($this->xmlParser)
+				),
+				Log::WARNING, 'updater'
+			);
+
+			return false;
+		}
+
+		xml_parser_free($this->xmlParser);
+
+		return true;
+	}
+}
diff --git a/libraries/src/Client/ClientHelper.php b/libraries/src/Client/ClientHelper.php
index 882e45aec4c5e..a6b839f786fdd 100644
--- a/libraries/src/Client/ClientHelper.php
+++ b/libraries/src/Client/ClientHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Client/FtpClient.php b/libraries/src/Client/FtpClient.php
index 2559d4e1ed72f..43dc0184f75c8 100644
--- a/libraries/src/Client/FtpClient.php
+++ b/libraries/src/Client/FtpClient.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -28,75 +28,105 @@
 
 if (!defined('CRLF'))
 {
+	/**
+	 * Constant defining a line break
+	 *
+	 * @var    string
+	 * @since  1.5
+	 */
 	define('CRLF', "\r\n");
 }
 
 if (!defined('FTP_AUTOASCII'))
 {
+	/**
+	 * Constant defining whether the FTP connection type will automatically determine ASCII support based on a file extension
+	 *
+	 * @var    integer
+	 * @since  1.5
+	 */
 	define('FTP_AUTOASCII', -1);
 }
 
 if (!defined('FTP_BINARY'))
 {
+	/**
+	 * Stub of the native FTP_BINARY constant if PHP is running without the ftp extension enabled
+	 *
+	 * @var    integer
+	 * @since  1.5
+	 */
 	define('FTP_BINARY', 1);
 }
 
 if (!defined('FTP_ASCII'))
 {
+	/**
+	 * Stub of the native FTP_ASCII constant if PHP is running without the ftp extension enabled
+	 *
+	 * @var    integer
+	 * @since  1.5
+	 */
 	define('FTP_ASCII', 0);
 }
 
 if (!defined('FTP_NATIVE'))
 {
-	define('FTP_NATIVE', (function_exists('ftp_connect')) ? 1 : 0);
+	/**
+	 * Constant defining whether native FTP support is available on the platform
+	 *
+	 * @var    integer
+	 * @since  1.5
+	 */
+	define('FTP_NATIVE', function_exists('ftp_connect') ? 1 : 0);
 }
 
 /**
  * FTP client class
  *
- * @since  3.0.0
+ * @since  1.5
  */
 class FtpClient
 {
 	/**
 	 * @var    resource  Socket resource
-	 * @since  3.0.0
+	 * @since  1.5
 	 */
 	protected $_conn = null;
 
 	/**
 	 * @var    resource  Data port connection resource
-	 * @since  3.0.0
+	 * @since  1.5
 	 */
 	protected $_dataconn = null;
 
 	/**
 	 * @var    array  Passive connection information
-	 * @since  3.0.0
+	 * @since  1.5
 	 */
 	protected $_pasv = null;
 
 	/**
 	 * @var    string  Response Message
-	 * @since  3.0.0
+	 * @since  1.5
 	 */
 	protected $_response = null;
 
 	/**
 	 * @var    integer  Timeout limit
-	 * @since  3.0.0
+	 * @since  1.5
 	 */
 	protected $_timeout = 15;
 
 	/**
 	 * @var    integer  Transfer Type
-	 * @since  3.0.0
+	 * @since  1.5
 	 */
 	protected $_type = null;
 
 	/**
 	 * @var    array  Array to hold ascii format file extensions
-	 * @since  3.0.0
+	 * @since  1.5
 	 */
 	protected $_autoAscii = array(
 		'asp',
@@ -126,13 +156,13 @@ class FtpClient
 	 * Array to hold native line ending characters
 	 *
 	 * @var    array
-	 * @since  3.0.0
+	 * @since  1.5
 	 */
 	protected $_lineEndings = array('UNIX' => "\n", 'WIN' => "\r\n");
 
 	/**
 	 * @var    array  FtpClient instances container.
-	 * @since  3.0.0
+	 * @since  2.5
 	 */
 	protected static $instances = array();
 
@@ -141,7 +171,7 @@ class FtpClient
 	 *
 	 * @param   array  $options  Associative array of options to set
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function __construct(array $options = array())
 	{
@@ -164,7 +194,7 @@ public function __construct(array $options = array())
 	 *
 	 * Closes an existing connection, if we have one
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function __destruct()
 	{
@@ -191,7 +221,7 @@ public function __destruct()
 	 *
 	 * @return  FtpClient        The FTP Client object.
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public static function getInstance($host = '127.0.0.1', $port = '21', array $options = array(), $user = null, $pass = null)
 	{
@@ -228,7 +258,7 @@ public static function getInstance($host = '127.0.0.1', $port = '21', array $opt
 	 *
 	 * @return  boolean  True if successful
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function setOptions(array $options)
 	{
@@ -313,7 +343,7 @@ public function connect($host = '127.0.0.1', $port = 21)
 	 *
 	 * @return  boolean  True if connected
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function isConnected()
 	{
@@ -328,7 +358,7 @@ public function isConnected()
 	 *
 	 * @return  boolean  True if successful
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function login($user = 'anonymous', $pass = 'jftp@joomla.org')
 	{
@@ -375,7 +405,7 @@ public function login($user = 'anonymous', $pass = 'jftp@joomla.org')
 	 *
 	 * @return  boolean  True if successful
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function quit()
 	{
@@ -399,7 +429,7 @@ public function quit()
 	 *
 	 * @return  string   Current working directory
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function pwd()
 	{
@@ -438,7 +468,7 @@ public function pwd()
 	 *
 	 * @return  string   System identifier string
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function syst()
 	{
@@ -490,7 +520,7 @@ public function syst()
 	 *
 	 * @return  boolean True if successful
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function chdir($path)
 	{
@@ -525,7 +555,7 @@ public function chdir($path)
 	 *
 	 * @return  boolean  True if successful
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function reinit()
 	{
@@ -561,7 +591,7 @@ public function reinit()
 	 *
 	 * @return  boolean  True if successful
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function rename($from, $to)
 	{
@@ -605,7 +635,7 @@ public function rename($from, $to)
 	 *
 	 * @return  boolean  True if successful
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function chmod($path, $mode)
 	{
@@ -658,7 +688,7 @@ public function chmod($path, $mode)
 	 *
 	 * @return  boolean  True if successful
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function delete($path)
 	{
@@ -699,7 +729,7 @@ public function delete($path)
 	 *
 	 * @return  boolean  True if successful
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function mkdir($path)
 	{
@@ -734,7 +764,7 @@ public function mkdir($path)
 	 *
 	 * @return  boolean  True if successful
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function restart($point)
 	{
@@ -769,7 +799,7 @@ public function restart($point)
 	 *
 	 * @return  boolean  True if successful
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function create($path)
 	{
@@ -836,7 +866,7 @@ public function create($path)
 	 *
 	 * @return  boolean  True if successful
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function read($remote, &$buffer)
 	{
@@ -938,7 +968,7 @@ public function read($remote, &$buffer)
 	 *
 	 * @return  boolean  True if successful
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function get($local, $remote)
 	{
@@ -1023,7 +1053,7 @@ public function get($local, $remote)
 	 *
 	 * @return  boolean  True if successful
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function store($local, $remote = null)
 	{
@@ -1138,7 +1168,7 @@ public function store($local, $remote = null)
 	 *
 	 * @return  boolean  True if successful
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function write($remote, $buffer)
 	{
@@ -1368,7 +1398,7 @@ public function size($remote)
 	 *
 	 * @return  string  Directory listing
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function listNames($path = null)
 	{
@@ -1478,7 +1508,7 @@ public function listNames($path = null)
 	 *
 	 * @return  mixed  If $type is raw: string Directory listing, otherwise array of string with file-names
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	public function listDetails($path = null, $type = 'all')
 	{
@@ -1702,7 +1732,7 @@ public function listDetails($path = null, $type = 'all')
 	 *
 	 * @return  boolean  True if command executed successfully
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	protected function _putCmd($cmd, $expectedResponse)
 	{
@@ -1730,7 +1760,7 @@ protected function _putCmd($cmd, $expectedResponse)
 	 *
 	 * @return  boolean  True if response code from the server is expected
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	protected function _verifyResponse($expected)
 	{
@@ -1790,7 +1820,7 @@ protected function _verifyResponse($expected)
 	 *
 	 * @return  boolean  True if successful
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	protected function _passive()
 	{
@@ -1878,7 +1908,7 @@ protected function _passive()
 	 *
 	 * @return  integer Transfer-mode for this filetype [FTP_ASCII|FTP_BINARY]
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	protected function _findMode($fileName)
 	{
@@ -1916,7 +1946,7 @@ protected function _findMode($fileName)
 	 *
 	 * @return  boolean  True if successful
 	 *
-	 * @since   3.0.0
+	 * @since   1.5
 	 */
 	protected function _mode($mode)
 	{
diff --git a/libraries/src/Component/ComponentHelper.php b/libraries/src/Component/ComponentHelper.php
index 072ae9a872ccb..873e813801fcd 100644
--- a/libraries/src/Component/ComponentHelper.php
+++ b/libraries/src/Component/ComponentHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -303,12 +303,15 @@ public static function filterText($text)
 	public static function renderComponent($option, $params = array())
 	{
 		$app = Factory::getApplication();
-
-		// Load template language files.
-		$template = $app->getTemplate(true)->template;
 		$lang = Factory::getLanguage();
-		$lang->load('tpl_' . $template, JPATH_BASE, null, false, true)
+
+		if (!$app->isClient('api'))
+		{
+			// Load template language files.
+			$template = $app->getTemplate(true)->template;
+			$lang->load('tpl_' . $template, JPATH_BASE, null, false, true)
 			|| $lang->load('tpl_' . $template, JPATH_THEMES . "/$template", null, false, true);
+		}
 
 		if (empty($option))
 		{
@@ -353,7 +356,7 @@ public static function renderComponent($option, $params = array())
 			 * @var    string
 			 * @since  1.5
 			 * @deprecated 5.0 without replacement
-			*/
+			 */
 			define('JPATH_COMPONENT_SITE', JPATH_SITE . '/components/' . $option);
 		}
 
@@ -365,7 +368,7 @@ public static function renderComponent($option, $params = array())
 			 * @var    string
 			 * @since  1.5
 			 * @deprecated 5.0 without replacement
-			*/
+			 */
 			define('JPATH_COMPONENT_ADMINISTRATOR', JPATH_ADMINISTRATOR . '/components/' . $option);
 		}
 
@@ -405,7 +408,9 @@ protected static function load()
 			$query = $db->getQuery(true)
 				->select($db->quoteName(array('extension_id', 'element', 'params', 'enabled'), array('id', 'option', null, null)))
 				->from($db->quoteName('#__extensions'))
-				->where($db->quoteName('type') . ' = ' . $db->quote('component'));
+				->where($db->quoteName('type') . ' = ' . $db->quote('component'))
+				->where($db->quoteName('state') . ' = 0')
+				->where($db->quoteName('enabled') . ' = 1');
 			$db->setQuery($query);
 
 			return $db->loadObjectList('option', '\JComponentRecord');
diff --git a/libraries/src/Component/ComponentRecord.php b/libraries/src/Component/ComponentRecord.php
index 2796e3b20c9f0..5aa0caafbe4ea 100644
--- a/libraries/src/Component/ComponentRecord.php
+++ b/libraries/src/Component/ComponentRecord.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Component/Exception/MissingComponentException.php b/libraries/src/Component/Exception/MissingComponentException.php
index 3f0caac7b5ba3..f7e7e5db05aa4 100644
--- a/libraries/src/Component/Exception/MissingComponentException.php
+++ b/libraries/src/Component/Exception/MissingComponentException.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Component/Router/RouterBase.php b/libraries/src/Component/Router/RouterBase.php
index bb2f70922f9a5..0ed72c9ca4ae3 100644
--- a/libraries/src/Component/Router/RouterBase.php
+++ b/libraries/src/Component/Router/RouterBase.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Component/Router/RouterFactory.php b/libraries/src/Component/Router/RouterFactory.php
index cf4fb6bcc2350..faf59a4bcf93c 100644
--- a/libraries/src/Component/Router/RouterFactory.php
+++ b/libraries/src/Component/Router/RouterFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Component/Router/RouterFactoryInterface.php b/libraries/src/Component/Router/RouterFactoryInterface.php
index 8a7889ce69077..e01cf0ceb1f84 100644
--- a/libraries/src/Component/Router/RouterFactoryInterface.php
+++ b/libraries/src/Component/Router/RouterFactoryInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Component/Router/RouterInterface.php b/libraries/src/Component/Router/RouterInterface.php
index de1b4d6b2ae10..893de8e22e411 100644
--- a/libraries/src/Component/Router/RouterInterface.php
+++ b/libraries/src/Component/Router/RouterInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Component/Router/RouterLegacy.php b/libraries/src/Component/Router/RouterLegacy.php
index 6ad38bafd4c53..33e1225629d86 100644
--- a/libraries/src/Component/Router/RouterLegacy.php
+++ b/libraries/src/Component/Router/RouterLegacy.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Component/Router/RouterServiceInterface.php b/libraries/src/Component/Router/RouterServiceInterface.php
index 904ea8a29cbe5..d4469dbbfd406 100644
--- a/libraries/src/Component/Router/RouterServiceInterface.php
+++ b/libraries/src/Component/Router/RouterServiceInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Component/Router/RouterServiceTrait.php b/libraries/src/Component/Router/RouterServiceTrait.php
index 469ff211e3520..acb2f16585305 100644
--- a/libraries/src/Component/Router/RouterServiceTrait.php
+++ b/libraries/src/Component/Router/RouterServiceTrait.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Component/Router/RouterView.php b/libraries/src/Component/Router/RouterView.php
index 17835784e9190..808c9a4cfd15f 100644
--- a/libraries/src/Component/Router/RouterView.php
+++ b/libraries/src/Component/Router/RouterView.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Component/Router/RouterViewConfiguration.php b/libraries/src/Component/Router/RouterViewConfiguration.php
index e3a4128c79141..e2cacf1feca62 100644
--- a/libraries/src/Component/Router/RouterViewConfiguration.php
+++ b/libraries/src/Component/Router/RouterViewConfiguration.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Component/Router/Rules/MenuRules.php b/libraries/src/Component/Router/Rules/MenuRules.php
index bf8c056e5912a..f834abe1e36f2 100644
--- a/libraries/src/Component/Router/Rules/MenuRules.php
+++ b/libraries/src/Component/Router/Rules/MenuRules.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Component/Router/Rules/NomenuRules.php b/libraries/src/Component/Router/Rules/NomenuRules.php
index 5ddb16db03a61..0f76012a5cda6 100644
--- a/libraries/src/Component/Router/Rules/NomenuRules.php
+++ b/libraries/src/Component/Router/Rules/NomenuRules.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Component/Router/Rules/RulesInterface.php b/libraries/src/Component/Router/Rules/RulesInterface.php
index 57384d71d2f80..a520bd487d0de 100644
--- a/libraries/src/Component/Router/Rules/RulesInterface.php
+++ b/libraries/src/Component/Router/Rules/RulesInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Component/Router/Rules/StandardRules.php b/libraries/src/Component/Router/Rules/StandardRules.php
index 5298bec1dad81..a4043f6058ea4 100644
--- a/libraries/src/Component/Router/Rules/StandardRules.php
+++ b/libraries/src/Component/Router/Rules/StandardRules.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Console/CheckUpdatesCommand.php b/libraries/src/Console/CheckUpdatesCommand.php
index be99968c8fdaa..2e12c3b8d5b87 100644
--- a/libraries/src/Console/CheckUpdatesCommand.php
+++ b/libraries/src/Console/CheckUpdatesCommand.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,7 +12,9 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Updater\Updater;
-use Joomla\Console\AbstractCommand;
+use Joomla\Console\Command\AbstractCommand;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 /**
@@ -23,15 +25,26 @@
 class CheckUpdatesCommand extends AbstractCommand
 {
 	/**
-	 * Execute the command.
+	 * The default command name
 	 *
-	 * @return  integer  The exit code for the command.
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected static $defaultName = 'update:extensions:check';
+
+	/**
+	 * Internal function to execute the command.
+	 *
+	 * @param   InputInterface   $input   The input to inject into the command.
+	 * @param   OutputInterface  $output  The output to inject into the command.
+	 *
+	 * @return  integer  The command exit code
 	 *
 	 * @since   4.0.0
 	 */
-	public function execute(): int
+	protected function doExecute(InputInterface $input, OutputInterface $output): int
 	{
-		$symfonyStyle = new SymfonyStyle($this->getApplication()->getConsoleInput(), $this->getApplication()->getConsoleOutput());
+		$symfonyStyle = new SymfonyStyle($input, $output);
 
 		$symfonyStyle->title('Fetching Extension Updates');
 
@@ -49,15 +62,14 @@ public function execute(): int
 	}
 
 	/**
-	 * Initialise the command.
+	 * Configure the command.
 	 *
 	 * @return  void
 	 *
 	 * @since   4.0.0
 	 */
-	protected function initialise()
+	protected function configure()
 	{
-		$this->setName('update:extensions:check');
 		$this->setDescription('Checks for pending extension updates');
 		$this->setHelp(
 <<<EOF
diff --git a/libraries/src/Console/CleanCacheCommand.php b/libraries/src/Console/CleanCacheCommand.php
index 1dc18d224fa3a..950e23c1b5e3e 100644
--- a/libraries/src/Console/CleanCacheCommand.php
+++ b/libraries/src/Console/CleanCacheCommand.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,7 +11,9 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\Console\AbstractCommand;
+use Joomla\Console\Command\AbstractCommand;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 /**
@@ -22,15 +24,26 @@
 class CleanCacheCommand extends AbstractCommand
 {
 	/**
-	 * Execute the command.
+	 * The default command name
 	 *
-	 * @return  integer  The exit code for the command.
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected static $defaultName = 'cache:clean';
+
+	/**
+	 * Internal function to execute the command.
+	 *
+	 * @param   InputInterface   $input   The input to inject into the command.
+	 * @param   OutputInterface  $output  The output to inject into the command.
+	 *
+	 * @return  integer  The command exit code
 	 *
 	 * @since   4.0.0
 	 */
-	public function execute(): int
+	protected function doExecute(InputInterface $input, OutputInterface $output): int
 	{
-		$symfonyStyle = new SymfonyStyle($this->getApplication()->getConsoleInput(), $this->getApplication()->getConsoleOutput());
+		$symfonyStyle = new SymfonyStyle($input, $output);
 
 		$symfonyStyle->title('Cleaning System Cache');
 
@@ -42,15 +55,14 @@ public function execute(): int
 	}
 
 	/**
-	 * Initialise the command.
+	 * Configure the command.
 	 *
 	 * @return  void
 	 *
 	 * @since   4.0.0
 	 */
-	protected function initialise()
+	protected function configure()
 	{
-		$this->setName('cache:clean');
 		$this->setDescription('Cleans expired cache entries');
 		$this->setHelp(
 <<<EOF
diff --git a/libraries/src/Console/Loader/WritableContainerLoader.php b/libraries/src/Console/Loader/WritableContainerLoader.php
new file mode 100644
index 0000000000000..204be30ea2c07
--- /dev/null
+++ b/libraries/src/Console/Loader/WritableContainerLoader.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Console\Loader;
+
+use Joomla\Console\Command\AbstractCommand;
+use Psr\Container\ContainerInterface;
+use Symfony\Component\Console\Exception\CommandNotFoundException;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * PSR-11 compatible writable command loader.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+final class WritableContainerLoader implements WritableLoaderInterface
+{
+	/**
+	 * The service container.
+	 *
+	 * @var    ContainerInterface
+	 * @since  __DEPLOY_VERSION__
+	 */
+	private $container;
+
+	/**
+	 * The command name to service ID map.
+	 *
+	 * @var    string[]
+	 * @since  __DEPLOY_VERSION__
+	 */
+	private $commandMap;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   ContainerInterface  $container   A container from which to load command services.
+	 * @param   array               $commandMap  An array with command names as keys and service IDs as values.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function __construct(ContainerInterface $container, array $commandMap)
+	{
+		$this->container  = $container;
+		$this->commandMap = $commandMap;
+	}
+
+	/**
+	 * Adds a command to the loader.
+	 *
+	 * @param   string  $commandName  The name of the command to load.
+	 * @param   string  $className    The fully qualified class name of the command.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function add(string $commandName, string $className)
+	{
+		$this->commandMap[$commandName] = $className;
+	}
+
+	/**
+	 * Loads a command.
+	 *
+	 * @param   string  $name  The command to load.
+	 *
+	 * @return  AbstractCommand
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 * @throws  CommandNotFoundException
+	 */
+	public function get(string $name): AbstractCommand
+	{
+		if (!$this->has($name))
+		{
+			throw new CommandNotFoundException(sprintf('Command "%s" does not exist.', $name));
+		}
+
+		return $this->container->get($this->commandMap[$name]);
+	}
+
+	/**
+	 * Get the names of the registered commands.
+	 *
+	 * @return  string[]
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getNames(): array
+	{
+		return array_keys($this->commandMap);
+	}
+
+	/**
+	 * Checks if a command exists.
+	 *
+	 * @param   string  $name  The command to check.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function has($name): bool
+	{
+		return isset($this->commandMap[$name]) && $this->container->has($this->commandMap[$name]);
+	}
+}
diff --git a/libraries/src/Console/Loader/WritableLoaderInterface.php b/libraries/src/Console/Loader/WritableLoaderInterface.php
new file mode 100644
index 0000000000000..31b96a5725cb0
--- /dev/null
+++ b/libraries/src/Console/Loader/WritableLoaderInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Console\Loader;
+
+use Joomla\Console\Loader\LoaderInterface;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Interface defining a writable command loader.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+interface WritableLoaderInterface extends LoaderInterface
+{
+	/**
+	 * Adds a command to the loader.
+	 *
+	 * @param   string  $commandName  The name of the command to load.
+	 * @param   string  $className    The fully qualified class name of the command.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function add(string $commandName, string $className);
+}
diff --git a/libraries/src/Console/RemoveOldFilesCommand.php b/libraries/src/Console/RemoveOldFilesCommand.php
index 99df782b5a25a..b4cf60ec799dc 100644
--- a/libraries/src/Console/RemoveOldFilesCommand.php
+++ b/libraries/src/Console/RemoveOldFilesCommand.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,7 +10,9 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\Console\AbstractCommand;
+use Joomla\Console\Command\AbstractCommand;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 /**
@@ -21,15 +23,26 @@
 class RemoveOldFilesCommand extends AbstractCommand
 {
 	/**
-	 * Execute the command.
+	 * The default command name
 	 *
-	 * @return  integer  The exit code for the command.
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected static $defaultName = 'update:joomla:remove-old-files';
+
+	/**
+	 * Internal function to execute the command.
+	 *
+	 * @param   InputInterface   $input   The input to inject into the command.
+	 * @param   OutputInterface  $output  The output to inject into the command.
+	 *
+	 * @return  integer  The command exit code
 	 *
 	 * @since   4.0.0
 	 */
-	public function execute(): int
+	protected function doExecute(InputInterface $input, OutputInterface $output): int
 	{
-		$symfonyStyle = new SymfonyStyle($this->getApplication()->getConsoleInput(), $this->getApplication()->getConsoleOutput());
+		$symfonyStyle = new SymfonyStyle($input, $output);
 
 		$symfonyStyle->title('Removing Old Files');
 
@@ -44,15 +57,14 @@ public function execute(): int
 	}
 
 	/**
-	 * Initialise the command.
+	 * Configure the command.
 	 *
 	 * @return  void
 	 *
 	 * @since   4.0.0
 	 */
-	protected function initialise()
+	protected function configure()
 	{
-		$this->setName('update:joomla:remove-old-files');
 		$this->setDescription('Removes old system files');
 		$this->setHelp(
 <<<EOF
diff --git a/libraries/src/Console/SessionGcCommand.php b/libraries/src/Console/SessionGcCommand.php
index 82153cfe9b90f..20e7fdd55543a 100644
--- a/libraries/src/Console/SessionGcCommand.php
+++ b/libraries/src/Console/SessionGcCommand.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,11 +10,14 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\Console\AbstractCommand;
+use Joomla\Console\Command\AbstractCommand;
 use Joomla\DI\ContainerAwareInterface;
 use Joomla\DI\ContainerAwareTrait;
 use Joomla\Session\SessionInterface;
+use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 /**
  * Console command for performing session garbage collection
@@ -26,19 +29,30 @@ class SessionGcCommand extends AbstractCommand implements ContainerAwareInterfac
 	use ContainerAwareTrait;
 
 	/**
-	 * Execute the command.
+	 * The default command name
 	 *
-	 * @return  integer  The exit code for the command.
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected static $defaultName = 'session:gc';
+
+	/**
+	 * Internal function to execute the command.
+	 *
+	 * @param   InputInterface   $input   The input to inject into the command.
+	 * @param   OutputInterface  $output  The output to inject into the command.
+	 *
+	 * @return  integer  The command exit code
 	 *
 	 * @since   4.0.0
 	 */
-	public function execute(): int
+	protected function doExecute(InputInterface $input, OutputInterface $output): int
 	{
-		$symfonyStyle = $this->createSymfonyStyle();
+		$symfonyStyle = new SymfonyStyle($input, $output);
 
 		$symfonyStyle->title('Running Session Garbage Collection');
 
-		$session = $this->getSessionService($this->getApplication()->getConsoleInput()->getOption('application'));
+		$session = $this->getSessionService($input->getOption('application'));
 
 		$gcResult = $session->gc();
 
@@ -58,15 +72,14 @@ public function execute(): int
 	}
 
 	/**
-	 * Initialise the command.
+	 * Configure the command.
 	 *
 	 * @return  void
 	 *
 	 * @since   4.0.0
 	 */
-	protected function initialise()
+	protected function configure()
 	{
-		$this->setName('session:gc');
 		$this->setDescription('Performs session garbage collection');
 		$this->addOption('application', 'app', InputOption::VALUE_OPTIONAL, 'The application to perform garbage collection for.', 'site');
 		$this->setHelp(
diff --git a/libraries/src/Console/SessionMetadataGcCommand.php b/libraries/src/Console/SessionMetadataGcCommand.php
index daa8f7d54aa43..18d9809e11048 100644
--- a/libraries/src/Console/SessionMetadataGcCommand.php
+++ b/libraries/src/Console/SessionMetadataGcCommand.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,10 +10,12 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Session\MetadataManager;
-use Joomla\Console\AbstractCommand;
+use Joomla\Console\Command\AbstractCommand;
 use Joomla\Session\SessionInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 /**
  * Console command for performing session metadata garbage collection
@@ -22,6 +24,14 @@
  */
 class SessionMetadataGcCommand extends AbstractCommand
 {
+	/**
+	 * The default command name
+	 *
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected static $defaultName = 'session:metadata:gc';
+
 	/**
 	 * The session metadata manager.
 	 *
@@ -55,15 +65,18 @@ public function __construct(SessionInterface $session, MetadataManager $metadata
 	}
 
 	/**
-	 * Execute the command.
+	 * Internal function to execute the command.
+	 *
+	 * @param   InputInterface   $input   The input to inject into the command.
+	 * @param   OutputInterface  $output  The output to inject into the command.
 	 *
-	 * @return  integer  The exit code for the command.
+	 * @return  integer  The command exit code
 	 *
 	 * @since   4.0.0
 	 */
-	public function execute(): int
+	protected function doExecute(InputInterface $input, OutputInterface $output): int
 	{
-		$symfonyStyle = $this->createSymfonyStyle();
+		$symfonyStyle = new SymfonyStyle($input, $output);
 
 		$symfonyStyle->title('Running Session Metadata Garbage Collection');
 
@@ -77,15 +90,14 @@ public function execute(): int
 	}
 
 	/**
-	 * Initialise the command.
+	 * Configure the command.
 	 *
 	 * @return  void
 	 *
 	 * @since   4.0.0
 	 */
-	protected function initialise()
+	protected function configure()
 	{
-		$this->setName('session:metadata:gc');
 		$this->setDescription('Performs session metadata garbage collection');
 		$this->setHelp(
 <<<EOF
diff --git a/libraries/src/Crypt/Cipher/CryptoCipher.php b/libraries/src/Crypt/Cipher/CryptoCipher.php
index 47b6e543b3d40..5f038845af136 100644
--- a/libraries/src/Crypt/Cipher/CryptoCipher.php
+++ b/libraries/src/Crypt/Cipher/CryptoCipher.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Crypt/Cipher/SodiumCipher.php b/libraries/src/Crypt/Cipher/SodiumCipher.php
index 84ec41fd5c6cb..259d963319add 100644
--- a/libraries/src/Crypt/Cipher/SodiumCipher.php
+++ b/libraries/src/Crypt/Cipher/SodiumCipher.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Crypt/Crypt.php b/libraries/src/Crypt/Crypt.php
index 3637b68817813..7d02f4de0a80b 100644
--- a/libraries/src/Crypt/Crypt.php
+++ b/libraries/src/Crypt/Crypt.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Date/Date.php b/libraries/src/Date/Date.php
index d4594e1763a51..b15a4eb43eb91 100644
--- a/libraries/src/Date/Date.php
+++ b/libraries/src/Date/Date.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Dispatcher/AbstractModuleDispatcher.php b/libraries/src/Dispatcher/AbstractModuleDispatcher.php
index fa59269299437..3fe34ae086502 100644
--- a/libraries/src/Dispatcher/AbstractModuleDispatcher.php
+++ b/libraries/src/Dispatcher/AbstractModuleDispatcher.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Dispatcher/ApiDispatcher.php b/libraries/src/Dispatcher/ApiDispatcher.php
new file mode 100644
index 0000000000000..b4ba26a496e23
--- /dev/null
+++ b/libraries/src/Dispatcher/ApiDispatcher.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\CMS\Dispatcher;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Controller\ApiController;
+use Joomla\CMS\MVC\Factory\ApiMVCFactory;
+
+/**
+ * API Implementation for our dispatcher. It loads a component's administrator language files, and calls the API
+ * Controller so that components that haven't implemented web services can add their own handling.
+ *
+ * @since  4.0.0
+ */
+final class ApiDispatcher implements DispatcherInterface
+{
+	/**
+	 * The URL option for the component.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $option;
+
+	/**
+	 * The extension namespace
+	 *
+	 * @var    string
+	 *
+	 * @since  4.0.0
+	 */
+	protected $namespace;
+
+	/**
+	 * The CmsApplication instance
+	 *
+	 * @var    CMSApplication
+	 *
+	 * @since  4.0.0
+	 */
+	protected $app;
+
+	/**
+	 * The JApplication instance
+	 *
+	 * @var    \JInput
+	 *
+	 * @since  4.0.0
+	 */
+	protected $input;
+
+	/**
+	 * Constructor for Dispatcher
+	 *
+	 * @param   CMSApplication  $app    The JApplication for the dispatcher
+	 * @param   \JInput         $input  JInput
+	 *
+	 * @since   4.0.0
+	 */
+	public function __construct(CMSApplication $app, \JInput $input = null)
+	{
+		$this->app    = $app;
+		$this->input  = $input ?: $app->input;
+		$this->option = $this->input->get('option');
+
+		$db = Factory::getDbo();
+
+		$query = $db->getQuery(true);
+
+		$query->select($db->quoteName(array('namespace')))
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('namespace') . ' IS NOT NULL AND ' . $db->quoteName('namespace') . ' != ""')
+			->where($db->quoteName('element') . ' = ' . $db->quote($this->option));
+
+		$db->setQuery($query);
+
+		$this->namespace = $db->loadResult();
+
+		if ($this->namespace === null)
+		{
+			throw new \RuntimeException('Namespace can not be empty!');
+		}
+
+		$this->loadLanguage();
+	}
+
+	/**
+	 * Load the component's administrator language
+	 *
+	 * @since   4.0.0
+	 *
+	 * @return  void
+	 */
+	protected function loadLanguage()
+	{
+		// Load common and local language files.
+		$this->app->getLanguage()->load($this->option, JPATH_BASE, null, false, true) ||
+		$this->app->getLanguage()->load($this->option, JPATH_COMPONENT_ADMINISTRATOR, null, false, true);
+	}
+
+	/**
+	 * Dispatch a controller task. Redirecting the user if appropriate.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function dispatch()
+	{
+		$command = $this->input->getCmd('task', 'display');
+		$task    = $command;
+
+		// Check for a controller.task command.
+		if (strpos($command, '.') !== false)
+		{
+			// Explode the controller.task command.
+			list ($controllerName, $task) = explode('.', $command);
+
+			$this->input->set('controller', $controllerName);
+			$this->input->set('task', $task);
+		}
+
+		// Build controller config data
+		$config['option'] = $this->option;
+
+		// Set name of controller if it is passed in the request
+		if ($this->input->exists('controller'))
+		{
+			$config['name'] = strtolower($this->input->get('controller'));
+		}
+
+		// Execute the task for this component
+		$namespace = rtrim($this->namespace, '\\') . '\\';
+		$controller = new ApiController($config, new ApiMVCFactory($namespace), $this->app, $this->input);
+		$controller->execute($task);
+		$controller->redirect();
+	}
+}
diff --git a/libraries/src/Dispatcher/ComponentDispatcher.php b/libraries/src/Dispatcher/ComponentDispatcher.php
index 4b046bd1d89c8..50a0ea22dadcf 100644
--- a/libraries/src/Dispatcher/ComponentDispatcher.php
+++ b/libraries/src/Dispatcher/ComponentDispatcher.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Dispatcher/ComponentDispatcherFactory.php b/libraries/src/Dispatcher/ComponentDispatcherFactory.php
index 5bd9bc3f30514..70328c8e4e4b9 100644
--- a/libraries/src/Dispatcher/ComponentDispatcherFactory.php
+++ b/libraries/src/Dispatcher/ComponentDispatcherFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Dispatcher/ComponentDispatcherFactoryInterface.php b/libraries/src/Dispatcher/ComponentDispatcherFactoryInterface.php
index 646359de49b91..5957000f7f85b 100644
--- a/libraries/src/Dispatcher/ComponentDispatcherFactoryInterface.php
+++ b/libraries/src/Dispatcher/ComponentDispatcherFactoryInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Dispatcher/Dispatcher.php b/libraries/src/Dispatcher/Dispatcher.php
index c678c140719c8..0a6994c6cce75 100644
--- a/libraries/src/Dispatcher/Dispatcher.php
+++ b/libraries/src/Dispatcher/Dispatcher.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Dispatcher/DispatcherInterface.php b/libraries/src/Dispatcher/DispatcherInterface.php
index 9e86f3cb17b4d..7a767e7019bcf 100644
--- a/libraries/src/Dispatcher/DispatcherInterface.php
+++ b/libraries/src/Dispatcher/DispatcherInterface.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Dispatcher
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Dispatcher/LegacyComponentDispatcher.php b/libraries/src/Dispatcher/LegacyComponentDispatcher.php
index 323634f5a4683..f3362683c30f1 100644
--- a/libraries/src/Dispatcher/LegacyComponentDispatcher.php
+++ b/libraries/src/Dispatcher/LegacyComponentDispatcher.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Dispatcher/ModuleDispatcher.php b/libraries/src/Dispatcher/ModuleDispatcher.php
index da3eaaf1d585a..a44624a7458ed 100644
--- a/libraries/src/Dispatcher/ModuleDispatcher.php
+++ b/libraries/src/Dispatcher/ModuleDispatcher.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Dispatcher/ModuleDispatcherFactory.php b/libraries/src/Dispatcher/ModuleDispatcherFactory.php
index 1964de7c78c99..ae5851bd7673e 100644
--- a/libraries/src/Dispatcher/ModuleDispatcherFactory.php
+++ b/libraries/src/Dispatcher/ModuleDispatcherFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Dispatcher/ModuleDispatcherFactoryInterface.php b/libraries/src/Dispatcher/ModuleDispatcherFactoryInterface.php
index 0fb88723003d8..a02edfc34a97c 100644
--- a/libraries/src/Dispatcher/ModuleDispatcherFactoryInterface.php
+++ b/libraries/src/Dispatcher/ModuleDispatcherFactoryInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/Document.php b/libraries/src/Document/Document.php
index a46087c4e31b1..5afe52ebdb16b 100644
--- a/libraries/src/Document/Document.php
+++ b/libraries/src/Document/Document.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -575,7 +575,7 @@ public function addScriptOptions($key, $options, $merge = true)
 
 		if ($merge && is_array($options))
 		{
-			$this->scriptOptions[$key] = array_merge($this->scriptOptions[$key], $options);
+			$this->scriptOptions[$key] = array_replace_recursive($this->scriptOptions[$key], $options);
 		}
 		else
 		{
diff --git a/libraries/src/Document/DocumentRenderer.php b/libraries/src/Document/DocumentRenderer.php
index 4c4aa9291b66e..a419935bb0e55 100644
--- a/libraries/src/Document/DocumentRenderer.php
+++ b/libraries/src/Document/DocumentRenderer.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/ErrorDocument.php b/libraries/src/Document/ErrorDocument.php
index 89110b9a6eba1..4542f34a85bc4 100644
--- a/libraries/src/Document/ErrorDocument.php
+++ b/libraries/src/Document/ErrorDocument.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/Factory.php b/libraries/src/Document/Factory.php
index b086b3ecfa559..967309c3b9317 100644
--- a/libraries/src/Document/Factory.php
+++ b/libraries/src/Document/Factory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/FactoryInterface.php b/libraries/src/Document/FactoryInterface.php
index 8918718dee805..65fa1a161240e 100644
--- a/libraries/src/Document/FactoryInterface.php
+++ b/libraries/src/Document/FactoryInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/Feed/FeedEnclosure.php b/libraries/src/Document/Feed/FeedEnclosure.php
index afd3bcd2470e4..2b3eabfef36a8 100644
--- a/libraries/src/Document/Feed/FeedEnclosure.php
+++ b/libraries/src/Document/Feed/FeedEnclosure.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/Feed/FeedImage.php b/libraries/src/Document/Feed/FeedImage.php
index 2829b757e0ff7..8866f8058e84d 100644
--- a/libraries/src/Document/Feed/FeedImage.php
+++ b/libraries/src/Document/Feed/FeedImage.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/Feed/FeedItem.php b/libraries/src/Document/Feed/FeedItem.php
index 4a46c2b01a7c7..08f6afbfc200c 100644
--- a/libraries/src/Document/Feed/FeedItem.php
+++ b/libraries/src/Document/Feed/FeedItem.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/FeedDocument.php b/libraries/src/Document/FeedDocument.php
index 073b5a5d7e6fa..9d201318760e5 100644
--- a/libraries/src/Document/FeedDocument.php
+++ b/libraries/src/Document/FeedDocument.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/HtmlDocument.php b/libraries/src/Document/HtmlDocument.php
index 7b3a635750eed..a4ebcacd540e3 100644
--- a/libraries/src/Document/HtmlDocument.php
+++ b/libraries/src/Document/HtmlDocument.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/ImageDocument.php b/libraries/src/Document/ImageDocument.php
index 1c053e2b6a2ba..e51d5fa75a7bb 100644
--- a/libraries/src/Document/ImageDocument.php
+++ b/libraries/src/Document/ImageDocument.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/JsonDocument.php b/libraries/src/Document/JsonDocument.php
index afe547fceebd1..79cbe422e287d 100644
--- a/libraries/src/Document/JsonDocument.php
+++ b/libraries/src/Document/JsonDocument.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/JsonapiDocument.php b/libraries/src/Document/JsonapiDocument.php
new file mode 100644
index 0000000000000..8752b55c9c6aa
--- /dev/null
+++ b/libraries/src/Document/JsonapiDocument.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Document
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\CMS\Document;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Tobscure\JsonApi\Document;
+use Tobscure\JsonApi\ElementInterface;
+
+/**
+ * JsonapiDocument class, provides an easy interface to parse output in JSON-API format.
+ *
+ * @link   http://www.jsonapi.org/
+ * @since  __DEPLOY VERSION__
+ */
+class JsonapiDocument extends JsonDocument implements \JsonSerializable
+{
+	/**
+	 * The JsonApi Document object.
+	 *
+	 * @var    Document
+	 * @since  4.0.0
+	 */
+	protected $document;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $options  Associative array of options
+	 *
+	 * @since  4.0.0
+	 */
+	public function __construct($options = array())
+	{
+		parent::__construct($options);
+
+		// Set mime type to JSON-API
+		$this->_mime = 'application/vnd.api+json';
+		$this->_type = 'jsonapi';
+
+		if (array_key_exists('api_document', $options) && $options['api_document'] instanceof Document)
+		{
+			$this->document = $options['api_document'];
+		}
+		else
+		{
+			$this->document = new Document;
+		}
+	}
+
+	/**
+	 * Set the data object.
+	 *
+	 * @param   ElementInterface  $element  Element interface.
+	 *
+	 * @return  $this
+	 *
+	 * @since  4.0.0
+	 */
+	public function setData(ElementInterface $element)
+	{
+		$this->document->setData($element);
+
+		return $this;
+	}
+
+	/**
+	 * Set the errors array.
+	 *
+	 * @param   array  $errors  Error array.
+	 *
+	 * @return   $this
+	 *
+	 * @since  4.0.0
+	 */
+	public function setErrors($errors)
+	{
+		$this->document->setErrors($errors);
+
+		return $this;
+	}
+
+	/**
+	 * Set the JSON-API array.
+	 *
+	 * @param   array  $jsonapi  JSON-API array.
+	 *
+	 * @return   $this
+	 *
+	 * @since  4.0.0
+	 */
+	public function setJsonapi($jsonapi)
+	{
+		$this->setJsonapi($jsonapi);
+
+		return $this;
+	}
+
+	/**
+	 * Map everything to arrays.
+	 *
+	 * @return array
+	 *
+	 * @since  4.0.0
+	 */
+	public function toArray()
+	{
+		return $this->document->toArray();
+	}
+
+	/**
+	 * Map to string.
+	 *
+	 * @return string
+	 *
+	 * @since  4.0.0
+	 */
+	public function __toString()
+	{
+		return json_encode($this->toArray());
+	}
+
+	/**
+	 * Outputs the document.
+	 *
+	 * @param   boolean  $cache   If true, cache the output.
+	 * @param   array    $params  Associative array of attributes.
+	 *
+	 * @return  string  The rendered data.
+	 *
+	 * @since  4.0.0
+	 */
+	public function render($cache = false, $params = array())
+	{
+		$app = Factory::getApplication();
+
+		if ($mdate = $this->getModifiedDate())
+		{
+			$app->modifiedDate = $mdate;
+		}
+
+		$app->mimeType = $this->_mime;
+		$app->charSet  = $this->_charset;
+
+		return json_encode($this->document);
+	}
+
+	/**
+	 * Serialize for JSON usage.
+	 *
+	 * @return array
+	 *
+	 * @since  4.0.0
+	 */
+	public function jsonSerialize()
+	{
+		return $this->toArray();
+	}
+
+	/**
+	 * Add a link to the output.
+	 *
+	 * @param   string  $key    The name of the link
+	 * @param   string  $value  The link
+	 *
+	 * @return  $this
+	 *
+	 * @since  4.0.0
+	 */
+	public function addLink($key, $value)
+	{
+		$this->document->addLink($key, $value);
+
+		return $this;
+	}
+
+	/**
+	 * Add a link to the output.
+	 *
+	 * @param   string  $key    The name of the metadata key
+	 * @param   string  $value  The value
+	 *
+	 * @return  $this
+	 *
+	 * @since  4.0.0
+	 */
+	public function addMeta($key, $value)
+	{
+		$this->document->addMeta($key, $value);
+
+		return $this;
+	}
+}
diff --git a/libraries/src/Document/Opensearch/OpensearchImage.php b/libraries/src/Document/Opensearch/OpensearchImage.php
index b7277b728d818..84efd5e40af68 100644
--- a/libraries/src/Document/Opensearch/OpensearchImage.php
+++ b/libraries/src/Document/Opensearch/OpensearchImage.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/Opensearch/OpensearchUrl.php b/libraries/src/Document/Opensearch/OpensearchUrl.php
index bf1f9e1e975a3..2fb96dd7ff4e6 100644
--- a/libraries/src/Document/Opensearch/OpensearchUrl.php
+++ b/libraries/src/Document/Opensearch/OpensearchUrl.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/OpensearchDocument.php b/libraries/src/Document/OpensearchDocument.php
index 4170430ebf557..4de7a556a71e4 100644
--- a/libraries/src/Document/OpensearchDocument.php
+++ b/libraries/src/Document/OpensearchDocument.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/PreloadManager.php b/libraries/src/Document/PreloadManager.php
index 7e9d16ebb4f2f..e980ed0d416d9 100644
--- a/libraries/src/Document/PreloadManager.php
+++ b/libraries/src/Document/PreloadManager.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/PreloadManagerInterface.php b/libraries/src/Document/PreloadManagerInterface.php
index bfdeddfa12736..377e75ac1e65b 100644
--- a/libraries/src/Document/PreloadManagerInterface.php
+++ b/libraries/src/Document/PreloadManagerInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/RawDocument.php b/libraries/src/Document/RawDocument.php
index 4a72b25cd8f17..f869c2162da23 100644
--- a/libraries/src/Document/RawDocument.php
+++ b/libraries/src/Document/RawDocument.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/Renderer/Feed/AtomRenderer.php b/libraries/src/Document/Renderer/Feed/AtomRenderer.php
index 5067e0b50d622..b169d6a58c244 100644
--- a/libraries/src/Document/Renderer/Feed/AtomRenderer.php
+++ b/libraries/src/Document/Renderer/Feed/AtomRenderer.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/Renderer/Feed/RssRenderer.php b/libraries/src/Document/Renderer/Feed/RssRenderer.php
index dd8f513b32682..41ed0139cca0e 100644
--- a/libraries/src/Document/Renderer/Feed/RssRenderer.php
+++ b/libraries/src/Document/Renderer/Feed/RssRenderer.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/Renderer/Html/ComponentRenderer.php b/libraries/src/Document/Renderer/Html/ComponentRenderer.php
index 725b70c0fdf45..8947a4716176c 100644
--- a/libraries/src/Document/Renderer/Html/ComponentRenderer.php
+++ b/libraries/src/Document/Renderer/Html/ComponentRenderer.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/Renderer/Html/HeadRenderer.php b/libraries/src/Document/Renderer/Html/HeadRenderer.php
index 71e6cce637919..92909c0d77ccc 100644
--- a/libraries/src/Document/Renderer/Html/HeadRenderer.php
+++ b/libraries/src/Document/Renderer/Html/HeadRenderer.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/Renderer/Html/MessageRenderer.php b/libraries/src/Document/Renderer/Html/MessageRenderer.php
index 63f34db794076..976f89911d3f8 100644
--- a/libraries/src/Document/Renderer/Html/MessageRenderer.php
+++ b/libraries/src/Document/Renderer/Html/MessageRenderer.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/Renderer/Html/MetasRenderer.php b/libraries/src/Document/Renderer/Html/MetasRenderer.php
index e6aa0b7d4c350..50b18f83fcb08 100644
--- a/libraries/src/Document/Renderer/Html/MetasRenderer.php
+++ b/libraries/src/Document/Renderer/Html/MetasRenderer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Document/Renderer/Html/ModuleRenderer.php b/libraries/src/Document/Renderer/Html/ModuleRenderer.php
index e0bedc5d0e0cb..2b501170dc165 100644
--- a/libraries/src/Document/Renderer/Html/ModuleRenderer.php
+++ b/libraries/src/Document/Renderer/Html/ModuleRenderer.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/Renderer/Html/ModulesRenderer.php b/libraries/src/Document/Renderer/Html/ModulesRenderer.php
index f51522553754b..c9e5029b43615 100644
--- a/libraries/src/Document/Renderer/Html/ModulesRenderer.php
+++ b/libraries/src/Document/Renderer/Html/ModulesRenderer.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/Renderer/Html/ScriptsRenderer.php b/libraries/src/Document/Renderer/Html/ScriptsRenderer.php
index f2fc59bcd01bd..2b225f1b87449 100644
--- a/libraries/src/Document/Renderer/Html/ScriptsRenderer.php
+++ b/libraries/src/Document/Renderer/Html/ScriptsRenderer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Document/Renderer/Html/StylesRenderer.php b/libraries/src/Document/Renderer/Html/StylesRenderer.php
index af83f7dbab2c2..40c81f3750653 100644
--- a/libraries/src/Document/Renderer/Html/StylesRenderer.php
+++ b/libraries/src/Document/Renderer/Html/StylesRenderer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Document/RendererInterface.php b/libraries/src/Document/RendererInterface.php
index 00e7083451916..820833620ce66 100644
--- a/libraries/src/Document/RendererInterface.php
+++ b/libraries/src/Document/RendererInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Document/XmlDocument.php b/libraries/src/Document/XmlDocument.php
index d6d3652d890ab..14f51b18a9cf4 100644
--- a/libraries/src/Document/XmlDocument.php
+++ b/libraries/src/Document/XmlDocument.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -27,6 +27,14 @@ class XmlDocument extends Document
 	 */
 	protected $name = 'joomla';
 
+	/**
+	 * Flag indicating the document should be downloaded (Content-Disposition = attachment) versus displayed inline
+	 *
+	 * @var    boolean
+	 * @since  3.9.0
+	 */
+	protected $isDownload = false;
+
 	/**
 	 * Class constructor
 	 *
@@ -59,7 +67,9 @@ public function render($cache = false, $params = array())
 	{
 		parent::render();
 
-		CmsFactory::getApplication()->setHeader('Content-disposition', 'inline; filename="' . $this->getName() . '.xml"', true);
+		$disposition = $this->isDownload ? 'attachment' : 'inline';
+
+		CmsFactory::getApplication()->setHeader('Content-disposition', $disposition . '; filename="' . $this->getName() . '.xml"', true);
 
 		return $this->getBuffer();
 	}
@@ -91,4 +101,32 @@ public function setName($name = 'joomla')
 
 		return $this;
 	}
+
+	/**
+	 * Check if this document is intended for download
+	 *
+	 * @return  string
+	 *
+	 * @since   3.9.0
+	 */
+	public function isDownload()
+	{
+		return $this->isDownload;
+	}
+
+	/**
+	 * Sets the document's download state
+	 *
+	 * @param   boolean  $download  If true, this document will be downloaded; if false, this document will be displayed inline
+	 *
+	 * @return  XmlDocument instance of $this to allow chaining
+	 *
+	 * @since   3.9.0
+	 */
+	public function setDownload($download = false)
+	{
+		$this->isDownload = $download;
+
+		return $this;
+	}
 }
diff --git a/libraries/src/Editor/Editor.php b/libraries/src/Editor/Editor.php
index 2e84fe7c7b66f..386a366b16bb8 100644
--- a/libraries/src/Editor/Editor.php
+++ b/libraries/src/Editor/Editor.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Encrypt/AES/AbstractAES.php b/libraries/src/Encrypt/AES/AbstractAES.php
index 80ace88ac386a..653611ea0f505 100644
--- a/libraries/src/Encrypt/AES/AbstractAES.php
+++ b/libraries/src/Encrypt/AES/AbstractAES.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Encrypt/AES/AesInterface.php b/libraries/src/Encrypt/AES/AesInterface.php
index b45c3be05baac..a02b8d84db27c 100644
--- a/libraries/src/Encrypt/AES/AesInterface.php
+++ b/libraries/src/Encrypt/AES/AesInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Encrypt/AES/Mcrypt.php b/libraries/src/Encrypt/AES/Mcrypt.php
index ccd7c1f47a35e..ce7d0e2a4218e 100644
--- a/libraries/src/Encrypt/AES/Mcrypt.php
+++ b/libraries/src/Encrypt/AES/Mcrypt.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Encrypt/AES/OpenSSL.php b/libraries/src/Encrypt/AES/OpenSSL.php
index 875db60635c66..1e9da2e4fb626 100644
--- a/libraries/src/Encrypt/AES/OpenSSL.php
+++ b/libraries/src/Encrypt/AES/OpenSSL.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Encrypt/Aes.php b/libraries/src/Encrypt/Aes.php
index c776c817a27d3..77c9e9f1fe96f 100644
--- a/libraries/src/Encrypt/Aes.php
+++ b/libraries/src/Encrypt/Aes.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Encrypt/Base32.php b/libraries/src/Encrypt/Base32.php
index 6eaad4d4cf625..74c7c4fd2ce12 100644
--- a/libraries/src/Encrypt/Base32.php
+++ b/libraries/src/Encrypt/Base32.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Encrypt/RandValInterface.php b/libraries/src/Encrypt/RandValInterface.php
index f46cbb922d2d4..72960ec66502d 100644
--- a/libraries/src/Encrypt/RandValInterface.php
+++ b/libraries/src/Encrypt/RandValInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Encrypt/Randval.php b/libraries/src/Encrypt/Randval.php
index e6e8acc7bc160..8db1dc0d36236 100644
--- a/libraries/src/Encrypt/Randval.php
+++ b/libraries/src/Encrypt/Randval.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Encrypt/Totp.php b/libraries/src/Encrypt/Totp.php
index ec1861cd148e3..226ffd1e64370 100644
--- a/libraries/src/Encrypt/Totp.php
+++ b/libraries/src/Encrypt/Totp.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Environment/Browser.php b/libraries/src/Environment/Browser.php
index 2975309cee67f..1fb1e048d7dfc 100644
--- a/libraries/src/Environment/Browser.php
+++ b/libraries/src/Environment/Browser.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -122,6 +122,7 @@ class Browser
 		'ViolaBot',
 		'webbandit',
 		'www.almaden.ibm.com/cs/crawler',
+		'yandex.com/bots',
 		'ZyBorg',
 	);
 
diff --git a/libraries/src/Error/AbstractRenderer.php b/libraries/src/Error/AbstractRenderer.php
index 7c30f4f32578c..974333abbc2d3 100644
--- a/libraries/src/Error/AbstractRenderer.php
+++ b/libraries/src/Error/AbstractRenderer.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Error/JsonApi/AuthenticationFailedExceptionHandler.php b/libraries/src/Error/JsonApi/AuthenticationFailedExceptionHandler.php
new file mode 100644
index 0000000000000..8fe1dc6d67a59
--- /dev/null
+++ b/libraries/src/Error/JsonApi/AuthenticationFailedExceptionHandler.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\CMS\Error\JsonApi;
+
+defined('JPATH_PLATFORM') or die;
+
+use Exception;
+use Joomla\CMS\Access\Exception\AuthenticationFailed;
+use Tobscure\JsonApi\Exception\Handler\ExceptionHandlerInterface;
+use Tobscure\JsonApi\Exception\Handler\ResponseBag;
+
+/**
+ * Handler for permission errors that should give a 401
+ *
+ * @since  4.0
+ */
+class AuthenticationFailedExceptionHandler implements ExceptionHandlerInterface
+{
+	/**
+	 * If the exception handler is able to format a response for the provided exception,
+	 * then the implementation should return true.
+	 *
+	 * @param   \Exception  $e  The exception to be handled
+	 *
+	 * @return bool
+	 *
+	 * @since  4.0.0
+	 */
+	public function manages(Exception $e)
+	{
+		return $e instanceof AuthenticationFailed;
+	}
+
+	/**
+	 * Handle the provided exception.
+	 *
+	 * @param   Exception  $e  The exception being handled
+	 *
+	 * @return  \Tobscure\JsonApi\Exception\Handler\ResponseBag
+	 *
+	 * @since  4.0.0
+	 */
+	public function handle(Exception $e)
+	{
+		$status = 401;
+		$error = ['title' => 'Forbidden'];
+
+		$code = $e->getCode();
+
+		if ($code)
+		{
+			$error['code'] = $code;
+		}
+
+		return new ResponseBag($status, [$error]);
+	}
+}
diff --git a/libraries/src/Error/JsonApi/InvalidRouteExceptionHandler.php b/libraries/src/Error/JsonApi/InvalidRouteExceptionHandler.php
new file mode 100644
index 0000000000000..ffe709978c5e6
--- /dev/null
+++ b/libraries/src/Error/JsonApi/InvalidRouteExceptionHandler.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\CMS\Error\JsonApi;
+
+defined('JPATH_PLATFORM') or die;
+
+use Exception;
+use Joomla\CMS\Router\Exception\RouteNotFoundException;
+use Tobscure\JsonApi\Exception\Handler\ExceptionHandlerInterface;
+use Tobscure\JsonApi\Exception\Handler\ResponseBag;
+
+/**
+ * Handler for routing errors that should give a 404
+ *
+ * @since  4.0
+ */
+class InvalidRouteExceptionHandler implements ExceptionHandlerInterface
+{
+	/**
+	 * If the exception handler is able to format a response for the provided exception,
+	 * then the implementation should return true.
+	 *
+	 * @param   \Exception  $e  The exception to be handled
+	 *
+	 * @return bool
+	 *
+	 * @since  4.0.0
+	 */
+	public function manages(Exception $e)
+	{
+		return $e instanceof RouteNotFoundException;
+	}
+
+	/**
+	 * Handle the provided exception.
+	 *
+	 * @param   Exception  $e  The exception being handled
+	 *
+	 * @return  \Tobscure\JsonApi\Exception\Handler\ResponseBag
+	 *
+	 * @since  4.0.0
+	 */
+	public function handle(Exception $e)
+	{
+		$status = 404;
+		$error = ['title' => 'Resource not found'];
+
+		$code = $e->getCode();
+
+		if ($code)
+		{
+			$error['code'] = $code;
+		}
+
+		return new ResponseBag($status, [$error]);
+	}
+}
diff --git a/libraries/src/Error/JsonApi/NotAcceptableExceptionHandler.php b/libraries/src/Error/JsonApi/NotAcceptableExceptionHandler.php
new file mode 100644
index 0000000000000..831a5c2e0f426
--- /dev/null
+++ b/libraries/src/Error/JsonApi/NotAcceptableExceptionHandler.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\CMS\Error\JsonApi;
+
+defined('JPATH_PLATFORM') or die;
+
+use Exception;
+use Joomla\CMS\Application\Exception\NotAcceptable;
+use Tobscure\JsonApi\Exception\Handler\ExceptionHandlerInterface;
+use Tobscure\JsonApi\Exception\Handler\ResponseBag;
+
+/**
+ * Handler for routing errors that should give a 406
+ *
+ * @since  4.0
+ */
+class NotAcceptableExceptionHandler implements ExceptionHandlerInterface
+{
+	/**
+	 * If the exception handler is able to format a response for the provided exception,
+	 * then the implementation should return true.
+	 *
+	 * @param   \Exception  $e  The exception to be handled
+	 *
+	 * @return bool
+	 *
+	 * @since  4.0.0
+	 */
+	public function manages(Exception $e)
+	{
+		return $e instanceof NotAcceptable;
+	}
+
+	/**
+	 * Handle the provided exception.
+	 *
+	 * @param   Exception  $e  The exception being handled
+	 *
+	 * @return  \Tobscure\JsonApi\Exception\Handler\ResponseBag
+	 *
+	 * @since  4.0.0
+	 */
+	public function handle(Exception $e)
+	{
+		$status = 406;
+		$error = ['title' => 'Not Acceptable'];
+
+		$code = $e->getCode();
+
+		if ($code)
+		{
+			$error['code'] = $code;
+		}
+
+		return new ResponseBag($status, [$error]);
+	}
+}
diff --git a/libraries/src/Error/JsonApi/NotAllowedExceptionHandler.php b/libraries/src/Error/JsonApi/NotAllowedExceptionHandler.php
new file mode 100644
index 0000000000000..47a5648d6789e
--- /dev/null
+++ b/libraries/src/Error/JsonApi/NotAllowedExceptionHandler.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\CMS\Error\JsonApi;
+
+defined('JPATH_PLATFORM') or die;
+
+use Exception;
+use Joomla\CMS\Access\Exception\NotAllowed;
+use Tobscure\JsonApi\Exception\Handler\ExceptionHandlerInterface;
+use Tobscure\JsonApi\Exception\Handler\ResponseBag;
+
+/**
+ * Handler for permission errors that should give a 403
+ *
+ * @since  4.0
+ */
+class NotAllowedExceptionHandler implements ExceptionHandlerInterface
+{
+	/**
+	 * If the exception handler is able to format a response for the provided exception,
+	 * then the implementation should return true.
+	 *
+	 * @param   \Exception  $e  The exception to be handled
+	 *
+	 * @return bool
+	 *
+	 * @since  4.0.0
+	 */
+	public function manages(Exception $e)
+	{
+		return $e instanceof NotAllowed;
+	}
+
+	/**
+	 * Handle the provided exception.
+	 *
+	 * @param   Exception  $e  The exception being handled
+	 *
+	 * @return  \Tobscure\JsonApi\Exception\Handler\ResponseBag
+	 *
+	 * @since  4.0.0
+	 */
+	public function handle(Exception $e)
+	{
+		$status = 403;
+		$error = ['title' => 'Access Denied'];
+
+		$code = $e->getCode();
+
+		if ($code)
+		{
+			$error['code'] = $code;
+		}
+
+		return new ResponseBag($status, [$error]);
+	}
+}
diff --git a/libraries/src/Error/JsonApi/ResourceNotFoundExceptionHandler.php b/libraries/src/Error/JsonApi/ResourceNotFoundExceptionHandler.php
new file mode 100644
index 0000000000000..d8d038d8a9f95
--- /dev/null
+++ b/libraries/src/Error/JsonApi/ResourceNotFoundExceptionHandler.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\CMS\Error\JsonApi;
+
+use Exception;
+use Joomla\CMS\MVC\Controller\Exception\ResourceNotFound;
+use Tobscure\JsonApi\Exception\Handler\ExceptionHandlerInterface;
+use Tobscure\JsonApi\Exception\Handler\ResponseBag;
+
+/**
+ * Handler for invalid resource requests that should give a 404
+ *
+ * @since  4.0
+ */
+class ResourceNotFoundExceptionHandler implements ExceptionHandlerInterface
+{
+	/**
+	 * If the exception handler is able to format a response for the provided exception,
+	 * then the implementation should return true.
+	 *
+	 * @param   \Exception  $e  The exception to be handled
+	 *
+	 * @return bool
+	 *
+	 * @since  4.0.0
+	 */
+	public function manages(Exception $e)
+	{
+		return $e instanceof ResourceNotFound;
+	}
+
+	/**
+	 * Handle the provided exception.
+	 *
+	 * @param   Exception  $e  The exception being handled
+	 *
+	 * @return  \Tobscure\JsonApi\Exception\Handler\ResponseBag
+	 *
+	 * @since  4.0.0
+	 */
+	public function handle(Exception $e)
+	{
+		$status = 404;
+		$error = ['title' => 'Resource not found'];
+
+		$code = $e->getCode();
+
+		if ($code)
+		{
+			$error['code'] = $code;
+		}
+
+		return new ResponseBag($status, [$error]);
+	}
+}
diff --git a/libraries/src/Error/Renderer/CliRenderer.php b/libraries/src/Error/Renderer/CliRenderer.php
index beb695f67d05c..75fcddd605fb9 100644
--- a/libraries/src/Error/Renderer/CliRenderer.php
+++ b/libraries/src/Error/Renderer/CliRenderer.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Error/Renderer/FeedRenderer.php b/libraries/src/Error/Renderer/FeedRenderer.php
index cf23c95b56308..c5d1ef7f5cd82 100644
--- a/libraries/src/Error/Renderer/FeedRenderer.php
+++ b/libraries/src/Error/Renderer/FeedRenderer.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Error/Renderer/HtmlRenderer.php b/libraries/src/Error/Renderer/HtmlRenderer.php
index 4757f36ea5055..462d992b8a9ad 100644
--- a/libraries/src/Error/Renderer/HtmlRenderer.php
+++ b/libraries/src/Error/Renderer/HtmlRenderer.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Error/Renderer/JsonRenderer.php b/libraries/src/Error/Renderer/JsonRenderer.php
index 298867d1cbe12..81b12c39b4fa4 100644
--- a/libraries/src/Error/Renderer/JsonRenderer.php
+++ b/libraries/src/Error/Renderer/JsonRenderer.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Error/Renderer/JsonapiRenderer.php b/libraries/src/Error/Renderer/JsonapiRenderer.php
new file mode 100644
index 0000000000000..011382e49e17f
--- /dev/null
+++ b/libraries/src/Error/Renderer/JsonapiRenderer.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\CMS\Error\Renderer;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Error\JsonApi\AuthenticationFailedExceptionHandler;
+use Joomla\CMS\Error\JsonApi\InvalidRouteExceptionHandler;
+use Joomla\CMS\Error\JsonApi\NotAcceptableExceptionHandler;
+use Joomla\CMS\Error\JsonApi\NotAllowedExceptionHandler;
+use Joomla\CMS\Error\JsonApi\ResourceNotFoundExceptionHandler;
+use Joomla\CMS\Factory;
+use Tobscure\JsonApi\ErrorHandler;
+use Tobscure\JsonApi\Exception\Handler\FallbackExceptionHandler;
+use Tobscure\JsonApi\Exception\Handler\InvalidParameterExceptionHandler;
+use Tobscure\JsonApi\Exception\Handler\ResponseBag;
+
+/**
+ * JSON error page renderer
+ *
+ * @since  4.0
+ */
+class JsonapiRenderer extends JsonRenderer
+{
+	/**
+	 * The format (type) of the error page
+	 *
+	 * @var    string
+	 * @since  4.0
+	 */
+	protected $type = 'jsonapi';
+
+	/**
+	 * Render the error page for the given object
+	 *
+	 * @param   \Throwable  $error  The error object to be rendered
+	 *
+	 * @return  string
+	 *
+	 * @since   4.0
+	 */
+	public function render(\Throwable $error): string
+	{
+		if ($error instanceof \Exception)
+		{
+			$errors = new ErrorHandler;
+
+			$errors->registerHandler(new InvalidRouteExceptionHandler);
+			$errors->registerHandler(new AuthenticationFailedExceptionHandler);
+			$errors->registerHandler(new NotAcceptableExceptionHandler);
+			$errors->registerHandler(new NotAllowedExceptionHandler);
+			$errors->registerHandler(new InvalidParameterExceptionHandler);
+			$errors->registerHandler(new ResourceNotFoundExceptionHandler);
+			$errors->registerHandler(new FallbackExceptionHandler(JDEBUG));
+
+			$response = $errors->handle($error);
+		}
+		else
+		{
+			$code = 500;
+			$errorInfo = ['code' => $code, 'title' => 'Internal server error'];
+
+			if (JDEBUG)
+			{
+				$errorInfo['detail'] = (string) $error;
+			}
+
+			$response = new ResponseBag($code, $errorInfo);
+		}
+
+		$this->getDocument()->setErrors($response->getErrors());
+		Factory::getApplication()->setHeader('status', $response->getStatus());
+
+		if (ob_get_contents())
+		{
+			ob_end_clean();
+		}
+
+		return $this->getDocument()->render();
+	}
+}
diff --git a/libraries/src/Error/Renderer/XmlRenderer.php b/libraries/src/Error/Renderer/XmlRenderer.php
index 480ba02cef9f7..a70dc5e296f74 100644
--- a/libraries/src/Error/Renderer/XmlRenderer.php
+++ b/libraries/src/Error/Renderer/XmlRenderer.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Error/RendererInterface.php b/libraries/src/Error/RendererInterface.php
index d65287eb3b3ff..d3c9939ef87e3 100644
--- a/libraries/src/Error/RendererInterface.php
+++ b/libraries/src/Error/RendererInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/AbstractEvent.php b/libraries/src/Event/AbstractEvent.php
index d8afb2bfef64d..a4ca0b05d81c0 100644
--- a/libraries/src/Event/AbstractEvent.php
+++ b/libraries/src/Event/AbstractEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/AbstractImmutableEvent.php b/libraries/src/Event/AbstractImmutableEvent.php
index 3a2d67e466645..1795fd3682a4c 100644
--- a/libraries/src/Event/AbstractImmutableEvent.php
+++ b/libraries/src/Event/AbstractImmutableEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/AfterExtensionBootEvent.php b/libraries/src/Event/AfterExtensionBootEvent.php
index 674adcbacaa1a..0d8d25986a69a 100644
--- a/libraries/src/Event/AfterExtensionBootEvent.php
+++ b/libraries/src/Event/AfterExtensionBootEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/BeforeExecuteEvent.php b/libraries/src/Event/BeforeExecuteEvent.php
index a3b1fe5244cdb..48185eb2f04cf 100644
--- a/libraries/src/Event/BeforeExecuteEvent.php
+++ b/libraries/src/Event/BeforeExecuteEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/BeforeExtensionBootEvent.php b/libraries/src/Event/BeforeExtensionBootEvent.php
index 068c80a006f98..7e518b2593c3d 100644
--- a/libraries/src/Event/BeforeExtensionBootEvent.php
+++ b/libraries/src/Event/BeforeExtensionBootEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/ErrorEvent.php b/libraries/src/Event/ErrorEvent.php
index fed6a7e81993b..838b981a35783 100644
--- a/libraries/src/Event/ErrorEvent.php
+++ b/libraries/src/Event/ErrorEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/GenericEvent.php b/libraries/src/Event/GenericEvent.php
index 21e944c5901e4..0e2e0cf64cd1c 100644
--- a/libraries/src/Event/GenericEvent.php
+++ b/libraries/src/Event/GenericEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/LazyServiceEventListener.php b/libraries/src/Event/LazyServiceEventListener.php
new file mode 100644
index 0000000000000..20ba64cb4ff05
--- /dev/null
+++ b/libraries/src/Event/LazyServiceEventListener.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\CMS\Event;
+
+use Joomla\DI\ContainerAwareTrait;
+use Joomla\Event\EventInterface;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Decorator for an event listener to be pulled from the service container.
+ *
+ * @since  4.0.0
+ */
+final class LazyServiceEventListener
+{
+	use ContainerAwareTrait;
+
+	/**
+	 * The ID of the service from the container to be used
+	 *
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	private $serviceId;
+
+	/**
+	 * The method from the service to be called
+	 *
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	private $method;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   string  $serviceId  The ID of the service from the container to be used
+	 * @param   string  $method     The method from the service to be called if necessary
+	 *                              (if left empty, the service must be a callable; i.e. have an `__invoke()` method on a class)
+	 *
+	 * @since   4.0.0
+	 * @throws  \InvalidArgumentException if the service ID is empty
+	 */
+	public function __construct(string $serviceId, string $method = '')
+	{
+		if (empty($serviceId))
+		{
+			throw new \InvalidArgumentException(
+				sprintf(
+					'The $serviceId parameter cannot be empty in %s',
+					self::class
+				)
+			);
+		}
+
+		$this->serviceId = $serviceId;
+		$this->method    = $method;
+	}
+
+	/**
+	 * Load a service from the container to listen to an event.
+	 *
+	 * @param   EventInterface  $event  The event to process
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 * @throws  \InvalidArgumentException if the constructor's $method parameter is empty when not executing a callable service
+	 * @throws  \RuntimeException if the service cannot be executed
+	 */
+	public function __invoke(EventInterface $event)
+	{
+		if (!$this->container)
+		{
+			throw new \RuntimeException(
+				sprintf(
+					'The container has not been set in %s for %s, ensure you call the `setContainer()` method first',
+					self::class,
+					!empty($this->serviceId) ? ('the "' . $this->serviceId . '" service') : 'an unknown service'
+				)
+			);
+		}
+
+		if (!$this->container->has($this->serviceId))
+		{
+			throw new \RuntimeException(
+				sprintf(
+					'The "%s" service has not been registered to the service container',
+					$this->serviceId
+				)
+			);
+		}
+
+		$service = $this->container->get($this->serviceId);
+
+		// If the service is callable on its own, just execute it
+		if (is_callable($service))
+		{
+			call_user_func($service, $event);
+
+			return;
+		}
+
+		if (empty($this->method))
+		{
+			throw new \InvalidArgumentException(
+				sprintf(
+					'The $method argument is required when creating a "%s" to call a method from the "%s" service.',
+					self::class,
+					$this->serviceId
+				)
+			);
+		}
+
+		if (!method_exists($service, $this->method))
+		{
+			throw new \RuntimeException(
+				sprintf(
+					'The "%s" method does not exist on "%s" (from service "%s")',
+					$this->method,
+					get_class($service),
+					$this->serviceId
+				)
+			);
+		}
+
+		call_user_func([$service, $this->method], $event);
+	}
+}
diff --git a/libraries/src/Event/Table/AbstractEvent.php b/libraries/src/Event/Table/AbstractEvent.php
index f6876218175a4..853274a43e513 100644
--- a/libraries/src/Event/Table/AbstractEvent.php
+++ b/libraries/src/Event/Table/AbstractEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/AfterBindEvent.php b/libraries/src/Event/Table/AfterBindEvent.php
index 3fbbbd5ed7e1b..19cf83e156639 100644
--- a/libraries/src/Event/Table/AfterBindEvent.php
+++ b/libraries/src/Event/Table/AfterBindEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/AfterCheckinEvent.php b/libraries/src/Event/Table/AfterCheckinEvent.php
index 04c58e7141176..3af4df01805eb 100644
--- a/libraries/src/Event/Table/AfterCheckinEvent.php
+++ b/libraries/src/Event/Table/AfterCheckinEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/AfterCheckoutEvent.php b/libraries/src/Event/Table/AfterCheckoutEvent.php
index c77a6727cc965..17f09a2aeaa7f 100644
--- a/libraries/src/Event/Table/AfterCheckoutEvent.php
+++ b/libraries/src/Event/Table/AfterCheckoutEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/AfterDeleteEvent.php b/libraries/src/Event/Table/AfterDeleteEvent.php
index c2a8fbd54c129..e6aee6583c952 100644
--- a/libraries/src/Event/Table/AfterDeleteEvent.php
+++ b/libraries/src/Event/Table/AfterDeleteEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/AfterHitEvent.php b/libraries/src/Event/Table/AfterHitEvent.php
index cef0387b2eb70..2536241acb055 100644
--- a/libraries/src/Event/Table/AfterHitEvent.php
+++ b/libraries/src/Event/Table/AfterHitEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/AfterLoadEvent.php b/libraries/src/Event/Table/AfterLoadEvent.php
index 4086f21c2c071..0c5f58e57eccc 100644
--- a/libraries/src/Event/Table/AfterLoadEvent.php
+++ b/libraries/src/Event/Table/AfterLoadEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/AfterMoveEvent.php b/libraries/src/Event/Table/AfterMoveEvent.php
index 525ddc4c9bda1..97bf4c2b4a393 100644
--- a/libraries/src/Event/Table/AfterMoveEvent.php
+++ b/libraries/src/Event/Table/AfterMoveEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/AfterPublishEvent.php b/libraries/src/Event/Table/AfterPublishEvent.php
index c4218d5f82c6c..f8274881ab5b7 100644
--- a/libraries/src/Event/Table/AfterPublishEvent.php
+++ b/libraries/src/Event/Table/AfterPublishEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/AfterReorderEvent.php b/libraries/src/Event/Table/AfterReorderEvent.php
index 8458ee46570d0..74d10cb93d337 100644
--- a/libraries/src/Event/Table/AfterReorderEvent.php
+++ b/libraries/src/Event/Table/AfterReorderEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/AfterResetEvent.php b/libraries/src/Event/Table/AfterResetEvent.php
index 9eb213fe68bd9..26ee6a835b198 100644
--- a/libraries/src/Event/Table/AfterResetEvent.php
+++ b/libraries/src/Event/Table/AfterResetEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/AfterStoreEvent.php b/libraries/src/Event/Table/AfterStoreEvent.php
index 77ec261d60d1c..184ff16083a70 100644
--- a/libraries/src/Event/Table/AfterStoreEvent.php
+++ b/libraries/src/Event/Table/AfterStoreEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/BeforeBindEvent.php b/libraries/src/Event/Table/BeforeBindEvent.php
index d5b100bd615f1..74d91a98f8f64 100644
--- a/libraries/src/Event/Table/BeforeBindEvent.php
+++ b/libraries/src/Event/Table/BeforeBindEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/BeforeCheckinEvent.php b/libraries/src/Event/Table/BeforeCheckinEvent.php
index b9a63bb66cce2..041f2720e10b1 100644
--- a/libraries/src/Event/Table/BeforeCheckinEvent.php
+++ b/libraries/src/Event/Table/BeforeCheckinEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/BeforeCheckoutEvent.php b/libraries/src/Event/Table/BeforeCheckoutEvent.php
index 93deca5b2d5af..14a38bb8c3ed0 100644
--- a/libraries/src/Event/Table/BeforeCheckoutEvent.php
+++ b/libraries/src/Event/Table/BeforeCheckoutEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/BeforeDeleteEvent.php b/libraries/src/Event/Table/BeforeDeleteEvent.php
index fee1ed97041da..8becb3624ae5e 100644
--- a/libraries/src/Event/Table/BeforeDeleteEvent.php
+++ b/libraries/src/Event/Table/BeforeDeleteEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/BeforeHitEvent.php b/libraries/src/Event/Table/BeforeHitEvent.php
index cb2ca27a72302..4f4e13a0b4001 100644
--- a/libraries/src/Event/Table/BeforeHitEvent.php
+++ b/libraries/src/Event/Table/BeforeHitEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/BeforeLoadEvent.php b/libraries/src/Event/Table/BeforeLoadEvent.php
index db3c880a86306..f928dba82f4f7 100644
--- a/libraries/src/Event/Table/BeforeLoadEvent.php
+++ b/libraries/src/Event/Table/BeforeLoadEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/BeforeMoveEvent.php b/libraries/src/Event/Table/BeforeMoveEvent.php
index 221a4379afbb4..abe378da7e193 100644
--- a/libraries/src/Event/Table/BeforeMoveEvent.php
+++ b/libraries/src/Event/Table/BeforeMoveEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/BeforePublishEvent.php b/libraries/src/Event/Table/BeforePublishEvent.php
index dba63ee608a50..43872215c658c 100644
--- a/libraries/src/Event/Table/BeforePublishEvent.php
+++ b/libraries/src/Event/Table/BeforePublishEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/BeforeReorderEvent.php b/libraries/src/Event/Table/BeforeReorderEvent.php
index 8a9705597e924..c2d977d45fb64 100644
--- a/libraries/src/Event/Table/BeforeReorderEvent.php
+++ b/libraries/src/Event/Table/BeforeReorderEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/BeforeResetEvent.php b/libraries/src/Event/Table/BeforeResetEvent.php
index bfaf380f83951..0a037da49d8ff 100644
--- a/libraries/src/Event/Table/BeforeResetEvent.php
+++ b/libraries/src/Event/Table/BeforeResetEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/BeforeStoreEvent.php b/libraries/src/Event/Table/BeforeStoreEvent.php
index 4a66412dc818a..315d15fb4183b 100644
--- a/libraries/src/Event/Table/BeforeStoreEvent.php
+++ b/libraries/src/Event/Table/BeforeStoreEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/CheckEvent.php b/libraries/src/Event/Table/CheckEvent.php
index f7c2703f9a6cd..ee0803e6fe514 100644
--- a/libraries/src/Event/Table/CheckEvent.php
+++ b/libraries/src/Event/Table/CheckEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/ObjectCreateEvent.php b/libraries/src/Event/Table/ObjectCreateEvent.php
index 51feef9d73677..8884be7c0cc3c 100644
--- a/libraries/src/Event/Table/ObjectCreateEvent.php
+++ b/libraries/src/Event/Table/ObjectCreateEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/Table/SetNewTagsEvent.php b/libraries/src/Event/Table/SetNewTagsEvent.php
index 71ebc0109a8f4..28cd986275736 100644
--- a/libraries/src/Event/Table/SetNewTagsEvent.php
+++ b/libraries/src/Event/Table/SetNewTagsEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/WebAsset/AbstractEvent.php b/libraries/src/Event/WebAsset/AbstractEvent.php
index 11ab8901c5fc4..ea00de09db06a 100644
--- a/libraries/src/Event/WebAsset/AbstractEvent.php
+++ b/libraries/src/Event/WebAsset/AbstractEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Event/WebAsset/WebAssetBeforeAttachEvent.php b/libraries/src/Event/WebAsset/WebAssetBeforeAttachEvent.php
index 3a854e3b3eb05..9c0a705df8025 100644
--- a/libraries/src/Event/WebAsset/WebAssetBeforeAttachEvent.php
+++ b/libraries/src/Event/WebAsset/WebAssetBeforeAttachEvent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -51,7 +51,7 @@ public function __construct($name, array $arguments = array())
 	 *
 	 * @throws  BadMethodCallException  if the argument is not of the expected type
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	protected function setSubject($value)
 	{
diff --git a/libraries/src/Exception/ExceptionHandler.php b/libraries/src/Exception/ExceptionHandler.php
index e6568f144f179..46ccf390751dc 100644
--- a/libraries/src/Exception/ExceptionHandler.php
+++ b/libraries/src/Exception/ExceptionHandler.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Extension/BootableExtensionInterface.php b/libraries/src/Extension/BootableExtensionInterface.php
index cb714ce7b24ea..3f601e6cff2ba 100644
--- a/libraries/src/Extension/BootableExtensionInterface.php
+++ b/libraries/src/Extension/BootableExtensionInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Extension/Component.php b/libraries/src/Extension/Component.php
index 95c146cd8ac6c..6aa53d59e0b24 100644
--- a/libraries/src/Extension/Component.php
+++ b/libraries/src/Extension/Component.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Extension/ComponentInterface.php b/libraries/src/Extension/ComponentInterface.php
index 15f35d78f51b7..5644fa2852be9 100644
--- a/libraries/src/Extension/ComponentInterface.php
+++ b/libraries/src/Extension/ComponentInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Extension/ExtensionHelper.php b/libraries/src/Extension/ExtensionHelper.php
index 893d2767bfafc..c87aed84bd2d1 100644
--- a/libraries/src/Extension/ExtensionHelper.php
+++ b/libraries/src/Extension/ExtensionHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -19,6 +19,13 @@
  */
 class ExtensionHelper
 {
+	/**
+	 * The loaded extensions.
+	 *
+	 * @var array
+	 */
+	public static $extensions = [ModuleInterface::class => [], ComponentInterface::class => []];
+	
 	/**
 	 * Array of core extensions
 	 * Each element is an array with elements "type", "element", "folder" and
@@ -31,6 +38,7 @@ class ExtensionHelper
 		// Format: `type`, `element`, `folder`, `client_id`
 
 		// Core component extensions
+		array('component', 'com_actionlogs', '', 1),
 		array('component', 'com_admin', '', 1),
 		array('component', 'com_ajax', '', 1),
 		array('component', 'com_associations', '', 1),
@@ -58,6 +66,7 @@ class ExtensionHelper
 		array('component', 'com_newsfeeds', '', 1),
 		array('component', 'com_plugins', '', 1),
 		array('component', 'com_postinstall', '', 1),
+		array('component', 'com_privacy', '', 1),
 		array('component', 'com_redirect', '', 1),
 		array('component', 'com_search', '', 1),
 		array('component', 'com_tags', '', 1),
@@ -83,11 +92,13 @@ class ExtensionHelper
 		array('module', 'mod_custom', '', 1),
 		array('module', 'mod_feed', '', 1),
 		array('module', 'mod_latest', '', 1),
+		array('module', 'mod_latestactions', '', 1),
 		array('module', 'mod_logged', '', 1),
 		array('module', 'mod_login', '', 1),
 		array('module', 'mod_menu', '', 1),
 		array('module', 'mod_multilangstatus', '', 1),
 		array('module', 'mod_popular', '', 1),
+		array('module', 'mod_privacy_dashboard', '', 1),
 		array('module', 'mod_quickicon', '', 1),
 		array('module', 'mod_sampledata', '', 1),
 		array('module', 'mod_stats_admin', '', 1),
@@ -126,6 +137,12 @@ class ExtensionHelper
 		// Core package extensions
 		array('package', 'pkg_en-GB', '', 0),
 
+		// Core plugin extensions - actionlog
+		array('plugin', 'joomla', 'actionlog', 0),
+
+		// Core plugin extensions - API Authentication
+		array('plugin', 'basic', 'api-authentication', 0),
+
 		// Core plugin extensions - authentication
 		array('plugin', 'cookie', 'authentication', 0),
 		array('plugin', 'joomla', 'authentication', 0),
@@ -137,8 +154,10 @@ class ExtensionHelper
 
 		// Core plugin extensions - captcha
 		array('plugin', 'recaptcha', 'captcha', 0),
+		array('plugin', 'recaptcha_invisible', 'captcha', 0),
 
 		// Core plugin extensions - content
+		array('plugin', 'confirmconsent', 'content', 0),
 		array('plugin', 'contact', 'content', 0),
 		array('plugin', 'emailcloak', 'content', 0),
 		array('plugin', 'fields', 'content', 0),
@@ -167,6 +186,7 @@ class ExtensionHelper
 		// Core plugin extensions - extension
 		array('plugin', 'joomla', 'extension', 0),
 		array('plugin', 'namespacemap', 'extension', 0),
+		array('plugin', 'finder', 'extension', 0),
 
 		// Core plugin extensions - fields
 		array('plugin', 'calendar', 'fields', 0),
@@ -178,6 +198,7 @@ class ExtensionHelper
 		array('plugin', 'list', 'fields', 0),
 		array('plugin', 'media', 'fields', 0),
 		array('plugin', 'radio', 'fields', 0),
+		array('plugin', 'repeatable', 'fields', 0),
 		array('plugin', 'sql', 'fields', 0),
 		array('plugin', 'text', 'fields', 0),
 		array('plugin', 'textarea', 'fields', 0),
@@ -207,11 +228,20 @@ class ExtensionHelper
 		array('plugin', 'resize', 'media-action', 0),
 		array('plugin', 'rotate', 'media-action', 0),
 
-		// Core plugin extensions - quickicon
+		// Core plugin extensions - privacy
+		array('plugin', 'actionlogs', 'privacy', 0),
+		array('plugin', 'consents', 'privacy', 0),
+		array('plugin', 'contact', 'privacy', 0),
+		array('plugin', 'content', 'privacy', 0),
+		array('plugin', 'message', 'privacy', 0),
+		array('plugin', 'user', 'privacy', 0),
+
+		// Core plugin extensions - quick icon
 		array('plugin', 'extensionupdate', 'quickicon', 0),
 		array('plugin', 'joomlaupdate', 'quickicon', 0),
 		array('plugin', 'overridecheck', 'quickicon', 0),
 		array('plugin', 'phpversioncheck', 'quickicon', 0),
+		array('plugin', 'privacycheck', 'quickicon', 0),
 
 		// Core plugin extensions - sample data
 		array('plugin', 'blog', 'sampledata', 0),
@@ -225,6 +255,7 @@ class ExtensionHelper
 		array('plugin', 'tags', 'search', 0),
 
 		// Core plugin extensions - system
+		array('plugin', 'actionlogs', 'system', 0),
 		array('plugin', 'cache', 'system', 0),
 		array('plugin', 'debug', 'system', 0),
 		array('plugin', 'fields', 'system', 0),
@@ -234,10 +265,13 @@ class ExtensionHelper
 		array('plugin', 'languagefilter', 'system', 0),
 		array('plugin', 'log', 'system', 0),
 		array('plugin', 'logout', 'system', 0),
+		array('plugin', 'logrotation', 'system', 0),
+		array('plugin', 'privacyconsent', 'system', 0),
 		array('plugin', 'redirect', 'system', 0),
 		array('plugin', 'remember', 'system', 0),
 		array('plugin', 'sef', 'system', 0),
 		array('plugin', 'sessiongc', 'system', 0),
+		array('plugin', 'skipto', 'system', 0),
 		array('plugin', 'stats', 'system', 0),
 		array('plugin', 'sessiongc', 'system', 0),
 		array('plugin', 'updatenotification', 'system', 0),
@@ -250,6 +284,10 @@ class ExtensionHelper
 		array('plugin', 'contactcreator', 'user', 0),
 		array('plugin', 'joomla', 'user', 0),
 		array('plugin', 'profile', 'user', 0),
+		array('plugin', 'terms', 'user', 0),
+
+		// Core plugin extensions - webservices
+		array('plugin', 'content', 'webservices', 0),
 
 		// Core template extensions - administrator
 		array('template', 'atum', '', 1),
diff --git a/libraries/src/Extension/ExtensionManagerInterface.php b/libraries/src/Extension/ExtensionManagerInterface.php
index 2579a4a9a7dfe..6385e79856c74 100644
--- a/libraries/src/Extension/ExtensionManagerInterface.php
+++ b/libraries/src/Extension/ExtensionManagerInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Extension/ExtensionManagerTrait.php b/libraries/src/Extension/ExtensionManagerTrait.php
index 5e9e4d8759238..da5c52df9fbad 100644
--- a/libraries/src/Extension/ExtensionManagerTrait.php
+++ b/libraries/src/Extension/ExtensionManagerTrait.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -24,13 +24,6 @@
  */
 trait ExtensionManagerTrait
 {
-	/**
-	 * The loaded extensions.
-	 *
-	 * @var array
-	 */
-	private $extensions = [ModuleInterface::class => [], ComponentInterface::class => []];
-
 	/**
 	 * Boots the component with the given name.
 	 *
@@ -91,9 +84,9 @@ public function bootModule($module, $applicationName): ModuleInterface
 	private function loadExtension($type, $extensionName, $extensionPath)
 	{
 		// Check if the extension is already loaded
-		if (!empty($this->extensions[$type][$extensionName]))
+		if (!empty(ExtensionHelper::$extensions[$type][$extensionName]))
 		{
-			return $this->extensions[$type][$extensionName];
+			return ExtensionHelper::$extensions[$type][$extensionName];
 		}
 
 		// The container to get the services from
@@ -162,7 +155,7 @@ private function loadExtension($type, $extensionName, $extensionPath)
 		}
 
 		// Cache the extension
-		$this->extensions[$type][$extensionName] = $extension;
+		ExtensionHelper::$extensions[$type][$extensionName] = $extension;
 
 		return $extension;
 	}
diff --git a/libraries/src/Extension/LegacyComponent.php b/libraries/src/Extension/LegacyComponent.php
index 6cb5edb785aff..43482538ba774 100644
--- a/libraries/src/Extension/LegacyComponent.php
+++ b/libraries/src/Extension/LegacyComponent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Extension/MVCComponent.php b/libraries/src/Extension/MVCComponent.php
index fc3f4271dd91a..c703f60f782b2 100644
--- a/libraries/src/Extension/MVCComponent.php
+++ b/libraries/src/Extension/MVCComponent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Extension/Module.php b/libraries/src/Extension/Module.php
index 7ae9909b10097..9004958bef388 100644
--- a/libraries/src/Extension/Module.php
+++ b/libraries/src/Extension/Module.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Extension/ModuleInterface.php b/libraries/src/Extension/ModuleInterface.php
index ae54a644982ec..b1af576bed093 100644
--- a/libraries/src/Extension/ModuleInterface.php
+++ b/libraries/src/Extension/ModuleInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Extension/Service/Provider/CategoryFactory.php b/libraries/src/Extension/Service/Provider/CategoryFactory.php
index cac742d32f0d8..82e2b571a16dc 100644
--- a/libraries/src/Extension/Service/Provider/CategoryFactory.php
+++ b/libraries/src/Extension/Service/Provider/CategoryFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Extension/Service/Provider/ComponentDispatcherFactory.php b/libraries/src/Extension/Service/Provider/ComponentDispatcherFactory.php
index 929e0387e4d7c..be0ab4b78a306 100644
--- a/libraries/src/Extension/Service/Provider/ComponentDispatcherFactory.php
+++ b/libraries/src/Extension/Service/Provider/ComponentDispatcherFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Extension/Service/Provider/MVCFactory.php b/libraries/src/Extension/Service/Provider/MVCFactory.php
index dd0a91c456453..45665bdde57e7 100644
--- a/libraries/src/Extension/Service/Provider/MVCFactory.php
+++ b/libraries/src/Extension/Service/Provider/MVCFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,6 +11,7 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Form\FormFactoryInterface;
+use Joomla\CMS\MVC\Factory\ApiMVCFactory;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
@@ -58,7 +59,15 @@ public function register(Container $container)
 			MVCFactoryInterface::class,
 			function (Container $container)
 			{
-				$factory = new \Joomla\CMS\MVC\Factory\MVCFactory($this->namespace);
+				if (\Joomla\CMS\Factory::getApplication()->isClient('api'))
+				{
+					$factory = new ApiMVCFactory($this->namespace);
+				}
+				else
+				{
+					$factory = new \Joomla\CMS\MVC\Factory\MVCFactory($this->namespace);
+				}
+
 				$factory->setFormFactory($container->get(FormFactoryInterface::class));
 
 				return $factory;
diff --git a/libraries/src/Extension/Service/Provider/Module.php b/libraries/src/Extension/Service/Provider/Module.php
index b48edea51bff6..132cc5db86373 100644
--- a/libraries/src/Extension/Service/Provider/Module.php
+++ b/libraries/src/Extension/Service/Provider/Module.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Extension/Service/Provider/ModuleDispatcherFactory.php b/libraries/src/Extension/Service/Provider/ModuleDispatcherFactory.php
index 8050dba383749..89f58f9eb48a3 100644
--- a/libraries/src/Extension/Service/Provider/ModuleDispatcherFactory.php
+++ b/libraries/src/Extension/Service/Provider/ModuleDispatcherFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Extension/Service/Provider/RouterFactory.php b/libraries/src/Extension/Service/Provider/RouterFactory.php
index d1e55cd5e83d7..34969ea3814e6 100644
--- a/libraries/src/Extension/Service/Provider/RouterFactory.php
+++ b/libraries/src/Extension/Service/Provider/RouterFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Factory.php b/libraries/src/Factory.php
index 97128c0180864..0ca96aa4c1ee5 100644
--- a/libraries/src/Factory.php
+++ b/libraries/src/Factory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -300,11 +300,21 @@ public static function getDocument()
 	 *
 	 * @return  User object
 	 *
-	 * @see     User
-	 * @since   1.7.0
+	 * @see         User
+	 * @since       1.7.0
+	 * @deprecated  5.0  Load the user service from the dependency injection container or via $app->getIdentity()
 	 */
 	public static function getUser($id = null)
 	{
+		@trigger_error(
+			sprintf(
+				'%1$s() is deprecated. Load the user from the dependency injection container or via %2$s::getApplication()->getIdentity().',
+				__METHOD__,
+				__CLASS__
+			),
+			E_USER_DEPRECATED
+		);
+
 		$instance = self::getApplication()->getSession()->get('user');
 
 		if (is_null($id))
@@ -395,7 +405,7 @@ public static function getDbo()
 
 		if (!self::$database)
 		{
-			if (self::getContainer()->exists('DatabaseDriver'))
+			if (self::getContainer()->has('DatabaseDriver'))
 			{
 				self::$database = self::getContainer()->get('DatabaseDriver');
 			}
@@ -559,7 +569,9 @@ protected static function createContainer(): Container
 			->registerServiceProvider(new \Joomla\CMS\Service\Provider\HTMLRegistry)
 			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Session)
 			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Toolbar)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\WebAssetRegistry);
+			->registerServiceProvider(new \Joomla\CMS\Service\Provider\WebAssetRegistry)
+			->registerServiceProvider(new \Joomla\CMS\Service\Provider\ApiRouter)
+			->registerServiceProvider(new \Joomla\CMS\Service\Provider\User);
 
 		return $container;
 	}
diff --git a/libraries/src/Feed/Feed.php b/libraries/src/Feed/Feed.php
index 608f31e8691bb..fc23db075ebdd 100644
--- a/libraries/src/Feed/Feed.php
+++ b/libraries/src/Feed/Feed.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Feed/FeedEntry.php b/libraries/src/Feed/FeedEntry.php
index d893db3c8b439..c89d799b839a6 100644
--- a/libraries/src/Feed/FeedEntry.php
+++ b/libraries/src/Feed/FeedEntry.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Feed/FeedFactory.php b/libraries/src/Feed/FeedFactory.php
index bdc5c122226f5..7f87102e10ddc 100644
--- a/libraries/src/Feed/FeedFactory.php
+++ b/libraries/src/Feed/FeedFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -129,6 +129,18 @@ public function registerParser($tagName, $className, $overwrite = false)
 		return $this;
 	}
 
+	/**
+	 * Method to get the registered Parsers
+	 *
+	 * @return array
+	 *
+	 * @since   4.0
+	 */
+	public function getParsers()
+	{
+		return $this->parsers;
+	}
+
 	/**
 	 * Method to return a new JFeedParser object based on the registered parsers and a given type.
 	 *
diff --git a/libraries/src/Feed/FeedLink.php b/libraries/src/Feed/FeedLink.php
index 48065b789d21f..17bc7f68535d5 100644
--- a/libraries/src/Feed/FeedLink.php
+++ b/libraries/src/Feed/FeedLink.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Feed/FeedParser.php b/libraries/src/Feed/FeedParser.php
index 3ab8a2dd2e31e..263c1564b6032 100644
--- a/libraries/src/Feed/FeedParser.php
+++ b/libraries/src/Feed/FeedParser.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Feed/FeedPerson.php b/libraries/src/Feed/FeedPerson.php
index 4da21da849f9d..005510212c69f 100644
--- a/libraries/src/Feed/FeedPerson.php
+++ b/libraries/src/Feed/FeedPerson.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Feed/Parser/AtomParser.php b/libraries/src/Feed/Parser/AtomParser.php
index c53dd60a1ac98..66000917f32c7 100644
--- a/libraries/src/Feed/Parser/AtomParser.php
+++ b/libraries/src/Feed/Parser/AtomParser.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Feed/Parser/NamespaceParserInterface.php b/libraries/src/Feed/Parser/NamespaceParserInterface.php
index c54767f570960..adf2cad5984fd 100644
--- a/libraries/src/Feed/Parser/NamespaceParserInterface.php
+++ b/libraries/src/Feed/Parser/NamespaceParserInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Feed/Parser/Rss/ItunesRssParser.php b/libraries/src/Feed/Parser/Rss/ItunesRssParser.php
index f76ef9c684c38..a68f8417cb5e1 100644
--- a/libraries/src/Feed/Parser/Rss/ItunesRssParser.php
+++ b/libraries/src/Feed/Parser/Rss/ItunesRssParser.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Feed/Parser/Rss/MediaRssParser.php b/libraries/src/Feed/Parser/Rss/MediaRssParser.php
index 5e439fe000b6a..eb5fb52c5530d 100644
--- a/libraries/src/Feed/Parser/Rss/MediaRssParser.php
+++ b/libraries/src/Feed/Parser/Rss/MediaRssParser.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Feed/Parser/RssParser.php b/libraries/src/Feed/Parser/RssParser.php
index add385b8c7bc8..5e614ee162d91 100644
--- a/libraries/src/Feed/Parser/RssParser.php
+++ b/libraries/src/Feed/Parser/RssParser.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Fields/FieldsServiceInterface.php b/libraries/src/Fields/FieldsServiceInterface.php
index 5a5b75318cf2c..1013be657a32a 100644
--- a/libraries/src/Fields/FieldsServiceInterface.php
+++ b/libraries/src/Fields/FieldsServiceInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Filesystem/File.php b/libraries/src/Filesystem/File.php
index 67d1f762be162..c68d553f14a6e 100644
--- a/libraries/src/Filesystem/File.php
+++ b/libraries/src/Filesystem/File.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Filesystem/FilesystemHelper.php b/libraries/src/Filesystem/FilesystemHelper.php
index 7eea1d2e823ac..aad0a7b05f112 100644
--- a/libraries/src/Filesystem/FilesystemHelper.php
+++ b/libraries/src/Filesystem/FilesystemHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Filesystem/Folder.php b/libraries/src/Filesystem/Folder.php
index 889b32f114fa7..449570051cef3 100644
--- a/libraries/src/Filesystem/Folder.php
+++ b/libraries/src/Filesystem/Folder.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Filesystem/Meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini b/libraries/src/Filesystem/Meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini
index a78e0e3247894..96241fb3bf813 100644
--- a/libraries/src/Filesystem/Meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini
+++ b/libraries/src/Filesystem/Meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/libraries/src/Filesystem/Patcher.php b/libraries/src/Filesystem/Patcher.php
index 9ba318bf5d8ec..82de9f20336eb 100644
--- a/libraries/src/Filesystem/Patcher.php
+++ b/libraries/src/Filesystem/Patcher.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Filesystem/Path.php b/libraries/src/Filesystem/Path.php
index 28b1d4ad0c99c..f76add648db77 100644
--- a/libraries/src/Filesystem/Path.php
+++ b/libraries/src/Filesystem/Path.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Filesystem/Stream.php b/libraries/src/Filesystem/Stream.php
index 9560cf4935998..3d4c8d4d95281 100644
--- a/libraries/src/Filesystem/Stream.php
+++ b/libraries/src/Filesystem/Stream.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Filesystem/Streams/StreamString.php b/libraries/src/Filesystem/Streams/StreamString.php
index 8064d9cdc3ba6..c67c57dd4ecbb 100644
--- a/libraries/src/Filesystem/Streams/StreamString.php
+++ b/libraries/src/Filesystem/Streams/StreamString.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Filesystem/Support/Stringcontroller.php b/libraries/src/Filesystem/Support/Stringcontroller.php
index 782f68f9b391f..648b6193b2e53 100644
--- a/libraries/src/Filesystem/Support/Stringcontroller.php
+++ b/libraries/src/Filesystem/Support/Stringcontroller.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Filter/InputFilter.php b/libraries/src/Filter/InputFilter.php
index 8a3387c83d3b2..1bdbefb1bc296 100644
--- a/libraries/src/Filter/InputFilter.php
+++ b/libraries/src/Filter/InputFilter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -148,6 +148,7 @@ public function emailToPunycode($text)
 	 * null_byte                   Prevent files with a null byte in their name (buffer overflow attack)
 	 * forbidden_extensions        Do not allow these strings anywhere in the file's extension
 	 * php_tag_in_content          Do not allow `<?php` tag in content
+	 * phar_stub_in_content        Do not allow the `__HALT_COMPILER()` phar stub in content
 	 * shorttag_in_content         Do not allow short tag `<?` in content
 	 * shorttag_extensions         Which file extensions to scan for short tags in content
 	 * fobidden_ext_in_content     Do not allow forbidden_extensions anywhere in content
@@ -181,6 +182,9 @@ public static function isSafeFile($file, $options = array())
 			// <? tag in file contents
 			'shorttag_in_content'        => true,
 
+			// __HALT_COMPILER()
+			'phar_stub_in_content'        => true,
+
 			// Which file extensions to scan for short tags
 			'shorttag_extensions'        => array(
 				'inc', 'phps', 'class', 'php3', 'php4', 'php5', 'txt', 'dat', 'tpl', 'tmpl',
@@ -283,7 +287,7 @@ public static function isSafeFile($file, $options = array())
 
 				// 3. File contents scanner (PHP tag in file contents)
 				if ($options['php_tag_in_content']
-					|| $options['shorttag_in_content']
+					|| $options['shorttag_in_content'] || $options['phar_stub_in_content']
 					|| ($options['fobidden_ext_in_content'] && !empty($options['forbidden_extensions'])))
 				{
 					$fp = @fopen($tempName, 'r');
@@ -296,7 +300,12 @@ public static function isSafeFile($file, $options = array())
 						{
 							$data .= @fread($fp, 131072);
 
-							if ($options['php_tag_in_content'] && stristr($data, '<?php'))
+							if ($options['php_tag_in_content'] && stripos($data, '<?php') !== false)
+							{
+								return false;
+							}
+
+							if ($options['phar_stub_in_content'] && stripos($data, '__HALT_COMPILER()') !== false)
 							{
 								return false;
 							}
diff --git a/libraries/src/Filter/OutputFilter.php b/libraries/src/Filter/OutputFilter.php
index 87e04aeea43d8..ae0fa06fa6084 100644
--- a/libraries/src/Filter/OutputFilter.php
+++ b/libraries/src/Filter/OutputFilter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/AccesslevelField.php b/libraries/src/Form/Field/AccesslevelField.php
index 8892ae8fbc75b..15050cd31475b 100644
--- a/libraries/src/Form/Field/AccesslevelField.php
+++ b/libraries/src/Form/Field/AccesslevelField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/AliastagField.php b/libraries/src/Form/Field/AliastagField.php
index 1ec1d40a8c965..540a0dcd8a85a 100644
--- a/libraries/src/Form/Field/AliastagField.php
+++ b/libraries/src/Form/Field/AliastagField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,17 +12,14 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Path;
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\Language\Text;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Form Field class for the Joomla Framework.
  *
  * @since  2.5.0
  */
-class AliastagField extends \JFormFieldList
+class AliastagField extends ListField
 {
 	/**
 	 * The field type.
diff --git a/libraries/src/Form/Field/AuthorField.php b/libraries/src/Form/Field/AuthorField.php
index 3289d0ab51a63..6bb208a594f82 100644
--- a/libraries/src/Form/Field/AuthorField.php
+++ b/libraries/src/Form/Field/AuthorField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,16 +11,13 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('list');
 
 /**
  * Form Field to load a list of content authors
  *
  * @since  3.2
  */
-class AuthorField extends \JFormFieldList
+class AuthorField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/CachehandlerField.php b/libraries/src/Form/Field/CachehandlerField.php
index b1e426707c0c1..1ef2edca8046a 100644
--- a/libraries/src/Form/Field/CachehandlerField.php
+++ b/libraries/src/Form/Field/CachehandlerField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,12 +11,9 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Cache\Cache;
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Form Field class for the Joomla Platform.
  * Provides a list of available cache handlers
@@ -24,7 +21,7 @@
  * @see    JCache
  * @since  1.7.0
  */
-class CachehandlerField extends \JFormFieldList
+class CachehandlerField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/CalendarField.php b/libraries/src/Form/Field/CalendarField.php
index 294e8b0a9a321..97293055bc02f 100644
--- a/libraries/src/Form/Field/CalendarField.php
+++ b/libraries/src/Form/Field/CalendarField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -205,6 +205,9 @@ protected function getInput()
 		{
 			$showTime = (string) $this->element['showtime'];
 
+			$lang  = Factory::getLanguage();
+			$debug = $lang->setDebug(false);
+
 			if ($showTime && $showTime != 'false')
 			{
 				$this->format = Text::_('DATE_FORMAT_CALENDAR_DATETIME');
@@ -213,6 +216,8 @@ protected function getInput()
 			{
 				$this->format = Text::_('DATE_FORMAT_CALENDAR_DATE');
 			}
+
+			$lang->setDebug($debug);
 		}
 
 		// If a known filter is given use it.
@@ -329,7 +334,7 @@ protected function getLayoutData()
 	 *
 	 * @return  mixed   The filtered value.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function filter($value, $group = null, Registry $input = null)
 	{
diff --git a/libraries/src/Form/Field/CaptchaField.php b/libraries/src/Form/Field/CaptchaField.php
index 1384330843550..b1d6ad0139f96 100644
--- a/libraries/src/Form/Field/CaptchaField.php
+++ b/libraries/src/Form/Field/CaptchaField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -29,6 +29,13 @@ class CaptchaField extends FormField
 	 */
 	protected $type = 'Captcha';
 
+	/**
+	 * The captcha base instance of our type.
+	 *
+	 * @var Captcha
+	 */
+	protected $_captcha;
+
 	/**
 	 * Method to get certain otherwise inaccessible properties from the form field object.
 	 *
@@ -109,6 +116,8 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
 		if ($plugin === 0 || $plugin === '0' || $plugin === '' || $plugin === null)
 		{
 			$this->hidden = true;
+
+			return false;
 		}
 		else
 		{
@@ -124,6 +133,26 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
 
 		$this->namespace = $this->element['namespace'] ? (string) $this->element['namespace'] : $this->form->getName();
 
+		try
+		{
+			// Get an instance of the captcha class that we are using
+			$this->_captcha = Captcha::getInstance($this->plugin, array('namespace' => $this->namespace));
+
+			/**
+			 * Give the captcha instance a possibility to react on the setup-process,
+			 * e.g. by altering the XML structure of the field, for example hiding the label
+			 * when using invisible captchas.
+			 */
+			$this->_captcha->setupField($this, $element);
+		}
+		catch (\RuntimeException $e)
+		{
+			$this->_captcha = null;
+			\JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+
+			return false;
+		}
+
 		return $result;
 	}
 
@@ -136,18 +165,19 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
 	 */
 	protected function getInput()
 	{
-		if ($this->hidden)
+		if ($this->hidden || $this->_captcha == null)
 		{
 			return '';
 		}
-		else
+
+		try
 		{
-			if (($captcha = Captcha::getInstance($this->plugin, array('namespace' => $this->namespace))) == null)
-			{
-				return '';
-			}
+			return $this->_captcha->display($this->name, $this->id, $this->class);
 		}
-
-		return $captcha->display($this->name, $this->id, $this->class);
+		catch (\RuntimeException $e)
+		{
+			\JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+		}
+		return '';
 	}
 }
diff --git a/libraries/src/Form/Field/CategoryField.php b/libraries/src/Form/Field/CategoryField.php
index 401ffb03353bc..5c2466831ba85 100644
--- a/libraries/src/Form/Field/CategoryField.php
+++ b/libraries/src/Form/Field/CategoryField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,20 +11,17 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Form Field class for the Joomla Platform.
  * Supports an HTML select list of categories
  *
  * @since  1.6
  */
-class CategoryField extends \JFormFieldList
+class CategoryField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/CheckboxField.php b/libraries/src/Form/Field/CheckboxField.php
index 6e43b6ee8170e..32aa3cd8597a1 100644
--- a/libraries/src/Form/Field/CheckboxField.php
+++ b/libraries/src/Form/Field/CheckboxField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/CheckboxesField.php b/libraries/src/Form/Field/CheckboxesField.php
index 8a8e1cd91a372..dcbc8fd98282d 100644
--- a/libraries/src/Form/Field/CheckboxesField.php
+++ b/libraries/src/Form/Field/CheckboxesField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,10 +10,6 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('list');
-
 /**
  * Form Field class for the Joomla Platform.
  * Displays options as a list of checkboxes.
@@ -22,7 +18,7 @@
  * @see    CheckboxesField
  * @since  1.7.0
  */
-class CheckboxesField extends \JFormFieldList
+class CheckboxesField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/ChromestyleField.php b/libraries/src/Form/Field/ChromestyleField.php
index d3125ee5ec524..499c9108a1a9d 100644
--- a/libraries/src/Form/Field/ChromestyleField.php
+++ b/libraries/src/Form/Field/ChromestyleField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,19 +12,17 @@
 
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Form\Form;
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
-FormHelper::loadFieldClass('groupedlist');
-
 /**
  * Chrome Styles field.
  *
  * @since  3.0
  */
-class ChromestyleField extends \JFormFieldGroupedList
+class ChromestyleField extends GroupedlistField
 {
 	/**
 	 * The form field type.
@@ -178,8 +176,17 @@ protected function getTemplateModuleStyles()
 	{
 		$moduleStyles = array();
 
-		$templates = array($this->getSystemTemplate());
-		$templates = array_merge($templates, $this->getTemplates());
+		// Global Layouts
+		$layouts = Folder::files(JPATH_SITE . '/layouts/chromes', '.*\.php');
+
+		foreach ($layouts as &$layout)
+		{
+			$layout = basename($layout, '.php');
+		}
+
+		$moduleStyles['system'] = $layouts;
+
+		$templates = $this->getTemplates();
 		$path      = JPATH_ADMINISTRATOR;
 
 		if ($this->clientId === 0)
@@ -189,44 +196,29 @@ protected function getTemplateModuleStyles()
 
 		foreach ($templates as $template)
 		{
-			$modulesFilePath = $path . '/templates/' . $template->element . '/html/modules.php';
+			$chromeLayoutPath = $path . '/templates/' . $template->element . '/html/layouts/chromes';
 
-			// Is there modules.php for that template?
-			if (file_exists($modulesFilePath))
+			if (!Folder::exists($chromeLayoutPath))
 			{
-				$modulesFileData = file_get_contents($modulesFilePath);
+				continue;
+			}
 
-				preg_match_all('/function[\s\t]*modChrome\_([a-z0-9\-\_]*)[\s\t]*\(/i', $modulesFileData, $styles);
+			$layouts = Folder::files($chromeLayoutPath, '.*\.php');
 
-				if (!array_key_exists($template->element, $moduleStyles))
+			if ($layouts)
+			{
+				foreach ($layouts as &$layout)
 				{
-					$moduleStyles[$template->element] = array();
+					$layout = basename($layout, '.php');
 				}
 
-				$moduleStyles[$template->element] = $styles[1];
+				$moduleStyles[$template->element] = $layouts;
 			}
 		}
 
 		return $moduleStyles;
 	}
 
-	/**
-	 * Method to get the system template as an object.
-	 *
-	 * @return  \stdClass  The object of system template.
-	 *
-	 * @since   3.0
-	 */
-	protected function getSystemTemplate()
-	{
-		$template = new \stdClass;
-		$template->element = 'system';
-		$template->name    = 'system';
-		$template->enabled = 1;
-
-		return $template;
-	}
-
 	/**
 	 * Return a list of templates
 	 *
@@ -242,10 +234,11 @@ protected function getTemplates()
 		$query = $db->getQuery(true);
 
 		// Build the query.
-		$query->select('element, name, enabled')
+		$query->select('element, name')
 			->from('#__extensions')
 			->where('client_id = ' . $this->clientId)
-			->where('type = ' . $db->quote('template'));
+			->where('type = ' . $db->quote('template'))
+			->where('enabled = 1');
 
 		// Set the query and load the templates.
 		$db->setQuery($query);
diff --git a/libraries/src/Form/Field/ColorField.php b/libraries/src/Form/Field/ColorField.php
index e65c0c786306f..3fe404c6521fb 100644
--- a/libraries/src/Form/Field/ColorField.php
+++ b/libraries/src/Form/Field/ColorField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/ComboField.php b/libraries/src/Form/Field/ComboField.php
index 3b019ef7e5713..76f25db6283bd 100644
--- a/libraries/src/Form/Field/ComboField.php
+++ b/libraries/src/Form/Field/ComboField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,17 +10,13 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('list');
-
 /**
  * Form Field class for the Joomla Platform.
  * Implements a combo box field.
  *
  * @since  1.7.0
  */
-class ComboField extends \JFormFieldList
+class ComboField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/ComponentlayoutField.php b/libraries/src/Form/Field/ComponentlayoutField.php
index d939b5506a313..7d162777c2761 100644
--- a/libraries/src/Form/Field/ComponentlayoutField.php
+++ b/libraries/src/Form/Field/ComponentlayoutField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/ComponentsField.php b/libraries/src/Form/Field/ComponentsField.php
index 9d5b1f6fbec0a..89f94cb75b84a 100644
--- a/libraries/src/Form/Field/ComponentsField.php
+++ b/libraries/src/Form/Field/ComponentsField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,18 +11,15 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\Utilities\ArrayHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Form Field class for the Joomla Framework.
  *
  * @since  3.7.0
  */
-class ComponentsField extends \JFormFieldList
+class ComponentsField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/ContenthistoryField.php b/libraries/src/Form/Field/ContenthistoryField.php
index 1bc9e290407c2..c721bb1afdf18 100644
--- a/libraries/src/Form/Field/ContenthistoryField.php
+++ b/libraries/src/Form/Field/ContenthistoryField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/ContentlanguageField.php b/libraries/src/Form/Field/ContentlanguageField.php
index 07de7c645cffd..66562c7252fb2 100644
--- a/libraries/src/Form/Field/ContentlanguageField.php
+++ b/libraries/src/Form/Field/ContentlanguageField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,18 +10,15 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Provides a list of content languages
  *
  * @see    JFormFieldLanguage for a select list of application languages.
  * @since  1.6
  */
-class ContentlanguageField extends \JFormFieldList
+class ContentlanguageField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/ContenttypeField.php b/libraries/src/Form/Field/ContenttypeField.php
index d1c5b6caa064b..d58f6f256056b 100644
--- a/libraries/src/Form/Field/ContenttypeField.php
+++ b/libraries/src/Form/Field/ContenttypeField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,17 +11,14 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\Language\Text;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Content Type field.
  *
  * @since  3.1
  */
-class ContenttypeField extends \JFormFieldList
+class ContenttypeField extends ListField
 {
 	/**
 	 * A flexible tag list that respects access controls
diff --git a/libraries/src/Form/Field/DatabaseconnectionField.php b/libraries/src/Form/Field/DatabaseconnectionField.php
index 30d80ef2f7b63..28b002fd02a5b 100644
--- a/libraries/src/Form/Field/DatabaseconnectionField.php
+++ b/libraries/src/Form/Field/DatabaseconnectionField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,12 +10,9 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\Database\DatabaseDriver;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Form Field class for the Joomla Platform.
  * Provides a list of available database connections, optionally limiting to
@@ -24,7 +21,7 @@
  * @see    DatabaseDriver
  * @since  1.7.3
  */
-class DatabaseconnectionField extends \JFormFieldList
+class DatabaseconnectionField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/EditorField.php b/libraries/src/Form/Field/EditorField.php
index 3348be1c0c05a..c0a725c9a76e0 100644
--- a/libraries/src/Form/Field/EditorField.php
+++ b/libraries/src/Form/Field/EditorField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,9 +12,6 @@
 
 use Joomla\CMS\Editor\Editor;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('textarea');
 
 /**
  * A textarea field for content creation
@@ -22,7 +19,7 @@
  * @see    JEditor
  * @since  1.6
  */
-class EditorField extends \JFormFieldTextarea
+class EditorField extends TextareaField
 {
 	/**
 	 * The form field type.
@@ -329,7 +326,9 @@ protected function getEditor()
 	 *
 	 * @return  string  The JEditor object output.
 	 *
-	 * @since   1.6
+	 * @since       1.6
+	 * @deprecated  4.0  Will be removed without replacement
+	 * @see         Editor::save()
 	 */
 	public function save()
 	{
diff --git a/libraries/src/Form/Field/EmailField.php b/libraries/src/Form/Field/EmailField.php
index de562b51ff909..bc6c0896ef5bf 100644
--- a/libraries/src/Form/Field/EmailField.php
+++ b/libraries/src/Form/Field/EmailField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,10 +10,6 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('text');
-
 /**
  * Form Field class for the Joomla Platform.
  * Provides and input field for email addresses
@@ -22,7 +18,7 @@
  * @see    JFormRuleEmail
  * @since  1.7.0
  */
-class EmailField extends \JFormFieldText
+class EmailField extends TextField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/FileField.php b/libraries/src/Form/Field/FileField.php
index 185e9aad682fc..8d7a69d3a9996 100644
--- a/libraries/src/Form/Field/FileField.php
+++ b/libraries/src/Form/Field/FileField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/FilelistField.php b/libraries/src/Form/Field/FilelistField.php
index 59d4a4c3cb31e..37b4f068bfc5a 100644
--- a/libraries/src/Form/Field/FilelistField.php
+++ b/libraries/src/Form/Field/FilelistField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,21 +10,18 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\Filesystem\File;
 use Joomla\Filesystem\Folder;
 use Joomla\Filesystem\Path;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Supports an HTML select list of files
  *
  * @since  1.7.0
  */
-class FilelistField extends \JFormFieldList
+class FilelistField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/FolderlistField.php b/libraries/src/Form/Field/FolderlistField.php
index 54082c5485364..84109efdedacc 100644
--- a/libraries/src/Form/Field/FolderlistField.php
+++ b/libraries/src/Form/Field/FolderlistField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,20 +10,17 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\Filesystem\Folder;
 use Joomla\Filesystem\Path;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Supports an HTML select list of folder
  *
  * @since  1.7.0
  */
-class FolderlistField extends \JFormFieldList
+class FolderlistField extends ListField
 {
 	/**
 	 * The form field type.
@@ -226,7 +223,7 @@ protected function getOptions()
 				}
 
 				// Remove the root part and the leading /
-				$folder = trim(str_replace($path, '', $folder), '/');
+				$folder = trim(str_replace($path, '', $folder), DIRECTORY_SEPARATOR);
 
 				$options[] = HTMLHelper::_('select.option', $folder, $folder);
 			}
diff --git a/libraries/src/Form/Field/FrontendlanguageField.php b/libraries/src/Form/Field/FrontendlanguageField.php
index f529e1f75c8b7..3c2fcc49394c5 100644
--- a/libraries/src/Form/Field/FrontendlanguageField.php
+++ b/libraries/src/Form/Field/FrontendlanguageField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,9 +11,6 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('list');
 
 /**
  * Provides a list of published content languages with home pages
@@ -21,7 +18,7 @@
  * @see    JFormFieldLanguage for a select list of application languages.
  * @since  3.5
  */
-class FrontendlanguageField extends \JFormFieldList
+class FrontendlanguageField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/GroupedlistField.php b/libraries/src/Form/Field/GroupedlistField.php
index 7abc527e59e75..1a64b7633d2b0 100644
--- a/libraries/src/Form/Field/GroupedlistField.php
+++ b/libraries/src/Form/Field/GroupedlistField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/HeadertagField.php b/libraries/src/Form/Field/HeadertagField.php
index 66524b3af798a..042a3e6d27617 100644
--- a/libraries/src/Form/Field/HeadertagField.php
+++ b/libraries/src/Form/Field/HeadertagField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,17 +10,14 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Form Field class for the Joomla! CMS.
  *
  * @since  3.0
  */
-class HeadertagField extends \JFormFieldList
+class HeadertagField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/HelpsiteField.php b/libraries/src/Form/Field/HelpsiteField.php
index 6854a70b9d164..7a6c4b66b9735 100644
--- a/libraries/src/Form/Field/HelpsiteField.php
+++ b/libraries/src/Form/Field/HelpsiteField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,20 +10,17 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\Help\Help;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Form Field class for the Joomla Platform.
  * Provides a select list of help sites.
  *
  * @since  1.6
  */
-class HelpsiteField extends \JFormFieldList
+class HelpsiteField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/HiddenField.php b/libraries/src/Form/Field/HiddenField.php
index 6a2589f4d77dd..3b86400300641 100644
--- a/libraries/src/Form/Field/HiddenField.php
+++ b/libraries/src/Form/Field/HiddenField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/ImagelistField.php b/libraries/src/Form/Field/ImagelistField.php
index ae21a35c626a3..438972557e2e5 100644
--- a/libraries/src/Form/Field/ImagelistField.php
+++ b/libraries/src/Form/Field/ImagelistField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,16 +10,12 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('filelist');
-
 /**
  * Supports an HTML select list of image
  *
  * @since  1.7.0
  */
-class ImagelistField extends \JFormFieldFileList
+class ImagelistField extends FilelistField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/IntegerField.php b/libraries/src/Form/Field/IntegerField.php
index bf43b70394702..4ed5f9a7cb3ba 100644
--- a/libraries/src/Form/Field/IntegerField.php
+++ b/libraries/src/Form/Field/IntegerField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,18 +10,15 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Form Field class for the Joomla Platform.
  * Provides a select list of integers with specified first, last and step values.
  *
  * @since  1.7.0
  */
-class IntegerField extends \JFormFieldList
+class IntegerField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/LanguageField.php b/libraries/src/Form/Field/LanguageField.php
index e9123ee978574..71ce185ed0f42 100644
--- a/libraries/src/Form/Field/LanguageField.php
+++ b/libraries/src/Form/Field/LanguageField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,11 +12,8 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\Language\LanguageHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Form Field class for the Joomla Platform.
  * Supports a list of installed application languages
@@ -24,7 +21,7 @@
  * @see    JFormFieldContentLanguage for a select list of content languages.
  * @since  1.7.0
  */
-class LanguageField extends \JFormFieldList
+class LanguageField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/LastvisitdaterangeField.php b/libraries/src/Form/Field/LastvisitdaterangeField.php
index 018dc62158e77..915e624b4fef7 100644
--- a/libraries/src/Form/Field/LastvisitdaterangeField.php
+++ b/libraries/src/Form/Field/LastvisitdaterangeField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,16 +12,13 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('predefinedlist');
 
 /**
  * Field to show a list of available date ranges to filter on last visit date.
  *
  * @since  3.6
  */
-class LastvisitdaterangeField extends \JFormFieldPredefinedList
+class LastvisitdaterangeField extends PredefinedlistField
 {
 	/**
 	 * Method to instantiate the form field object.
diff --git a/libraries/src/Form/Field/LimitboxField.php b/libraries/src/Form/Field/LimitboxField.php
index 870e4b93e6b62..92189ecec9cd5 100644
--- a/libraries/src/Form/Field/LimitboxField.php
+++ b/libraries/src/Form/Field/LimitboxField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,17 +10,14 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\Language\Text;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Field to load a list of posible item count limits
  *
  * @since  3.2
  */
-class LimitboxField extends \JFormFieldList
+class LimitboxField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/ListField.php b/libraries/src/Form/Field/ListField.php
index 4ae875a722d0c..3e4028a78f590 100644
--- a/libraries/src/Form/Field/ListField.php
+++ b/libraries/src/Form/Field/ListField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,6 +13,7 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Multilanguage;
@@ -129,6 +130,14 @@ protected function getOptions()
 			$tmp['onclick']  = (string) $option['onclick'];
 			$tmp['onchange'] = (string) $option['onchange'];
 
+			if ((string) $option['showon'])
+			{
+				$tmp['optionattr'] = " data-showon='" .
+					json_encode(
+						FormHelper::parseShowOnConditions((string) $option['showon'], $this->formControl, $this->group)
+					)
+					. "'";
+			}
 			// Add the option object to the result set.
 			$options[] = (object) $tmp;
 		}
diff --git a/libraries/src/Form/Field/MediaField.php b/libraries/src/Form/Field/MediaField.php
index eaf05fb109315..9cf190cdcec93 100644
--- a/libraries/src/Form/Field/MediaField.php
+++ b/libraries/src/Form/Field/MediaField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/MenuField.php b/libraries/src/Form/Field/MenuField.php
index 0533e8c105531..db29c743709c0 100644
--- a/libraries/src/Form/Field/MenuField.php
+++ b/libraries/src/Form/Field/MenuField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,20 +11,17 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\Language\Text;
 
 // Import the com_menus helper.
 require_once realpath(JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
 
-FormHelper::loadFieldClass('GroupedList');
-
 /**
  * Supports an HTML select list of menus
  *
  * @since  1.6
  */
-class MenuField extends \JFormFieldGroupedList
+class MenuField extends GroupedlistField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/MenuitemField.php b/libraries/src/Form/Field/MenuitemField.php
index 06894c7c08355..50493f5c9cdd3 100644
--- a/libraries/src/Form/Field/MenuitemField.php
+++ b/libraries/src/Form/Field/MenuitemField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,12 +11,9 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
 
-FormHelper::loadFieldClass('groupedlist');
-
 // Import the com_menus helper.
 require_once realpath(JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
 
@@ -25,7 +22,7 @@
  *
  * @since  1.6
  */
-class MenuitemField extends \JFormFieldGroupedList
+class MenuitemField extends GroupedlistField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/MeterField.php b/libraries/src/Form/Field/MeterField.php
index 187f5b97512ea..1aa308a065ec9 100644
--- a/libraries/src/Form/Field/MeterField.php
+++ b/libraries/src/Form/Field/MeterField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,6 +10,8 @@
 
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Form\FormField;
+
 /**
  * Form Field class for the Joomla Platform.
  * Provides a meter to show value in a range.
@@ -17,7 +19,7 @@
  * @link   http://www.w3.org/TR/html-markup/input.text.html#input.text
  * @since  3.2
  */
-class MeterField extends \JFormField
+class MeterField extends FormField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/ModulelayoutField.php b/libraries/src/Form/Field/ModulelayoutField.php
index 8706622b203b3..29b3af45d3cff 100644
--- a/libraries/src/Form/Field/ModulelayoutField.php
+++ b/libraries/src/Form/Field/ModulelayoutField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/ModuleorderField.php b/libraries/src/Form/Field/ModuleorderField.php
index fe41e75d4f5ef..61e8c902d5ab1 100644
--- a/libraries/src/Form/Field/ModuleorderField.php
+++ b/libraries/src/Form/Field/ModuleorderField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/ModulepositionField.php b/libraries/src/Form/Field/ModulepositionField.php
index 721cfb937f9d9..90637a4fa3ba2 100644
--- a/libraries/src/Form/Field/ModulepositionField.php
+++ b/libraries/src/Form/Field/ModulepositionField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,18 +13,15 @@
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
-FormHelper::loadFieldClass('text');
-
 /**
  * Module Position field.
  *
  * @since  1.6
  */
-class ModulepositionField extends \JFormFieldText
+class ModulepositionField extends TextField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/ModuletagField.php b/libraries/src/Form/Field/ModuletagField.php
index 66c008ba74583..92b1764e2a54a 100644
--- a/libraries/src/Form/Field/ModuletagField.php
+++ b/libraries/src/Form/Field/ModuletagField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,17 +10,14 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Module Tag field.
  *
  * @since  3.0
  */
-class ModuletagField extends \JFormFieldList
+class ModuletagField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/NoteField.php b/libraries/src/Form/Field/NoteField.php
index c224021509e37..12e3cc41c0d7c 100644
--- a/libraries/src/Form/Field/NoteField.php
+++ b/libraries/src/Form/Field/NoteField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/NumberField.php b/libraries/src/Form/Field/NumberField.php
index dbab2f7262bff..9e8658055c79a 100644
--- a/libraries/src/Form/Field/NumberField.php
+++ b/libraries/src/Form/Field/NumberField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/OrderingField.php b/libraries/src/Form/Field/OrderingField.php
index adf36707d9d0c..58e6dce1cd946 100644
--- a/libraries/src/Form/Field/OrderingField.php
+++ b/libraries/src/Form/Field/OrderingField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/PasswordField.php b/libraries/src/Form/Field/PasswordField.php
index 4f15ead1c51cc..9625ed5fc9664 100644
--- a/libraries/src/Form/Field/PasswordField.php
+++ b/libraries/src/Form/Field/PasswordField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/PluginsField.php b/libraries/src/Form/Field/PluginsField.php
index d059920a66fe2..4ac265dd22c8c 100644
--- a/libraries/src/Form/Field/PluginsField.php
+++ b/libraries/src/Form/Field/PluginsField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/PluginstatusField.php b/libraries/src/Form/Field/PluginstatusField.php
index 0fe9ce750bd9e..964120e24e852 100644
--- a/libraries/src/Form/Field/PluginstatusField.php
+++ b/libraries/src/Form/Field/PluginstatusField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,16 +10,12 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('predefinedlist');
-
 /**
  * Plugin Status field.
  *
  * @since  3.5
  */
-class PluginstatusField extends \JFormFieldPredefinedList
+class PluginstatusField extends PredefinedlistField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/PredefinedlistField.php b/libraries/src/Form/Field/PredefinedlistField.php
index 9ff03fcda2833..60e1e9e1317c1 100644
--- a/libraries/src/Form/Field/PredefinedlistField.php
+++ b/libraries/src/Form/Field/PredefinedlistField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/RadioField.php b/libraries/src/Form/Field/RadioField.php
index c1cc792b54e4d..fbbf01a7507f8 100644
--- a/libraries/src/Form/Field/RadioField.php
+++ b/libraries/src/Form/Field/RadioField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,10 +10,6 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('list');
-
 /**
  * Form Field class for the Joomla Platform.
  * Provides radio button inputs
@@ -21,7 +17,7 @@
  * @link   http://www.w3.org/TR/html-markup/command.radio.html#command.radio
  * @since  1.7.0
  */
-class RadioField extends \JFormFieldList
+class RadioField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/RadiobasicField.php b/libraries/src/Form/Field/RadiobasicField.php
index 9ef7f671568c7..eda58c2a42d13 100644
--- a/libraries/src/Form/Field/RadiobasicField.php
+++ b/libraries/src/Form/Field/RadiobasicField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,17 +10,13 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('list');
-
 /**
  * Form Field class for the Joomla Platform.
  * Provides radio button inputs using default styling
  *
  * @since  4.0.0
  */
-class RadiobasicField extends \JFormFieldList
+class RadiobasicField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/RangeField.php b/libraries/src/Form/Field/RangeField.php
index e1398d8732f9d..53aed40dcf185 100644
--- a/libraries/src/Form/Field/RangeField.php
+++ b/libraries/src/Form/Field/RangeField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,10 +10,6 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('number');
-
 /**
  * Form Field class for the Joomla Platform.
  * Provides a horizontal scroll bar to specify a value in a range.
@@ -21,7 +17,7 @@
  * @link   http://www.w3.org/TR/html-markup/input.text.html#input.text
  * @since  3.2
  */
-class RangeField extends \JFormFieldNumber
+class RangeField extends NumberField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/RedirectStatusField.php b/libraries/src/Form/Field/RedirectStatusField.php
index 47f40b1909db5..ca30bb5d63928 100644
--- a/libraries/src/Form/Field/RedirectStatusField.php
+++ b/libraries/src/Form/Field/RedirectStatusField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,16 +10,12 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('predefinedlist');
-
 /**
  * Redirect Status field.
  *
  * @since  3.8.0
  */
-class RedirectStatusField extends \JFormFieldPredefinedList
+class RedirectStatusField extends PredefinedlistField
 {
 	/**
 	 * The form field type.
@@ -39,6 +35,7 @@ class RedirectStatusField extends \JFormFieldPredefinedList
 		'-2' => 'JTRASHED',
 		'0'  => 'JDISABLED',
 		'1'  => 'JENABLED',
+		'2'  => 'JARCHIVED',
 		'*'  => 'JALL',
 	);
 }
diff --git a/libraries/src/Form/Field/RegistrationdaterangeField.php b/libraries/src/Form/Field/RegistrationdaterangeField.php
index 5f9c936c3942b..75537128c5639 100644
--- a/libraries/src/Form/Field/RegistrationdaterangeField.php
+++ b/libraries/src/Form/Field/RegistrationdaterangeField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,16 +12,13 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('predefinedlist');
 
 /**
  * Registration Date Range field.
  *
  * @since  3.2
  */
-class RegistrationdaterangeField extends \JFormFieldPredefinedList
+class RegistrationdaterangeField extends PredefinedlistField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/RulesField.php b/libraries/src/Form/Field/RulesField.php
index 97180c907dd89..6bc65e7b4ff00 100644
--- a/libraries/src/Form/Field/RulesField.php
+++ b/libraries/src/Form/Field/RulesField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/SessionhandlerField.php b/libraries/src/Form/Field/SessionhandlerField.php
index 6b79cf277841e..7f4b9fb2137dc 100644
--- a/libraries/src/Form/Field/SessionhandlerField.php
+++ b/libraries/src/Form/Field/SessionhandlerField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,20 +10,17 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\Session\Session;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Form Field class for the Joomla Platform.
  * Provides a select list of session handler options.
  *
  * @since  1.7.0
  */
-class SessionhandlerField extends \JFormFieldList
+class SessionhandlerField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/SpacerField.php b/libraries/src/Form/Field/SpacerField.php
index f2b715a5dd861..61555dab6a3cb 100644
--- a/libraries/src/Form/Field/SpacerField.php
+++ b/libraries/src/Form/Field/SpacerField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/SqlField.php b/libraries/src/Form/Field/SqlField.php
index b2e71483fef31..05bae695140a1 100644
--- a/libraries/src/Form/Field/SqlField.php
+++ b/libraries/src/Form/Field/SqlField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,20 +11,17 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\Database\DatabaseQuery;
 use Joomla\Database\Exception\ExecutionFailureException;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Supports a custom SQL select list
  *
  * @since  1.7.0
  */
-class SQLField extends \JFormFieldList
+class SQLField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/StatusField.php b/libraries/src/Form/Field/StatusField.php
index 2aed50f340ae4..82f838d49152e 100644
--- a/libraries/src/Form/Field/StatusField.php
+++ b/libraries/src/Form/Field/StatusField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,16 +10,12 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('predefinedlist');
-
 /**
  * Form Field to load a list of states
  *
  * @since  3.2
  */
-class StatusField extends \JFormFieldPredefinedList
+class StatusField extends PredefinedlistField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/SubformField.php b/libraries/src/Form/Field/SubformField.php
index 623316a8d984a..b6ee3b03937d4 100644
--- a/libraries/src/Form/Field/SubformField.php
+++ b/libraries/src/Form/Field/SubformField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -235,7 +235,7 @@ protected function getInput()
 		try
 		{
 			// Prepare the form template
-			$formname    = 'subform.' . str_replace(array('[', ']'), array('.', ''), $control);
+			$formname    = 'subform.' . str_replace(array('jform[', '[', ']'), array('', '.', ''), $control);
 			$tmplcontrol = !$this->multiple ? $control : $control . '[' . $this->fieldname . 'X]';
 			$tmpl = Form::getInstance($formname, $this->formsource, array('control' => $tmplcontrol));
 
@@ -277,6 +277,14 @@ protected function getInput()
 		$data['fieldname'] = $this->fieldname;
 		$data['groupByFieldset'] = $this->groupByFieldset;
 
+		/**
+		 * For each rendering process of a subform element, we want to have a
+		 * separate unique subform id present to could distinguish the eventhandlers
+		 * regarding adding/moving/removing rows from nested subforms from their parents.
+		 */
+		static $unique_subform_id = 0;
+		$data['unique_subform_id'] = ('sr-' . ($unique_subform_id++));
+
 		// Prepare renderer
 		$renderer = $this->getRenderer($this->layout);
 
diff --git a/libraries/src/Form/Field/TagField.php b/libraries/src/Form/Field/TagField.php
index a402f83d2f788..d27b8a610ae4e 100644
--- a/libraries/src/Form/Field/TagField.php
+++ b/libraries/src/Form/Field/TagField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/TelephoneField.php b/libraries/src/Form/Field/TelephoneField.php
index f019d5d746bd6..81be93612905f 100644
--- a/libraries/src/Form/Field/TelephoneField.php
+++ b/libraries/src/Form/Field/TelephoneField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,10 +10,6 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('text');
-
 /**
  * Form Field class for the Joomla Platform.
  * Supports a text field telephone numbers.
@@ -23,7 +19,7 @@
  * @see    JHtmlTel for rendering of telephone numbers
  * @since  1.7.0
  */
-class TelephoneField extends \JFormFieldText
+class TelephoneField extends TextField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/TemplatestyleField.php b/libraries/src/Form/Field/TemplatestyleField.php
index a056d4ff9994d..2323f2ecb6ac5 100644
--- a/libraries/src/Form/Field/TemplatestyleField.php
+++ b/libraries/src/Form/Field/TemplatestyleField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,18 +12,15 @@
 
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
-FormHelper::loadFieldClass('groupedlist');
-
 /**
  * Supports a select grouped list of template styles
  *
  * @since  1.6
  */
-class TemplatestyleField extends \JFormFieldGroupedList
+class TemplatestyleField extends GroupedlistField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/TextField.php b/libraries/src/Form/Field/TextField.php
index 27f365ca1ae96..9ee8086946973 100644
--- a/libraries/src/Form/Field/TextField.php
+++ b/libraries/src/Form/Field/TextField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\CMS\Form\Field;
diff --git a/libraries/src/Form/Field/TextareaField.php b/libraries/src/Form/Field/TextareaField.php
index f090ca72834ac..8abd91d90a725 100644
--- a/libraries/src/Form/Field/TextareaField.php
+++ b/libraries/src/Form/Field/TextareaField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/TimezoneField.php b/libraries/src/Form/Field/TimezoneField.php
index f32e4e88b6fc1..855de0b248b37 100644
--- a/libraries/src/Form/Field/TimezoneField.php
+++ b/libraries/src/Form/Field/TimezoneField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,17 +10,14 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 
-FormHelper::loadFieldClass('groupedlist');
-
 /**
  * Form Field class for the Joomla Platform.
  *
  * @since  1.7.0
  */
-class TimezoneField extends \JFormFieldGroupedList
+class TimezoneField extends GroupedlistField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/TransitionField.php b/libraries/src/Form/Field/TransitionField.php
index d7d3d2ef670e2..3e4166908d4a8 100644
--- a/libraries/src/Form/Field/TransitionField.php
+++ b/libraries/src/Form/Field/TransitionField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,14 +11,11 @@
 defined('JPATH_BASE') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Workflow\Workflow;
 use Joomla\Utilities\ArrayHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Components Category field.
  *
diff --git a/libraries/src/Form/Field/UrlField.php b/libraries/src/Form/Field/UrlField.php
index d25b782e396fe..8b2876166684c 100644
--- a/libraries/src/Form/Field/UrlField.php
+++ b/libraries/src/Form/Field/UrlField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,10 +10,6 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('text');
-
 /**
  * Form Field class for the Joomla Platform.
  * Supports a URL text field
@@ -22,7 +18,7 @@
  * @see    JFormRuleUrl for validation of full urls
  * @since  1.7.0
  */
-class UrlField extends \JFormFieldText
+class UrlField extends TextField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/UserField.php b/libraries/src/Form/Field/UserField.php
index 3b12b40349f88..74d91875bcaca 100644
--- a/libraries/src/Form/Field/UserField.php
+++ b/libraries/src/Form/Field/UserField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/UseractiveField.php b/libraries/src/Form/Field/UseractiveField.php
index fe275840dd51b..96322e7da1dfa 100644
--- a/libraries/src/Form/Field/UseractiveField.php
+++ b/libraries/src/Form/Field/UseractiveField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,16 +12,13 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('predefinedlist');
 
 /**
  * Field to show a list of available user active statuses
  *
  * @since  3.2
  */
-class UseractiveField extends \JFormFieldPredefinedList
+class UseractiveField extends PredefinedlistField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/UsergrouplistField.php b/libraries/src/Form/Field/UsergrouplistField.php
index 3f1fb28dd6342..978ed43a80fc9 100644
--- a/libraries/src/Form/Field/UsergrouplistField.php
+++ b/libraries/src/Form/Field/UsergrouplistField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,17 +12,14 @@
 
 use Joomla\CMS\Access\Access;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\Helper\UserGroupsHelper;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Field to load a dropdown list of available user groups
  *
  * @since  3.2
  */
-class UsergrouplistField extends \JFormFieldList
+class UsergrouplistField extends ListField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/UserstateField.php b/libraries/src/Form/Field/UserstateField.php
index 6059ec66e9d4b..d9d441d47d1eb 100644
--- a/libraries/src/Form/Field/UserstateField.php
+++ b/libraries/src/Form/Field/UserstateField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,16 +10,12 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('predefinedlist');
-
 /**
  * Field to load a list of available users statuses
  *
  * @since  3.2
  */
-class UserstateField extends \JFormFieldPredefinedList
+class UserstateField extends PredefinedlistField
 {
 	/**
 	 * The form field type.
diff --git a/libraries/src/Form/Field/WorkflowconditionField.php b/libraries/src/Form/Field/WorkflowconditionField.php
index f57c56bfef84e..ddfaf9029ed87 100644
--- a/libraries/src/Form/Field/WorkflowconditionField.php
+++ b/libraries/src/Form/Field/WorkflowconditionField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Field/WorkflowstageField.php b/libraries/src/Form/Field/WorkflowstageField.php
index ded63dc8ef147..1c6ae83eeaf72 100644
--- a/libraries/src/Form/Field/WorkflowstageField.php
+++ b/libraries/src/Form/Field/WorkflowstageField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -98,7 +98,12 @@ protected function getGroups()
 		// Select distinct stages for existing articles
 		$query
 				->select('DISTINCT ' . $db->quoteName('ws.id', 'workflow_stage_id'))
-				->select($db->quoteName(['ws.title', 'w.title', 'w.id', 'w.ordering'], ['workflow_stage_title', 'workflow_title', 'workflow_id', 'ordering']))
+				->select(
+					$db->quoteName(
+						['ws.title', 'w.title', 'w.id', 'w.ordering', 'ws.ordering'],
+						['workflow_stage_title', 'workflow_title', 'workflow_id', 'ordering', 'workflow_stage_ordering']
+					)
+				)
 				->from($db->quoteName('#__workflow_stages', 'ws'))
 				->from($db->quoteName('#__workflows', 'w'))
 				->where($db->quoteName('ws.workflow_id') . ' = ' . $db->quoteName('w.id'))
diff --git a/libraries/src/Form/Filter/IntarrayFilter.php b/libraries/src/Form/Filter/IntarrayFilter.php
index 649f6d6452447..5b7dcc79e8a10 100644
--- a/libraries/src/Form/Filter/IntarrayFilter.php
+++ b/libraries/src/Form/Filter/IntarrayFilter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -18,7 +18,7 @@
 /**
  * Form Filter class for integer arrays
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 class IntarrayFilter implements FormFilterInterface
 {
@@ -35,7 +35,7 @@ class IntarrayFilter implements FormFilterInterface
 	 *
 	 * @return  mixed   The filtered value.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function filter(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
 	{
diff --git a/libraries/src/Form/Filter/RawFilter.php b/libraries/src/Form/Filter/RawFilter.php
index 8f47fc3d0db24..57f7f27020123 100644
--- a/libraries/src/Form/Filter/RawFilter.php
+++ b/libraries/src/Form/Filter/RawFilter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,7 +17,7 @@
 /**
  * Form Filter class for raw values
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 class RawFilter implements FormFilterInterface
 {
@@ -34,7 +34,7 @@ class RawFilter implements FormFilterInterface
 	 *
 	 * @return  mixed   The filtered value.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function filter(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
 	{
diff --git a/libraries/src/Form/Filter/RulesFilter.php b/libraries/src/Form/Filter/RulesFilter.php
index 0c7f2f3613443..d18217e4ed8aa 100644
--- a/libraries/src/Form/Filter/RulesFilter.php
+++ b/libraries/src/Form/Filter/RulesFilter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,7 +17,7 @@
 /**
  * Form Filter class for rules
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 class RulesFilter implements FormFilterInterface
 {
@@ -34,7 +34,7 @@ class RulesFilter implements FormFilterInterface
 	 *
 	 * @return  mixed   The filtered value.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function filter(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
 	{
diff --git a/libraries/src/Form/Filter/SafehtmlFilter.php b/libraries/src/Form/Filter/SafehtmlFilter.php
index 4a594d9da5428..cb10d99b365ca 100644
--- a/libraries/src/Form/Filter/SafehtmlFilter.php
+++ b/libraries/src/Form/Filter/SafehtmlFilter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -18,7 +18,7 @@
 /**
  * Form Filter class for safe HTML
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 class SafehtmlFilter implements FormFilterInterface
 {
@@ -35,7 +35,7 @@ class SafehtmlFilter implements FormFilterInterface
 	 *
 	 * @return  mixed   The filtered value.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function filter(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
 	{
diff --git a/libraries/src/Form/Filter/TelFilter.php b/libraries/src/Form/Filter/TelFilter.php
index 198cf4be56a1b..e2d0142cdf7d8 100644
--- a/libraries/src/Form/Filter/TelFilter.php
+++ b/libraries/src/Form/Filter/TelFilter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,7 +17,7 @@
 /**
  * Form Filter class for phone numbers
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 class TelFilter implements FormFilterInterface
 {
@@ -34,7 +34,7 @@ class TelFilter implements FormFilterInterface
 	 *
 	 * @return  mixed   The filtered value.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function filter(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
 	{
diff --git a/libraries/src/Form/Filter/UnsetFilter.php b/libraries/src/Form/Filter/UnsetFilter.php
index df2a14d5156b3..de30426f1c596 100644
--- a/libraries/src/Form/Filter/UnsetFilter.php
+++ b/libraries/src/Form/Filter/UnsetFilter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,7 +17,7 @@
 /**
  * Form Filter class to unset
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 class UnsetFilter implements FormFilterInterface
 {
@@ -34,7 +34,7 @@ class UnsetFilter implements FormFilterInterface
 	 *
 	 * @return  mixed   The filtered value.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function filter(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
 	{
diff --git a/libraries/src/Form/Filter/UrlFilter.php b/libraries/src/Form/Filter/UrlFilter.php
index a6381a927743c..c2f929d44237f 100644
--- a/libraries/src/Form/Filter/UrlFilter.php
+++ b/libraries/src/Form/Filter/UrlFilter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -20,7 +20,7 @@
 /**
  * Form Filter class for URLs
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 class UrlFilter implements FormFilterInterface
 {
@@ -37,7 +37,7 @@ class UrlFilter implements FormFilterInterface
 	 *
 	 * @return  mixed   The filtered value.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function filter(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
 	{
diff --git a/libraries/src/Form/Form.php b/libraries/src/Form/Form.php
index 6e6c8d2a842fc..4080d8ed6d619 100644
--- a/libraries/src/Form/Form.php
+++ b/libraries/src/Form/Form.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -117,7 +117,7 @@ public function __construct($name, array $options = array())
 	 */
 	public function bind($data)
 	{
-		// Make sure there is a valid JForm XML document.
+		// Make sure there is a valid Form XML document.
 		if (!($this->xml instanceof \SimpleXMLElement))
 		{
 			throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__));
@@ -209,7 +209,7 @@ public function getErrors()
 	 */
 	public function getField($name, $group = null, $value = null)
 	{
-		// Make sure there is a valid JForm XML document.
+		// Make sure there is a valid Form XML document.
 		if (!($this->xml instanceof \SimpleXMLElement))
 		{
 			throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__));
@@ -243,7 +243,7 @@ public function getField($name, $group = null, $value = null)
 	 */
 	public function getFieldAttribute($name, $attribute, $default = null, $group = null)
 	{
-		// Make sure there is a valid JForm XML document.
+		// Make sure there is a valid Form XML document.
 		if (!($this->xml instanceof \SimpleXMLElement))
 		{
 			throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__));
@@ -271,7 +271,7 @@ public function getFieldAttribute($name, $attribute, $default = null, $group = n
 	 *
 	 * @param   string  $set  The optional name of the fieldset.
 	 *
-	 * @return  array  The array of JFormField objects in the fieldset.
+	 * @return  \JFormField[]  The array of JFormField objects in the fieldset.
 	 *
 	 * @since   1.7.0
 	 */
@@ -329,7 +329,7 @@ public function getFieldsets($group = null)
 		$fieldsets = array();
 		$sets = array();
 
-		// Make sure there is a valid JForm XML document.
+		// Make sure there is a valid Form XML document.
 		if (!($this->xml instanceof \SimpleXMLElement))
 		{
 			throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__));
@@ -446,7 +446,7 @@ public function getFormControl()
 	 * @param   boolean  $nested  True to also include fields in nested groups that are inside of the
 	 *                            group for which to find fields.
 	 *
-	 * @return  array    The array of JFormField objects in the field group.
+	 * @return  \JFormField[]  The array of JFormField objects in the field group.
 	 *
 	 * @since   1.7.0
 	 */
@@ -779,7 +779,7 @@ public function loadFile($file, $reset = true, $xpath = false)
 	 */
 	public function removeField($name, $group = null)
 	{
-		// Make sure there is a valid JForm XML document.
+		// Make sure there is a valid Form XML document.
 		if (!($this->xml instanceof \SimpleXMLElement))
 		{
 			throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__));
@@ -812,7 +812,7 @@ public function removeField($name, $group = null)
 	 */
 	public function removeGroup($group)
 	{
-		// Make sure there is a valid JForm XML document.
+		// Make sure there is a valid Form XML document.
 		if (!($this->xml instanceof \SimpleXMLElement))
 		{
 			throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__));
@@ -870,7 +870,7 @@ public function reset($xml = false)
 	 */
 	public function setField(\SimpleXMLElement $element, $group = null, $replace = true, $fieldset = 'default')
 	{
-		// Make sure there is a valid JForm XML document.
+		// Make sure there is a valid Form XML document.
 		if (!($this->xml instanceof \SimpleXMLElement))
 		{
 			throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__));
@@ -963,7 +963,7 @@ public function setField(\SimpleXMLElement $element, $group = null, $replace = t
 	 */
 	public function setFieldAttribute($name, $attribute, $value, $group = null)
 	{
-		// Make sure there is a valid JForm XML document.
+		// Make sure there is a valid Form XML document.
 		if (!($this->xml instanceof \SimpleXMLElement))
 		{
 			throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__));
@@ -1007,7 +1007,7 @@ public function setFieldAttribute($name, $attribute, $value, $group = null)
 	 */
 	public function setFields(&$elements, $group = null, $replace = true, $fieldset = 'default')
 	{
-		// Make sure there is a valid JForm XML document.
+		// Make sure there is a valid Form XML document.
 		if (!($this->xml instanceof \SimpleXMLElement))
 		{
 			throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__));
@@ -1080,7 +1080,7 @@ public function setValue($name, $group = null, $value = null)
 	 *
 	 * @return  mixed  Array or false.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function process($data, $group = null)
 	{
@@ -1104,11 +1104,11 @@ public function process($data, $group = null)
 	 *
 	 * @return  mixed  Array or false.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function filter($data, $group = null)
 	{
-		// Make sure there is a valid JForm XML document.
+		// Make sure there is a valid Form XML document.
 		if (!($this->xml instanceof \SimpleXMLElement))
 		{
 			throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__));
@@ -1142,7 +1142,12 @@ public function filter($data, $group = null)
 			if ($input->exists($key))
 			{
 				$fieldObj = $this->loadField($field, $group);
-				$output->set($key, $fieldObj->filter($input->get($key, (string) $field['default']), $group, $input));
+
+				// Only set into the output if the field was supposed to render on the page (i.e. setup returned true)
+				if ($fieldObj)
+				{
+					$output->set($key, $fieldObj->filter($input->get($key, (string) $field['default']), $group, $input));
+				}
 			}
 		}
 
@@ -1165,7 +1170,7 @@ public function filter($data, $group = null)
 	 */
 	public function validate($data, $group = null)
 	{
-		// Make sure there is a valid JForm XML document.
+		// Make sure there is a valid Form XML document.
 		if (!($this->xml instanceof \SimpleXMLElement))
 		{
 			throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__));
@@ -1188,7 +1193,16 @@ public function validate($data, $group = null)
 		// Validate the fields.
 		foreach ($fields as $field)
 		{
-			$name = (string) $field['name'];
+			$name     = (string) $field['name'];
+			$disabled = ((string) $field['disabled'] == 'true' || (string) $field['disabled'] == 'disabled');
+
+			$fieldExistsInRequestData = $input->exists($name) || $input->exists($group . '.' . $name);
+
+			// If the field is disabled but it is passed in the request this is invalid as disabled fields are not added to the request
+			if ($disabled && $fieldExistsInRequestData)
+			{
+				throw new \RuntimeException(Text::sprintf('JLIB_FORM_VALIDATE_FIELD_INVALID', $name));
+			}
 
 			// Get the field groups for the element.
 			$attrs = $field->xpath('ancestor::fields[@name]/@name');
@@ -1199,13 +1213,22 @@ public function validate($data, $group = null)
 
 			$fieldObj = $this->loadField($field, $group);
 
-			$valid = $fieldObj->validate($input->get($key), $group, $input);
+			if ($fieldObj)
+			{
+				$valid = $fieldObj->validate($input->get($key), $group, $input);
 
-			// Check for an error.
-			if ($valid instanceof \Exception)
+				// Check for an error.
+				if ($valid instanceof \Exception)
+				{
+					$this->errors[] = $valid;
+					$return         = false;
+				}
+			}
+			elseif (!$fieldObj && $input->exists($key))
 			{
-				$this->errors[] = $valid;
-				$return         = false;
+				// The field returned false from setup and shouldn't be included in the page body - yet we received
+				// a value for it. This is probably some sort of injection attack and should be rejected
+				$this->errors[] = new \RuntimeException(Text::sprintf('JLIB_FORM_VALIDATE_FIELD_INVALID', $key));
 			}
 		}
 
@@ -1281,7 +1304,7 @@ protected function findField($name, $group = null)
 		$element = false;
 		$fields = array();
 
-		// Make sure there is a valid JForm XML document.
+		// Make sure there is a valid Form XML document.
 		if (!($this->xml instanceof \SimpleXMLElement))
 		{
 			throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__));
@@ -1371,7 +1394,7 @@ protected function &findFieldsByFieldset($name)
 	{
 		$false = false;
 
-		// Make sure there is a valid JForm XML document.
+		// Make sure there is a valid Form XML document.
 		if (!($this->xml instanceof \SimpleXMLElement))
 		{
 			throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__));
@@ -1405,7 +1428,7 @@ protected function &findFieldsByGroup($group = null, $nested = false)
 		$false = false;
 		$fields = array();
 
-		// Make sure there is a valid JForm XML document.
+		// Make sure there is a valid Form XML document.
 		if (!($this->xml instanceof \SimpleXMLElement))
 		{
 			throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__));
@@ -1479,7 +1502,7 @@ protected function &findGroup($group)
 		$groups = array();
 		$tmp = array();
 
-		// Make sure there is a valid JForm XML document.
+		// Make sure there is a valid Form XML document.
 		if (!($this->xml instanceof \SimpleXMLElement))
 		{
 			throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__));
@@ -1629,7 +1652,7 @@ protected function loadField($element, $group = null, $value = null)
 	 */
 	protected function syncPaths()
 	{
-		// Make sure there is a valid JForm XML document.
+		// Make sure there is a valid Form XML document.
 		if (!($this->xml instanceof \SimpleXMLElement))
 		{
 			throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__));
@@ -1774,7 +1797,7 @@ public static function addRulePath($new = null)
 	 * @return  array  The list of paths that have been added.
 	 *
 	 * @see     FormHelper::addFilterPath()
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public static function addFilterPath($new = null)
 	{
diff --git a/libraries/src/Form/FormFactory.php b/libraries/src/Form/FormFactory.php
index 392ac08fa6911..97f6ab914846f 100644
--- a/libraries/src/Form/FormFactory.php
+++ b/libraries/src/Form/FormFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/FormFactoryAwareInterface.php b/libraries/src/Form/FormFactoryAwareInterface.php
index c7cb73564102e..f3b0b0c27dc4b 100644
--- a/libraries/src/Form/FormFactoryAwareInterface.php
+++ b/libraries/src/Form/FormFactoryAwareInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/FormFactoryAwareTrait.php b/libraries/src/Form/FormFactoryAwareTrait.php
index 14a63bb8434e5..f19d458fa405f 100644
--- a/libraries/src/Form/FormFactoryAwareTrait.php
+++ b/libraries/src/Form/FormFactoryAwareTrait.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/FormFactoryInterface.php b/libraries/src/Form/FormFactoryInterface.php
index 8acd805620b20..815966c4b8956 100644
--- a/libraries/src/Form/FormFactoryInterface.php
+++ b/libraries/src/Form/FormFactoryInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/FormField.php b/libraries/src/Form/FormField.php
index 69d4550b3771d..4ce7d5b10ce52 100644
--- a/libraries/src/Form/FormField.php
+++ b/libraries/src/Form/FormField.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -84,7 +84,7 @@ abstract class FormField
 	protected $form;
 
 	/**
-	 * The form control prefix for field names from the JForm object attached to the form field.
+	 * The form control prefix for field names from the Form object attached to the form field.
 	 *
 	 * @var    string
 	 * @since  1.7.0
@@ -551,7 +551,7 @@ public function __set($name, $value)
 	/**
 	 * Method to attach a Form object to the field.
 	 *
-	 * @param   Form  $form  The JForm object to attach to the form field.
+	 * @param   Form  $form  The Form object to attach to the form field.
 	 *
 	 * @return  FormField  The form field object so that the method can be used in a chain.
 	 *
@@ -580,7 +580,7 @@ public function setForm(Form $form)
 	 */
 	public function setup(\SimpleXMLElement $element, $value, $group = null)
 	{
-		// Make sure there is a valid JFormField XML element.
+		// Make sure there is a valid FormField XML element.
 		if ((string) $element->getName() != 'field')
 		{
 			return false;
@@ -604,7 +604,14 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
 		$this->default = isset($element['value']) ? (string) $element['value'] : $this->default;
 
 		// Set the field default value.
-		$this->value = $value;
+		if ($element['multiple'] && is_string($value) && is_array(json_decode($value, true)))
+		{
+			$this->value = (array) json_decode($value);
+		}
+		else 
+		{
+			$this->value = $value;
+		}
 
 		foreach ($attributes as $attributeName)
 		{
@@ -974,7 +981,7 @@ public function renderField($options = array())
 	 *
 	 * @return  mixed   The filtered value.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function filter($value, $group = null, Registry $input = null)
 	{
@@ -1001,7 +1008,7 @@ public function filter($value, $group = null, Registry $input = null)
 				return call_user_func(explode('::', $filter), $value);
 			}
 
-			// Load the JFormRule object for the field. JFormRule objects take precedence over PHP functions
+			// Load the FormRule object for the field. FormRule objects take precedence over PHP functions
 			$obj = FormHelper::loadFilterType($filter);
 
 			// Run the filter rule.
@@ -1020,16 +1027,16 @@ public function filter($value, $group = null, Registry $input = null)
 	}
 
 	/**
-	 * Method to validate a JFormField object based on field data.
+	 * Method to validate a FormField object based on field data.
 	 *
 	 * @param   mixed     $value  The optional value to use as the default for the field.
 	 * @param   string    $group  The optional dot-separated form group path on which to find the field.
 	 * @param   Registry  $input  An optional Registry object with the entire data set to validate
 	 *                            against the entire form.
 	 *
-	 * @return  boolean  Boolean true if field value is valid, Exception on failure.
+	 * @return  boolean|\Exception  Boolean true if field value is valid, Exception on failure.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 * @throws  \InvalidArgumentException
 	 * @throws  \UnexpectedValueException
 	 */
@@ -1066,7 +1073,7 @@ public function validate($value, $group = null, \Joomla\Registry\Registry $input
 		// Get the field validation rule.
 		if ($type = (string) $this->element['validate'])
 		{
-			// Load the JFormRule object for the field.
+			// Load the FormRule object for the field.
 			$rule = FormHelper::loadRuleType($type);
 
 			// If the object could not be loaded return an error message.
@@ -1118,7 +1125,7 @@ public function validate($value, $group = null, \Joomla\Registry\Registry $input
 	 *
 	 * @return  mixed   The processed value.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function postProcess($value, $group = null, Registry $input = null)
 	{
diff --git a/libraries/src/Form/FormFilterInterface.php b/libraries/src/Form/FormFilterInterface.php
index 9cc9d91e09203..703ac7dfd53d1 100644
--- a/libraries/src/Form/FormFilterInterface.php
+++ b/libraries/src/Form/FormFilterInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,7 @@
 /**
  * Interface for a filter class.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 interface FormFilterInterface
 {
@@ -28,11 +28,11 @@ interface FormFilterInterface
 	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
 	 *                                      full field name would end up being "bar[foo]".
 	 * @param   Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
-	 * @param   JForm             $form     The form object for which the field is being tested.
+	 * @param   Form              $form     The form object for which the field is being tested.
 	 *
 	 * @return  mixed   The filtered value.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function filter(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null);
 }
diff --git a/libraries/src/Form/FormHelper.php b/libraries/src/Form/FormHelper.php
index 509847d9bd310..28a6b4b49e1cc 100644
--- a/libraries/src/Form/FormHelper.php
+++ b/libraries/src/Form/FormHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -98,7 +98,7 @@ public static function loadRuleType($type, $new = true)
 	 *
 	 * @return  FormFilter|boolean  FormRule object on success, false otherwise.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public static function loadFilterType($type, $new = true)
 	{
@@ -182,7 +182,7 @@ public static function loadRuleClass($type)
 	 *
 	 * @return  string|boolean  Class name on success or false otherwise.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public static function loadFilterClass($type)
 	{
@@ -338,7 +338,7 @@ public static function addRulePath($new = null)
 	 *
 	 * @return  array  The list of paths that have been added.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public static function addFilterPath($new = null)
 	{
@@ -435,7 +435,7 @@ public static function addRulePrefix($new = null)
 	 *
 	 * @return  array  The list of namespaces that have been added.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public static function addFilterPrefix($new = null)
 	{
@@ -537,8 +537,25 @@ public static function parseShowOnConditions($showOn, $formControl = null, $grou
 			$compareEqual     = strpos($showOnPart, '!:') === false;
 			$showOnPartBlocks = explode(($compareEqual ? ':' : '!:'), $showOnPart, 2);
 
+			if (strpos($showOnPartBlocks[0], '.') !== false)
+			{
+				if ($formControl)
+				{
+					$field = $formControl . ('[' . str_replace('.', '][', $showOnPartBlocks[0]) . ']');
+				}
+				else
+				{
+					$groupParts = explode('.', $showOnPartBlocks[0]);
+					$field      = array_shift($groupParts) . '[' . join('][', $groupParts) . ']';
+				}
+			}
+			else
+			{
+				$field = $formPath ? $formPath . '[' . $showOnPartBlocks[0] . ']' : $showOnPartBlocks[0];
+			}
+
 			$showOnData[] = array(
-				'field'  => $formPath ? $formPath . '[' . $showOnPartBlocks[0] . ']' : $showOnPartBlocks[0],
+				'field'  => $field,
 				'values' => explode(',', $showOnPartBlocks[1]),
 				'sign'   => $compareEqual === true ? '=' : '!=',
 				'op'     => $op,
diff --git a/libraries/src/Form/FormRule.php b/libraries/src/Form/FormRule.php
index 378609516606d..709fa273027fc 100644
--- a/libraries/src/Form/FormRule.php
+++ b/libraries/src/Form/FormRule.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,13 +15,19 @@
 // Detect if we have full UTF-8 and unicode PCRE support.
 if (!defined('JCOMPAT_UNICODE_PROPERTIES'))
 {
+	/**
+	 * Flag indicating UTF-8 and PCRE support is present
+	 *
+	 * @var    boolean
+	 * @since  1.6
+	 */
 	define('JCOMPAT_UNICODE_PROPERTIES', (bool) @preg_match('/\pL/u', 'a'));
 }
 
 /**
  * Form Rule class for the Joomla Platform.
  *
- * @since  1.7.0
+ * @since  1.6
  */
 class FormRule
 {
@@ -29,7 +35,7 @@ class FormRule
 	 * The regular expression to use in testing a form field value.
 	 *
 	 * @var    string
-	 * @since  1.7.0
+	 * @since  1.6
 	 */
 	protected $regex;
 
@@ -37,7 +43,7 @@ class FormRule
 	 * The regular expression modifiers to use when testing a form field value.
 	 *
 	 * @var    string
-	 * @since  1.7.0
+	 * @since  1.6
 	 */
 	protected $modifiers;
 
@@ -54,7 +60,7 @@ class FormRule
 	 *
 	 * @return  boolean  True if the value is valid, false otherwise.
 	 *
-	 * @since   1.7.0
+	 * @since   1.6
 	 * @throws  \UnexpectedValueException if rule is invalid.
 	 */
 	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
diff --git a/libraries/src/Form/Rule/BooleanRule.php b/libraries/src/Form/Rule/BooleanRule.php
index 904102bc4f600..1c6fd548babe6 100644
--- a/libraries/src/Form/Rule/BooleanRule.php
+++ b/libraries/src/Form/Rule/BooleanRule.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Rule/CalendarRule.php b/libraries/src/Form/Rule/CalendarRule.php
index 96cf514809578..bcaf258627d27 100644
--- a/libraries/src/Form/Rule/CalendarRule.php
+++ b/libraries/src/Form/Rule/CalendarRule.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Rule/CaptchaRule.php b/libraries/src/Form/Rule/CaptchaRule.php
index f77bca316e55c..075f7d236de7b 100644
--- a/libraries/src/Form/Rule/CaptchaRule.php
+++ b/libraries/src/Form/Rule/CaptchaRule.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -55,26 +55,18 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
 		{
 			return true;
 		}
-		else
+
+		try
 		{
 			$captcha = Captcha::getInstance((string) $plugin, array('namespace' => (string) $namespace));
-		}
 
-		// Test the value.
-		if (!$captcha->checkAnswer($value))
+			return $captcha->checkAnswer($value);
+		}
+		catch (\RuntimeException $e)
 		{
-			$error = $captcha->getError();
-
-			if ($error instanceof \Exception)
-			{
-				return $error;
-			}
-			else
-			{
-				return new \Exception($error);
-			}
+			$app->enqueueMessage($e->getMessage(), 'error');
 		}
 
-		return true;
+		return false;
 	}
 }
diff --git a/libraries/src/Form/Rule/ColorRule.php b/libraries/src/Form/Rule/ColorRule.php
index 55a603a6bce3b..6bd957a8d9ab3 100644
--- a/libraries/src/Form/Rule/ColorRule.php
+++ b/libraries/src/Form/Rule/ColorRule.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Rule/EmailRule.php b/libraries/src/Form/Rule/EmailRule.php
index efe142b996dbc..35fa59ebdb19a 100644
--- a/libraries/src/Form/Rule/EmailRule.php
+++ b/libraries/src/Form/Rule/EmailRule.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,6 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormRule;
@@ -43,7 +44,7 @@ class EmailRule extends FormRule
 	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
 	 * @param   Form               $form     The form object for which the field is being tested.
 	 *
-	 * @return  boolean  True if the value is valid, false otherwise.
+	 * @return  mixed  Boolean true if field value is valid, Exception on failure.
 	 *
 	 * @since   1.7.0
 	 */
@@ -77,7 +78,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
 			// Test the value against the regular expression.
 			if (!parent::test($element, $value, $group, $input, $form))
 			{
-				return false;
+				return new \UnexpectedValueException(\JText::_('JLIB_DATABASE_ERROR_VALID_MAIL'));
 			}
 		}
 		else
@@ -92,7 +93,76 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
 				// Test the value against the regular expression.
 				if (!parent::test($element, $value, $group, $input, $form))
 				{
-					return false;
+					return new \UnexpectedValueException(\JText::_('JLIB_DATABASE_ERROR_VALID_MAIL'));
+				}
+			}
+		}
+
+		/**
+		 * validDomains value should consist of component name and the name of domain list field in component's configuration, separated by a dot.
+		 * This allows different components and contexts to use different lists.
+		 * If value is incomplete, com_users.domains is used as fallback.
+		 */
+		$validDomains = (isset($element['validDomains']) && $element['validDomains'] != 'false');
+
+		if ($validDomains && !$multiple)
+		{
+			$config = explode('.', $element['validDomains'], 2);
+
+			if (count($config) > 1)
+			{
+				$domains = ComponentHelper::getParams($config[0])->get($config[1]);
+			}
+			else
+			{
+				$domains = ComponentHelper::getParams('com_users')->get('domains');
+			}
+
+			if ($domains)
+			{
+				$emailDomain = explode('@', $value);
+				$emailDomain = $emailDomain[1];
+				$emailParts  = array_reverse(explode('.', $emailDomain));
+				$emailCount  = count($emailParts);
+				$allowed     = true;
+
+				foreach ($domains as $domain)
+				{
+					$domainParts = array_reverse(explode('.', $domain->name));
+					$status      = 0;
+
+					// Don't run if the email has less segments than the rule.
+					if ($emailCount < count($domainParts))
+					{
+						continue;
+					}
+
+					foreach ($emailParts as $key => $emailPart)
+					{
+						if (!isset($domainParts[$key]) || $domainParts[$key] == $emailPart || $domainParts[$key] == '*')
+						{
+							$status++;
+						}
+					}
+
+					// All segments match, check whether to allow the domain or not.
+					if ($status === $emailCount)
+					{
+						if ($domain->rule == 0)
+						{
+							$allowed = false;
+						}
+						else
+						{
+							$allowed = true;
+						}
+					}
+				}
+
+				// If domain is not allowed, fail validation. Otherwise continue.
+				if (!$allowed)
+				{
+					return new \UnexpectedValueException(\JText::sprintf('JGLOBAL_EMAIL_DOMAIN_NOT_ALLOWED', $emailDomain));
 				}
 			}
 		}
@@ -121,7 +191,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
 
 			if ($duplicate)
 			{
-				return false;
+				return new \UnexpectedValueException(\JText::_('JLIB_DATABASE_ERROR_EMAIL_INUSE'));
 			}
 		}
 
diff --git a/libraries/src/Form/Rule/EqualsRule.php b/libraries/src/Form/Rule/EqualsRule.php
index 1c2693fab814d..a7fb974de2762 100644
--- a/libraries/src/Form/Rule/EqualsRule.php
+++ b/libraries/src/Form/Rule/EqualsRule.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Rule/ExistsRule.php b/libraries/src/Form/Rule/ExistsRule.php
new file mode 100644
index 0000000000000..98499f4e382d0
--- /dev/null
+++ b/libraries/src/Form/Rule/ExistsRule.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Rule;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormRule;
+use Joomla\Registry\Registry;
+
+/**
+ * Form rule class to determine if a value exists in a database table.
+ *
+ * @since  3.9.0
+ */
+class ExistsRule extends FormRule
+{
+	/**
+	 * Method to test the username for uniqueness.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   Form               $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   3.9.0
+	 */
+	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+	{
+		$value = trim($value);
+
+		$existsTable  = (string) $element['exists_table'];
+		$existsColumn = (string) $element['exists_column'];
+
+		// We cannot validate without a table name
+		if ($existsTable === '')
+		{
+			return true;
+		}
+
+		// Assume a default column name of `id`
+		if ($existsColumn === '')
+		{
+			$existsColumn = 'id';
+		}
+
+		$db = Factory::getDbo();
+
+		// Set and query the database.
+		$exists = $db->setQuery(
+			$db->getQuery(true)
+				->select('COUNT(*)')
+				->from($db->quoteName($existsTable))
+				->where($db->quoteName($existsColumn) . ' = ' . $db->quote($value))
+		)->loadResult();
+
+		return (int) $exists > 0;
+	}
+}
diff --git a/libraries/src/Form/Rule/NotequalsRule.php b/libraries/src/Form/Rule/NotequalsRule.php
index 44a65dab89698..2d99c7fae3050 100644
--- a/libraries/src/Form/Rule/NotequalsRule.php
+++ b/libraries/src/Form/Rule/NotequalsRule.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Rule/NumberRule.php b/libraries/src/Form/Rule/NumberRule.php
index bdbbc1131c8fd..9f21e70686a53 100644
--- a/libraries/src/Form/Rule/NumberRule.php
+++ b/libraries/src/Form/Rule/NumberRule.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Rule/OptionsRule.php b/libraries/src/Form/Rule/OptionsRule.php
index fc9ffc6ed4e9f..8138b58662064 100644
--- a/libraries/src/Form/Rule/OptionsRule.php
+++ b/libraries/src/Form/Rule/OptionsRule.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Rule/PasswordRule.php b/libraries/src/Form/Rule/PasswordRule.php
index 31307b4d6fe2c..045c2ed12e48b 100644
--- a/libraries/src/Form/Rule/PasswordRule.php
+++ b/libraries/src/Form/Rule/PasswordRule.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Rule/RulesRule.php b/libraries/src/Form/Rule/RulesRule.php
index 3c306618c7a5e..af3b3ae4da43c 100644
--- a/libraries/src/Form/Rule/RulesRule.php
+++ b/libraries/src/Form/Rule/RulesRule.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Rule/TelRule.php b/libraries/src/Form/Rule/TelRule.php
index 5c517db127919..98b41c840cd25 100644
--- a/libraries/src/Form/Rule/TelRule.php
+++ b/libraries/src/Form/Rule/TelRule.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Rule/UrlRule.php b/libraries/src/Form/Rule/UrlRule.php
index c8bb9a313583e..e62a767572ad7 100644
--- a/libraries/src/Form/Rule/UrlRule.php
+++ b/libraries/src/Form/Rule/UrlRule.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Form/Rule/UsernameRule.php b/libraries/src/Form/Rule/UsernameRule.php
index 06bd163ace112..95b948f96dcea 100644
--- a/libraries/src/Form/Rule/UsernameRule.php
+++ b/libraries/src/Form/Rule/UsernameRule.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/HTML/HTMLHelper.php b/libraries/src/HTML/HTMLHelper.php
index f8aeae03a55a3..2b45a551cc9bd 100644
--- a/libraries/src/HTML/HTMLHelper.php
+++ b/libraries/src/HTML/HTMLHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -625,7 +625,7 @@ public static function image($file, $alt, $attribs = null, $relative = false, $r
 		}
 
 		// If only path is required
-		if ($returnPath)
+		if ($returnPath === 1)
 		{
 			return $file;
 		}
@@ -671,7 +671,7 @@ public static function stylesheet($file, $options = array(), $attribs = array())
 		}
 
 		// If inclusion is required
-		$document = Factory::getDocument();
+		$document = Factory::getApplication()->getDocument();
 
 		foreach ($includes as $include)
 		{
@@ -730,7 +730,7 @@ public static function script($file, $options = array(), $attribs = array())
 		}
 
 		// If inclusion is required
-		$document = Factory::getDocument();
+		$document = Factory::getApplication()->getDocument();
 
 		foreach ($includes as $include)
 		{
@@ -768,9 +768,6 @@ public static function webcomponent(string $file, array $options = [])
 		// Script core.js is responsible for the polyfills and the async loading of the web components
 		static::_('behavior.core');
 
-		$version      = '';
-		$mediaVersion = Factory::getDocument()->getMediaVersion();
-
 		// Add the css if exists
 		self::_('stylesheet', str_replace('.js', '.css', $file), $options);
 
@@ -787,11 +784,14 @@ public static function webcomponent(string $file, array $options = [])
 			return;
 		}
 
+		$document = Factory::getApplication()->getDocument();
+		$version  = '';
+
 		if (isset($options['version']))
 		{
 			if ($options['version'] === 'auto')
 			{
-				$version = '?' . $mediaVersion;
+				$version = '?' . $document->getMediaVersion();
 			}
 			else
 			{
@@ -799,26 +799,21 @@ public static function webcomponent(string $file, array $options = [])
 			}
 		}
 
-		if (count($includes) === 1)
+		$components = $document->getScriptOptions('webcomponents');
+
+		foreach ($includes as $include)
 		{
-			$potential = $includes[0] . ((strpos($includes[0], '?') === false) ? $version : '');
+			$potential = $include . ((strpos($include, '?') === false) ? $version : '');
 
-			if (!in_array($potential, Factory::getDocument()->getScriptOptions('webcomponents')))
+			if (in_array($potential, $components))
 			{
-				Factory::getDocument()->addScriptOptions('webcomponents', [$potential]);
-				return;
+				continue;
 			}
 
-			return;
-		}
-
-		$potential = $includes . ((strpos($includes, '?') === false) ? $version : '');
-
-		if (!in_array($potential, Factory::getDocument()->getScriptOptions('webcomponents')))
-		{
-			Factory::getDocument()->addScriptOptions('webcomponents', [$potential]);
+			$components[] = $potential;
 		}
 
+		$document->addScriptOptions('webcomponents', $components);
 	}
 
 	/**
@@ -860,8 +855,7 @@ public static function setFormatOptions($options)
 	 */
 	public static function date($input = 'now', $format = null, $tz = true, $gregorian = false)
 	{
-		// Get some system objects.
-		$user = Factory::getUser();
+		$app = Factory::getApplication();
 
 		// UTC date converted to user time zone.
 		if ($tz === true)
@@ -870,7 +864,7 @@ public static function date($input = 'now', $format = null, $tz = true, $gregori
 			$date = Factory::getDate($input, 'UTC');
 
 			// Set the correct time zone based on the user configuration.
-			$date->setTimezone($user->getTimezone());
+			$date->setTimezone($app->getIdentity()->getTimezone());
 		}
 		// UTC date converted to server time zone.
 		elseif ($tz === false)
@@ -879,7 +873,7 @@ public static function date($input = 'now', $format = null, $tz = true, $gregori
 			$date = Factory::getDate($input, 'UTC');
 
 			// Set the correct time zone based on the server configuration.
-			$date->setTimezone(new \DateTimeZone(Factory::getApplication()->get('offset')));
+			$date->setTimezone(new \DateTimeZone($app->get('offset')));
 		}
 		// No date conversion.
 		elseif ($tz === null)
@@ -1074,7 +1068,7 @@ public static function calendar($value, $name, $id, $format = '%Y-%m-%d', $attri
 	{
 		$tag       = Factory::getLanguage()->getTag();
 		$calendar  = Factory::getLanguage()->getCalendar();
-		$direction = strtolower(Factory::getDocument()->getDirection());
+		$direction = strtolower(Factory::getApplication()->getDocument()->getDirection());
 
 		// Get the appropriate file for the current language date helper
 		$helperPath = 'system/fields/calendar-locales/date/gregorian/date-helper.min.js';
diff --git a/libraries/src/HTML/HTMLRegistryAwareTrait.php b/libraries/src/HTML/HTMLRegistryAwareTrait.php
index b52a594de88db..b5d1a65317e12 100644
--- a/libraries/src/HTML/HTMLRegistryAwareTrait.php
+++ b/libraries/src/HTML/HTMLRegistryAwareTrait.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/HTML/Registry.php b/libraries/src/HTML/Registry.php
index 57c922a412406..d8a4cf332eca8 100644
--- a/libraries/src/HTML/Registry.php
+++ b/libraries/src/HTML/Registry.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Help/Help.php b/libraries/src/Help/Help.php
index fc385cf103b2b..c61b2b5032daa 100644
--- a/libraries/src/Help/Help.php
+++ b/libraries/src/Help/Help.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Helper/AuthenticationHelper.php b/libraries/src/Helper/AuthenticationHelper.php
index 283f0a453ac67..7fb8dab68e739 100644
--- a/libraries/src/Helper/AuthenticationHelper.php
+++ b/libraries/src/Helper/AuthenticationHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,6 +13,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Plugin\PluginHelper;
 
 /**
  * Authentication helper class
@@ -31,7 +32,7 @@ abstract class AuthenticationHelper
 	public static function getTwoFactorMethods()
 	{
 		// Get all the Two Factor Authentication plugins.
-		\JPluginHelper::importPlugin('twofactorauth');
+		PluginHelper::importPlugin('twofactorauth');
 
 		// Trigger onUserTwofactorIdentify event and return the two factor enabled plugins.
 		$identities = Factory::getApplication()->triggerEvent('onUserTwofactorIdentify', array());
diff --git a/libraries/src/Helper/CMSHelper.php b/libraries/src/Helper/CMSHelper.php
index 09bccc4932e5b..befcc5289f8ad 100644
--- a/libraries/src/Helper/CMSHelper.php
+++ b/libraries/src/Helper/CMSHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Helper/ContentHelper.php b/libraries/src/Helper/ContentHelper.php
index ba56746e0a3a9..abb36d0cc8d2f 100644
--- a/libraries/src/Helper/ContentHelper.php
+++ b/libraries/src/Helper/ContentHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Helper/ContentHistoryHelper.php b/libraries/src/Helper/ContentHistoryHelper.php
index 7ba6aea99c306..7ffd576149357 100644
--- a/libraries/src/Helper/ContentHistoryHelper.php
+++ b/libraries/src/Helper/ContentHistoryHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Helper/LibraryHelper.php b/libraries/src/Helper/LibraryHelper.php
index 5e0ca2adc41d0..aca0fdcd7433d 100644
--- a/libraries/src/Helper/LibraryHelper.php
+++ b/libraries/src/Helper/LibraryHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Cache\CacheControllerFactoryInterface;
 use Joomla\CMS\Cache\Controller\CallbackController;
+use Joomla\CMS\Cache\Exception\CacheExceptionInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
@@ -164,7 +165,7 @@ protected static function loadLibrary($element)
 		{
 			static::$libraries[$element] = $cache->get($loader, array($element), __METHOD__ . $element);
 		}
-		catch (\JCacheException $e)
+		catch (CacheExceptionInterface $e)
 		{
 			static::$libraries[$element] = $loader($element);
 		}
diff --git a/libraries/src/Helper/MediaHelper.php b/libraries/src/Helper/MediaHelper.php
index 13474e8ce417c..7901ad68edf51 100644
--- a/libraries/src/Helper/MediaHelper.php
+++ b/libraries/src/Helper/MediaHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Helper/ModuleHelper.php b/libraries/src/Helper/ModuleHelper.php
index d3fbf29db572b..a2169f0fb79f3 100644
--- a/libraries/src/Helper/ModuleHelper.php
+++ b/libraries/src/Helper/ModuleHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,7 +17,9 @@
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Log\Log;
+use Joomla\CMS\Profiler\Profiler;
 use Joomla\Registry\Registry;
 
 /**
@@ -108,7 +110,6 @@ public static function &getModules($position)
 			{
 				$result[0] = static::getModule('mod_' . $position);
 				$result[0]->title = $position;
-				$result[0]->content = $position;
 				$result[0]->position = $position;
 			}
 		}
@@ -147,8 +148,6 @@ public static function isEnabled($module)
 	 */
 	public static function renderModule($module, $attribs = array())
 	{
-		static $chrome;
-
 		$app = Factory::getApplication();
 
 		// Check that $module is a valid module object
@@ -168,7 +167,7 @@ public static function renderModule($module, $attribs = array())
 
 		if (JDEBUG)
 		{
-			\JProfiler::getInstance('Application')->mark('beforeRenderModule ' . $module->module . ' (' . $module->title . ')');
+			Profiler::getInstance('Application')->mark('beforeRenderModule ' . $module->module . ' (' . $module->title . ')');
 		}
 
 		// Record the scope.
@@ -196,31 +195,21 @@ public static function renderModule($module, $attribs = array())
 			$module->content = ob_get_clean();
 		}
 
-		// Load the module chrome functions
-		if (!$chrome)
-		{
-			$chrome = array();
-		}
-
-		include_once JPATH_THEMES . '/system/html/modules.php';
-		$chromePath = JPATH_THEMES . '/' . $template . '/html/modules.php';
-
-		if (!isset($chrome[$chromePath]))
-		{
-			if (file_exists($chromePath))
-			{
-				include_once $chromePath;
-			}
-
-			$chrome[$chromePath] = true;
-		}
-
 		// Check if the current module has a style param to override template module style
 		$paramsChromeStyle = $params->get('style');
+		$basePath          = '';
 
 		if ($paramsChromeStyle)
 		{
-			$attribs['style'] = preg_replace('/^(system|' . $template . ')\-/i', '', $paramsChromeStyle);
+			$paramsChromeStyle   = explode('-', $paramsChromeStyle, 2);
+			$ChromeStyleTemplate = strtolower($paramsChromeStyle[0]);
+			$attribs['style']    = $paramsChromeStyle[1];
+
+			// Only set $basePath if the specified template isn't the current or system one.
+			if ($ChromeStyleTemplate !== $template && $ChromeStyleTemplate !== 'system')
+			{
+				$basePath = JPATH_THEMES . '/' . $ChromeStyleTemplate . '/html/layouts';
+			}
 		}
 
 		// Make sure a style is set
@@ -235,6 +224,8 @@ public static function renderModule($module, $attribs = array())
 			$attribs['style'] .= ' outline';
 		}
 
+		$module->style = $attribs['style'];
+
 		// If the $module is nulled it will return an empty content, otherwise it will render the module normally.
 		$app->triggerEvent('onRenderModule', array(&$module, &$attribs));
 
@@ -243,19 +234,17 @@ public static function renderModule($module, $attribs = array())
 			return '';
 		}
 
+		$displayData = array(
+			'module'  => $module,
+			'params'  => $params,
+			'attribs' => $attribs,
+		);
+
 		foreach (explode(' ', $attribs['style']) as $style)
 		{
-			$chromeMethod = 'modChrome_' . $style;
-
-			// Apply chrome and render module
-			if (function_exists($chromeMethod))
+			if ($moduleContent = LayoutHelper::render('chromes.' . $style, $displayData, $basePath))
 			{
-				$module->style = $attribs['style'];
-
-				ob_start();
-				$chromeMethod($module, $params, $attribs);
-				$module->content = ob_get_contents();
-				ob_end_clean();
+				$module->content = $moduleContent;
 			}
 		}
 
@@ -266,7 +255,7 @@ public static function renderModule($module, $attribs = array())
 
 		if (JDEBUG)
 		{
-			\JProfiler::getInstance('Application')->mark('afterRenderModule ' . $module->module . ' (' . $module->title . ')');
+			Profiler::getInstance('Application')->mark('afterRenderModule ' . $module->module . ' (' . $module->title . ')');
 		}
 
 		return $module->content;
@@ -366,7 +355,7 @@ public static function getModuleList()
 		$clientId = (int) $app->getClientId();
 
 		// Build a cache ID for the resulting data object
-		$cacheId = $groups . $clientId . $Itemid;
+		$cacheId = $groups . '.' . $clientId . '.' . $Itemid;
 
 		$db = Factory::getDbo();
 
@@ -378,11 +367,10 @@ public static function getModuleList()
 			->join('LEFT', '#__extensions AS e ON e.element = m.module AND e.client_id = m.client_id')
 			->where('e.enabled = 1');
 
-		$date = Factory::getDate();
-		$now = $date->toSql();
-		$nullDate = $db->getNullDate();
-		$query->where('(m.publish_up = ' . $db->quote($nullDate) . ' OR m.publish_up <= ' . $db->quote($now) . ')')
-			->where('(m.publish_down = ' . $db->quote($nullDate) . ' OR m.publish_down >= ' . $db->quote($now) . ')')
+		$nowDate = Factory::getDate()->toSql();
+
+		$query->where('(' . $query->isNullDatetime('m.publish_up') . ' OR m.publish_up <= ' . $db->quote($nowDate) . ')')
+			->where('(' . $query->isNullDatetime('m.publish_down') . ' OR m.publish_down >= ' . $db->quote($nowDate) . ')')
 			->where('m.access IN (' . $groups . ')')
 			->where('m.client_id = ' . $clientId)
 			->where('(mm.menuid = ' . $Itemid . ' OR mm.menuid <= 0)');
@@ -629,4 +617,43 @@ public static function isAdminMultilang()
 
 		return $enabled;
 	}
+
+	/**
+	 * Get module by id
+	 *
+	 * @param   string  $id  The id of the module
+	 *
+	 * @return  \stdClass  The Module object
+	 *
+	 * @since   3.9.0
+	 */
+	public static function &getModuleById($id)
+	{
+		$modules =& static::load();
+
+		$total = count($modules);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			// Match the id of the module
+			if ($modules[$i]->id === $id)
+			{
+				// Found it
+				return $modules[$i];
+			}
+		}
+
+		// If we didn't find it, create a dummy object
+		$result            = new \stdClass;
+		$result->id        = 0;
+		$result->title     = '';
+		$result->module    = '';
+		$result->position  = '';
+		$result->content   = '';
+		$result->showtitle = 0;
+		$result->control   = '';
+		$result->params    = '';
+
+		return $result;
+	}
 }
diff --git a/libraries/src/Helper/RouteHelper.php b/libraries/src/Helper/RouteHelper.php
index f82cfc5c237da..b99367ba4b422 100644
--- a/libraries/src/Helper/RouteHelper.php
+++ b/libraries/src/Helper/RouteHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,6 +10,8 @@
 
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Categories\Categories;
+use Joomla\CMS\Categories\CategoryNode;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Multilanguage;
@@ -93,7 +95,7 @@ public function getRoute($id, $typealias, $link = '', $language = null, $catid =
 
 		if ($catid > 1)
 		{
-			$categories = \JCategories::getInstance($name);
+			$categories = Categories::getInstance($name);
 
 			if ($categories)
 			{
@@ -227,7 +229,7 @@ protected function findItem($needles = array())
 	/**
 	 * Fetches the category route
 	 *
-	 * @param   mixed   $catid      Category ID or \JCategoryNode instance
+	 * @param   mixed   $catid      Category ID or CategoryNode instance
 	 * @param   mixed   $language   Language code
 	 * @param   string  $extension  Extension to lookup
 	 *
@@ -245,7 +247,7 @@ public static function getCategoryRoute($catid, $language = 0, $extension = '')
 			throw new \InvalidArgumentException(sprintf('$extension is a required argument in %s()', __METHOD__));
 		}
 
-		if ($catid instanceof \JCategoryNode)
+		if ($catid instanceof CategoryNode)
 		{
 			$id       = $catid->id;
 			$category = $catid;
@@ -254,7 +256,7 @@ public static function getCategoryRoute($catid, $language = 0, $extension = '')
 		{
 			$extensionName = ucfirst(substr($extension, 4));
 			$id            = (int) $catid;
-			$category      = \JCategories::getInstance($extensionName)->get($id);
+			$category      = Categories::getInstance($extensionName)->get($id);
 		}
 
 		if ($id < 1)
diff --git a/libraries/src/Helper/SearchHelper.php b/libraries/src/Helper/SearchHelper.php
index 66b3f69d60fed..bdd0adfd7d657 100644
--- a/libraries/src/Helper/SearchHelper.php
+++ b/libraries/src/Helper/SearchHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Helper/TagsHelper.php b/libraries/src/Helper/TagsHelper.php
index 54cae5356f26a..79ee6480c2efa 100644
--- a/libraries/src/Helper/TagsHelper.php
+++ b/libraries/src/Helper/TagsHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,6 +15,8 @@
 use Joomla\CMS\Table\CoreContent;
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Table\TableInterface;
+use Joomla\CMS\UCM\UCMContent;
+use Joomla\CMS\UCM\UCMType;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -65,7 +67,7 @@ public function addTagMapping($ucmId, TableInterface $table, $tags = array())
 		$db = $table->getDbo();
 		$key = $table->getKeyName();
 		$item = $table->$key;
-		$ucm = new \JUcmType($this->typeAlias, $db);
+		$ucm = new UCMType($this->typeAlias, $db);
 		$typeId = $ucm->getTypeId();
 
 		// Insert the new tag maps
@@ -750,7 +752,7 @@ public function postStoreProcess(TableInterface $table, $newTags = array(), $rep
 				$data = $this->getRowData($table);
 				$ucmContentTable = Table::getInstance('Corecontent');
 
-				$ucm = new \JUcmContent($table, $this->typeAlias);
+				$ucm = new UCMContent($table, $this->typeAlias);
 				$ucmData = $data ? $ucm->mapData($data) : $ucm->ucmData;
 
 				$primaryId = $ucm->getPrimaryKey($ucmData['common']['core_type_id'], $ucmData['common']['core_content_item_id']);
@@ -858,6 +860,13 @@ public static function searchTags($filters = array())
 			$query->where('a.published = ' . (int) $filters['published']);
 		}
 
+		// Filter on the access level
+		if (isset($filters['access']) && is_array($filters['access']) && count($filters['access']))
+		{
+			$groups = ArrayHelper::toInteger($filters['access']);
+			$query->where('a.access IN (' . implode(",", $groups) . ')');
+		}
+
 		// Filter by parent_id
 		if (isset($filters['parent_id']) && is_numeric($filters['parent_id']))
 		{
diff --git a/libraries/src/Helper/UserGroupsHelper.php b/libraries/src/Helper/UserGroupsHelper.php
index 36cab8ca56fb6..e4c6fc3866bad 100644
--- a/libraries/src/Helper/UserGroupsHelper.php
+++ b/libraries/src/Helper/UserGroupsHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Http/Http.php b/libraries/src/Http/Http.php
index b6871a3b9599c..b1402fdc56fb7 100644
--- a/libraries/src/Http/Http.php
+++ b/libraries/src/Http/Http.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Http/HttpFactory.php b/libraries/src/Http/HttpFactory.php
index 70ca0bd6dda52..5d47067721ff8 100644
--- a/libraries/src/Http/HttpFactory.php
+++ b/libraries/src/Http/HttpFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Http/Response.php b/libraries/src/Http/Response.php
index 98c87549fb12c..c84cd70b8d709 100644
--- a/libraries/src/Http/Response.php
+++ b/libraries/src/Http/Response.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Http/Transport/CurlTransport.php b/libraries/src/Http/Transport/CurlTransport.php
index 68a1148551d11..fbd6c6ee366e7 100644
--- a/libraries/src/Http/Transport/CurlTransport.php
+++ b/libraries/src/Http/Transport/CurlTransport.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Http/Transport/SocketTransport.php b/libraries/src/Http/Transport/SocketTransport.php
index 08d1226a3e212..70330341234b2 100644
--- a/libraries/src/Http/Transport/SocketTransport.php
+++ b/libraries/src/Http/Transport/SocketTransport.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Http/Transport/StreamTransport.php b/libraries/src/Http/Transport/StreamTransport.php
index 3cf01700cafae..b5eab2e57f991 100644
--- a/libraries/src/Http/Transport/StreamTransport.php
+++ b/libraries/src/Http/Transport/StreamTransport.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Http/TransportInterface.php b/libraries/src/Http/TransportInterface.php
index 77a6caeaa2221..15db6c5deea95 100644
--- a/libraries/src/Http/TransportInterface.php
+++ b/libraries/src/Http/TransportInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Image/Filter/Backgroundfill.php b/libraries/src/Image/Filter/Backgroundfill.php
index 68b7b19268a16..f02e0b5974ce9 100644
--- a/libraries/src/Image/Filter/Backgroundfill.php
+++ b/libraries/src/Image/Filter/Backgroundfill.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Image/Filter/Brightness.php b/libraries/src/Image/Filter/Brightness.php
index 6b627aef0684b..90bdb22de9345 100644
--- a/libraries/src/Image/Filter/Brightness.php
+++ b/libraries/src/Image/Filter/Brightness.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Image/Filter/Contrast.php b/libraries/src/Image/Filter/Contrast.php
index 8d7fa3ad3735b..ed66536fe5d43 100644
--- a/libraries/src/Image/Filter/Contrast.php
+++ b/libraries/src/Image/Filter/Contrast.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Image/Filter/Edgedetect.php b/libraries/src/Image/Filter/Edgedetect.php
index 32030450f8ecd..7916467e1dad9 100644
--- a/libraries/src/Image/Filter/Edgedetect.php
+++ b/libraries/src/Image/Filter/Edgedetect.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Image/Filter/Emboss.php b/libraries/src/Image/Filter/Emboss.php
index e958ba5a04dc6..7d3648efd69c5 100644
--- a/libraries/src/Image/Filter/Emboss.php
+++ b/libraries/src/Image/Filter/Emboss.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Image/Filter/Grayscale.php b/libraries/src/Image/Filter/Grayscale.php
index 88e07a9570739..8b7baa685ea66 100644
--- a/libraries/src/Image/Filter/Grayscale.php
+++ b/libraries/src/Image/Filter/Grayscale.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Image/Filter/Negate.php b/libraries/src/Image/Filter/Negate.php
index af68d5605c1d0..0d43f636d6d55 100644
--- a/libraries/src/Image/Filter/Negate.php
+++ b/libraries/src/Image/Filter/Negate.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Image/Filter/Sketchy.php b/libraries/src/Image/Filter/Sketchy.php
index 2ffffab38fb19..2aaba8db9607d 100644
--- a/libraries/src/Image/Filter/Sketchy.php
+++ b/libraries/src/Image/Filter/Sketchy.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Image/Filter/Smooth.php b/libraries/src/Image/Filter/Smooth.php
index 8c56c442b2938..b82ad195e1985 100644
--- a/libraries/src/Image/Filter/Smooth.php
+++ b/libraries/src/Image/Filter/Smooth.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Image/Image.php b/libraries/src/Image/Image.php
index 4bfb1159507d7..5c3ade00ade68 100644
--- a/libraries/src/Image/Image.php
+++ b/libraries/src/Image/Image.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Image/ImageFilter.php b/libraries/src/Image/ImageFilter.php
index 91271147f1d30..d06ca9f2f21a6 100644
--- a/libraries/src/Image/ImageFilter.php
+++ b/libraries/src/Image/ImageFilter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Input/Cli.php b/libraries/src/Input/Cli.php
index 5b2a604352821..4ca14fa1d3f97 100644
--- a/libraries/src/Input/Cli.php
+++ b/libraries/src/Input/Cli.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Input/Cookie.php b/libraries/src/Input/Cookie.php
index a7398f58b0ad3..21c82614d7083 100644
--- a/libraries/src/Input/Cookie.php
+++ b/libraries/src/Input/Cookie.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Input/Files.php b/libraries/src/Input/Files.php
index 9d8a942594623..79f1898fb4ae9 100644
--- a/libraries/src/Input/Files.php
+++ b/libraries/src/Input/Files.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Input/Input.php b/libraries/src/Input/Input.php
index 0445d0a0cc2c9..1f12670977f0e 100644
--- a/libraries/src/Input/Input.php
+++ b/libraries/src/Input/Input.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Input/Json.php b/libraries/src/Input/Json.php
index 84b084edd8d25..ffc6a1aa05f75 100644
--- a/libraries/src/Input/Json.php
+++ b/libraries/src/Input/Json.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Installer/Adapter/ComponentAdapter.php b/libraries/src/Installer/Adapter/ComponentAdapter.php
index 9f4c8232231e5..c8c0f58327118 100644
--- a/libraries/src/Installer/Adapter/ComponentAdapter.php
+++ b/libraries/src/Installer/Adapter/ComponentAdapter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -42,6 +42,17 @@ class ComponentAdapter extends InstallerAdapter
 	 * */
 	protected $oldAdminFiles = null;
 
+	/**
+	 * The list of current files fo the Joomla! CMS API that are installed and is read
+	 * from the manifest on disk in the update area to handle doing a diff
+	 * and deleting files that are in the old files list and not in the new
+	 * files list.
+	 *
+	 * @var    array
+	 * @since  4.0.0
+	 * */
+	protected $oldApiFiles = null;
+
 	/**
 	 * The list of current files that are installed and is read
 	 * from the manifest on disk in the update area to handle doing a diff
@@ -85,7 +96,9 @@ protected function checkExtensionInFilesystem()
 		 * If the component site or admin directory already exists, then we will assume that the component is already
 		 * installed or another component is using that directory.
 		 */
-		if (file_exists($this->parent->getPath('extension_site')) || file_exists($this->parent->getPath('extension_administrator')))
+		if (file_exists($this->parent->getPath('extension_site'))
+			|| file_exists($this->parent->getPath('extension_administrator'))
+			|| file_exists($this->parent->getPath('extension_api')))
 		{
 			// Look for an update function or update tag
 			$updateElement = $this->getManifest()->update;
@@ -111,11 +124,22 @@ protected function checkExtensionInFilesystem()
 					);
 				}
 
-				// If the admin exists say so
+				if (file_exists($this->parent->getPath('extension_administrator')))
+				{
+					// If the admin exists say so
+					throw new \RuntimeException(
+						Text::sprintf(
+							'JLIB_INSTALLER_ERROR_COMP_INSTALL_DIR_ADMIN',
+							$this->parent->getPath('extension_administrator')
+						)
+					);
+				}
+
+				// If the API exists say so
 				throw new \RuntimeException(
 					Text::sprintf(
-						'JLIB_INSTALLER_ERROR_COMP_INSTALL_DIR_ADMIN',
-						$this->parent->getPath('extension_administrator')
+						'JLIB_INSTALLER_ERROR_COMP_INSTALL_DIR_API',
+						$this->parent->getPath('extension_api')
 					)
 				);
 			}
@@ -180,6 +204,29 @@ protected function copyBaseFiles()
 			}
 		}
 
+		// Copy API files
+		if ($this->getManifest()->api->files)
+		{
+			if ($this->route === 'update')
+			{
+				$result = $this->parent->parseFiles($this->getManifest()->api->files, 1, $this->oldApiFiles);
+			}
+			else
+			{
+				$result = $this->parent->parseFiles($this->getManifest()->api->files, 1);
+			}
+
+			if ($result === false)
+			{
+				throw new \RuntimeException(
+					Text::sprintf(
+						'JLIB_INSTALLER_ABORT_COMP_FAIL_API_FILES',
+						Text::_('JLIB_INSTALLER_' . strtoupper($this->route))
+					)
+				);
+			}
+		}
+
 		// If there is a manifest script, let's copy it.
 		if ($this->manifest_script)
 		{
@@ -253,7 +300,7 @@ protected function createExtensionRoot()
 					Text::sprintf(
 						'JLIB_INSTALLER_ERROR_COMP_FAILED_TO_CREATE_DIRECTORY',
 						Text::_('JLIB_INSTALLER_' . strtoupper($this->route)),
-						$this->parent->getPath('extension_site')
+						$this->parent->getPath('extension_administrator')
 					)
 				);
 			}
@@ -272,6 +319,37 @@ protected function createExtensionRoot()
 				)
 			);
 		}
+
+		// If the component API directory does not exist, let's create it
+		$created = false;
+
+		if (!file_exists($this->parent->getPath('extension_api')))
+		{
+			if (!$created = Folder::create($this->parent->getPath('extension_api')))
+			{
+				throw new \RuntimeException(
+					Text::sprintf(
+						'JLIB_INSTALLER_ERROR_COMP_FAILED_TO_CREATE_DIRECTORY',
+						Text::_('JLIB_INSTALLER_' . strtoupper($this->route)),
+						$this->parent->getPath('extension_api')
+					)
+				);
+			}
+		}
+
+		/*
+		 * Since we created the component API directory and we will want to remove it if we have to roll
+		 * back the installation, let's add it to the installation step stack
+		 */
+		if ($created)
+		{
+			$this->parent->pushStep(
+				array(
+					'type' => 'folder',
+					'path' => $this->parent->getPath('extension_api'),
+				)
+			);
+		}
 	}
 
 	/**
@@ -443,6 +521,16 @@ protected function finaliseUninstall(): bool
 				}
 			}
 
+			// Delete the component API directory
+			if (is_dir($this->parent->getPath('extension_api')))
+			{
+				if (!Folder::delete($this->parent->getPath('extension_api')))
+				{
+					Log::add(Text::_('JLIB_INSTALLER_ERROR_COMP_UNINSTALL_FAILED_REMOVE_DIRECTORY_API'), Log::WARNING, 'jerror');
+					$retval = false;
+				}
+			}
+
 			// Now we will no longer need the extension object, so let's delete it
 			$this->extension->delete($this->extension->extension_id);
 
@@ -488,7 +576,33 @@ public function getElement($element = null)
 	public function loadLanguage($path = null)
 	{
 		$source = $this->parent->getPath('source');
-		$client = $this->parent->extension->client_id ? JPATH_ADMINISTRATOR : JPATH_SITE;
+
+		switch ($this->parent->extension->client_id)
+		{
+			case 0:
+				$client = JPATH_SITE;
+
+				break;
+
+			case 1:
+				$client = JPATH_ADMINISTRATOR;
+
+				break;
+
+			case 3:
+				$client = JPATH_API;
+
+				break;
+
+			default:
+				throw new \InvalidArgumentException(
+					sprintf(
+						'Unsupported client ID %d for component %s',
+						$this->parent->extension->client_id,
+						$this->parent->extension->element
+					)
+				);
+		}
 
 		if (!$source)
 		{
@@ -502,6 +616,10 @@ public function loadLanguage($path = null)
 		{
 			$element = $this->getManifest()->administration->files;
 		}
+		elseif ($this->getManifest()->api->files)
+		{
+			$element = $this->getManifest()->api->files;
+		}
 		elseif ($this->getManifest()->files)
 		{
 			$element = $this->getManifest()->files;
@@ -672,6 +790,7 @@ protected function setupInstallPaths()
 		// Set the installation target paths
 		$this->parent->setPath('extension_site', Path::clean(JPATH_SITE . '/components/' . $this->element));
 		$this->parent->setPath('extension_administrator', Path::clean(JPATH_ADMINISTRATOR . '/components/' . $this->element));
+		$this->parent->setPath('extension_api', Path::clean(JPATH_API . '/components/' . $this->element));
 
 		// Copy the admin path as it's used as a common base
 		$this->parent->setPath('extension_root', $this->parent->getPath('extension_administrator'));
@@ -694,6 +813,7 @@ protected function setupUninstall()
 	{
 		// Get the admin and site paths for the component
 		$this->parent->setPath('extension_administrator', Path::clean(JPATH_ADMINISTRATOR . '/components/' . $this->extension->element));
+		$this->parent->setPath('extension_api', Path::clean(JPATH_API . '/components/' . $this->extension->element));
 		$this->parent->setPath('extension_site', Path::clean(JPATH_SITE . '/components/' . $this->extension->element));
 
 		// Copy the admin path as it's used as a common base
@@ -711,6 +831,7 @@ protected function setupUninstall()
 		{
 			// Make sure we delete the folders if no manifest exists
 			Folder::delete($this->parent->getPath('extension_administrator'));
+			Folder::delete($this->parent->getPath('extension_api'));
 			Folder::delete($this->parent->getPath('extension_site'));
 
 			// Remove the menu
@@ -758,6 +879,7 @@ protected function setupUpdates()
 		if ($old_manifest)
 		{
 			$this->oldAdminFiles = $old_manifest->administration->files;
+			$this->oldApiFiles = $old_manifest->api->files;
 			$this->oldFiles = $old_manifest->files;
 		}
 	}
@@ -781,9 +903,10 @@ protected function storeExtension($deleteExisting = false)
 		}
 
 		// Add or update an entry to the extension table
-		$this->extension->name    = $this->name;
-		$this->extension->type    = 'component';
-		$this->extension->element = $this->element;
+		$this->extension->name         = $this->name;
+		$this->extension->type         = 'component';
+		$this->extension->element      = $this->element;
+		$this->extension->changelogurl = $this->changelogurl;
 
 		// If we are told to delete existing extension entries then do so.
 		if ($deleteExisting)
@@ -824,7 +947,11 @@ protected function storeExtension($deleteExisting = false)
 			}
 		}
 
-		$this->extension->namespace = (string) $this->manifest->namespace;
+		// Namespace is optional
+		if (isset($this->manifest->namespace))
+		{
+			$this->extension->namespace = (string) $this->manifest->namespace;
+		}
 
 		// If there is not already a row, generate a heap of defaults
 		if (!$this->currentExtensionId)
@@ -915,10 +1042,10 @@ protected function _buildAdminMenus($component_id = null)
 		{
 			// Lets find the extension id
 			$query->clear()
-				->select('e.extension_id')
-				->from('#__extensions AS e')
-				->where('e.type = ' . $db->quote('component'))
-				->where('e.element = ' . $db->quote($option));
+				->select($db->quoteName('e.extension_id'))
+				->from($db->quoteName('#__extensions', 'e'))
+				->where($db->quoteName('e.type') . ' = ' . $db->quote('component'))
+				->where($db->quoteName('e.element') . ' = ' . $db->quote($option));
 
 			$db->setQuery($query);
 			$component_id = $db->loadResult();
@@ -945,37 +1072,52 @@ protected function _buildAdminMenus($component_id = null)
 		if ($menuElement)
 		{
 			// I have a menu element, use this information
-			$data['menutype'] = 'main';
-			$data['client_id'] = 1;
-			$data['title'] = (string) trim($menuElement);
-			$data['alias'] = (string) $menuElement;
-			$data['link'] = 'index.php?option=' . $option;
-			$data['type'] = 'component';
-			$data['published'] = 1;
-			$data['parent_id'] = 1;
+			$data['menutype']     = 'main';
+			$data['client_id']    = 1;
+			$data['title']        = (string) trim($menuElement);
+			$data['alias']        = (string) $menuElement;
+			$data['type']         = 'component';
+			$data['published']    = 1;
+			$data['parent_id']    = 1;
 			$data['component_id'] = $component_id;
-			$data['img'] = ((string) $menuElement->attributes()->img) ?: 'class:component';
-			$data['home'] = 0;
-			$data['path'] = '';
-			$data['params'] = '';
+			$data['img']          = ((string) $menuElement->attributes()->img) ?: 'class:component';
+			$data['home']         = 0;
+			$data['path']         = '';
+			$data['params']       = '';
+
+			// Set the menu link
+			$request = [];
+
+			if ((string) $menuElement->attributes()->task)
+			{
+				$request[] = 'task=' . $menuElement->attributes()->task;
+			}
+
+			if ((string) $menuElement->attributes()->view)
+			{
+				$request[] = 'view=' . $menuElement->attributes()->view;
+			}
+
+			$qstring = count($request) ? '&' . implode('&', $request) : '';
+			$data['link'] = 'index.php?option=' . $option . $qstring;
 		}
 		else
 		{
 			// No menu element was specified, Let's make a generic menu item
-			$data = array();
-			$data['menutype'] = 'main';
-			$data['client_id'] = 1;
-			$data['title'] = $option;
-			$data['alias'] = $option;
-			$data['link'] = 'index.php?option=' . $option;
-			$data['type'] = 'component';
-			$data['published'] = 1;
-			$data['parent_id'] = 1;
+			$data                 = array();
+			$data['menutype']     = 'main';
+			$data['client_id']    = 1;
+			$data['title']        = $option;
+			$data['alias']        = $option;
+			$data['link']         = 'index.php?option=' . $option;
+			$data['type']         = 'component';
+			$data['published']    = 1;
+			$data['parent_id']    = 1;
 			$data['component_id'] = $component_id;
-			$data['img'] = 'class:component';
-			$data['home'] = 0;
-			$data['path'] = '';
-			$data['params'] = '';
+			$data['img']          = 'class:component';
+			$data['home']         = 0;
+			$data['path']         = '';
+			$data['params']       = '';
 		}
 
 		// Try to create the menu item in the database
@@ -998,17 +1140,17 @@ protected function _buildAdminMenus($component_id = null)
 
 		foreach ($this->getManifest()->administration->submenu->menu as $child)
 		{
-			$data = array();
-			$data['menutype'] = 'main';
-			$data['client_id'] = 1;
-			$data['title'] = (string) trim($child);
-			$data['alias'] = (string) $child;
-			$data['type'] = 'component';
-			$data['published'] = 1;
-			$data['parent_id'] = $parent_id;
+			$data                 = array();
+			$data['menutype']     = 'main';
+			$data['client_id']    = 1;
+			$data['title']        = (string) trim($child);
+			$data['alias']        = (string) $child;
+			$data['type']         = 'component';
+			$data['published']    = 1;
+			$data['parent_id']    = $parent_id;
 			$data['component_id'] = $component_id;
-			$data['img'] = ((string) $child->attributes()->img) ?: 'class:component';
-			$data['home'] = 0;
+			$data['img']          = ((string) $child->attributes()->img) ?: 'class:component';
+			$data['home']         = 0;
 
 			// Set the sub menu link
 			if ((string) $child->attributes()->link)
@@ -1049,7 +1191,7 @@ protected function _buildAdminMenus($component_id = null)
 					$request[] = 'sub=' . $child->attributes()->sub;
 				}
 
-				$qstring = count($request) ? '&' . implode('&', $request) : '';
+				$qstring      = count($request) ? '&' . implode('&', $request) : '';
 				$data['link'] = 'index.php?option=' . $option . $qstring;
 			}
 
@@ -1077,6 +1219,8 @@ protected function _buildAdminMenus($component_id = null)
 	 *
 	 * @return  boolean  True if successful.
 	 *
+	 * @throws  \Exception
+	 *
 	 * @since   3.1
 	 */
 	protected function _removeAdminMenus($id)
@@ -1088,8 +1232,8 @@ protected function _removeAdminMenus($id)
 
 		// Get the ids of the menu items
 		$query = $db->getQuery(true)
-			->select('id')
-			->from('#__menu')
+			->select($db->quoteName('id'))
+			->from($db->quoteName('#__menu'))
 			->where($db->quoteName('client_id') . ' = 1')
 			->where($db->quoteName('menutype') . ' = ' . $db->quote('main'))
 			->where($db->quoteName('component_id') . ' = :id')
@@ -1097,8 +1241,7 @@ protected function _removeAdminMenus($id)
 
 		$db->setQuery($query);
 
-		$ids = $db->loadColumn();
-
+		$ids    = $db->loadColumn();
 		$result = true;
 
 		// Check for error
@@ -1155,12 +1298,12 @@ protected function _updateMenus($component_id, $clientId = null)
 		// Update all menu items which contain 'index.php?option=com_extension' or 'index.php?option=com_extension&...'
 		// to use the new component id.
 		$query = $db->getQuery(true)
-			->update('#__menu')
-			->set('component_id = ' . $db->quote($component_id))
-			->where('type = ' . $db->quote('component'))
+			->update($db->quoteName('#__menu'))
+			->set($db->quoteName('component_id') . ' = ' . $db->quote($component_id))
+			->where($db->quoteName('type') . ' = ' . $db->quote('component'))
 			->where('('
-				. 'link LIKE ' . $db->quote('index.php?option=' . $option) . ' OR '
-				. 'link LIKE ' . $db->quote($db->escape('index.php?option=' . $option . '&') . '%', false)
+				. $db->quoteName('link') . ' LIKE ' . $db->quote('index.php?option=' . $option) . ' OR '
+				. $db->quoteName('link') . ' LIKE ' . $db->quote($db->escape('index.php?option=' . $option . '&') . '%', false)
 				. ')');
 
 		if (isset($clientId))
@@ -1190,6 +1333,8 @@ protected function _updateMenus($component_id, $clientId = null)
 	 *
 	 * @return  boolean  True on success
 	 *
+	 * @throws  \Exception
+	 *
 	 * @since   3.1
 	 */
 	protected function _rollback_menu($step)
@@ -1206,9 +1351,10 @@ protected function _rollback_menu($step)
 	 */
 	public function discover()
 	{
-		$results = array();
-		$site_components = Folder::folders(JPATH_SITE . '/components');
+		$results          = array();
+		$site_components  = Folder::folders(JPATH_SITE . '/components');
 		$admin_components = Folder::folders(JPATH_ADMINISTRATOR . '/components');
+		$api_components = Folder::folders(JPATH_API . '/components');
 
 		foreach ($site_components as $component)
 		{
@@ -1251,6 +1397,26 @@ public function discover()
 			}
 		}
 
+		foreach ($api_components as $component)
+		{
+			if (file_exists(JPATH_API . '/components/' . $component . '/' . str_replace('com_', '', $component) . '.xml'))
+			{
+				$manifest_details = Installer::parseXMLInstallFile(
+					JPATH_API . '/components/' . $component . '/' . str_replace('com_', '', $component) . '.xml'
+				);
+				$extension = Table::getInstance('extension');
+				$extension->set('type', 'component');
+				$extension->set('client_id', 3);
+				$extension->set('element', $component);
+				$extension->set('folder', '');
+				$extension->set('name', $component);
+				$extension->set('state', -1);
+				$extension->set('manifest_cache', json_encode($manifest_details));
+				$extension->set('params', '{}');
+				$results[] = $extension;
+			}
+		}
+
 		return $results;
 	}
 
@@ -1264,15 +1430,21 @@ public function discover()
 	public function refreshManifestCache()
 	{
 		// Need to find to find where the XML file is since we don't store this normally
-		$client = ApplicationHelper::getClientInfo($this->parent->extension->client_id);
-		$short_element = str_replace('com_', '', $this->parent->extension->element);
-		$manifestPath = $client->path . '/components/' . $this->parent->extension->element . '/' . $short_element . '.xml';
+		$client                 = ApplicationHelper::getClientInfo($this->parent->extension->client_id);
+		$short_element          = str_replace('com_', '', $this->parent->extension->element);
+		$manifestPath           = $client->path . '/components/' . $this->parent->extension->element . '/' . $short_element . '.xml';
 		$this->parent->manifest = $this->parent->isManifest($manifestPath);
 		$this->parent->setPath('manifest', $manifestPath);
 
-		$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+		$manifest_details                        = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
 		$this->parent->extension->manifest_cache = json_encode($manifest_details);
-		$this->parent->extension->name = $manifest_details['name'];
+		$this->parent->extension->name           = $manifest_details['name'];
+
+		// Namespace is optional
+		if (isset($manifest_details['namespace']))
+		{
+			$this->parent->extension->namespace = $manifest_details['namespace'];
+		}
 
 		try
 		{
@@ -1293,6 +1465,10 @@ public function refreshManifestCache()
 	 * @param   integer  $parentId  The parent menu item ID
 	 *
 	 * @return  boolean|integer  Menu item ID on success, false on failure
+	 *
+	 * @throws  \Exception
+	 *
+	 * @since   3.1
 	 */
 	protected function _createAdminMenuItem(array &$data, $parentId)
 	{
diff --git a/libraries/src/Installer/Adapter/FileAdapter.php b/libraries/src/Installer/Adapter/FileAdapter.php
index 61deac202a171..d079ef300667e 100644
--- a/libraries/src/Installer/Adapter/FileAdapter.php
+++ b/libraries/src/Installer/Adapter/FileAdapter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -410,9 +410,10 @@ protected function storeExtension()
 		else
 		{
 			// Add an entry to the extension table with a whole heap of defaults
-			$this->extension->name = $this->name;
-			$this->extension->type = 'file';
-			$this->extension->element = $this->element;
+			$this->extension->name         = $this->name;
+			$this->extension->type         = 'file';
+			$this->extension->element      = $this->element;
+			$this->extension->changelogurl = $this->changelogurl;
 
 			// There is no folder for files so leave it blank
 			$this->extension->folder    = '';
diff --git a/libraries/src/Installer/Adapter/LanguageAdapter.php b/libraries/src/Installer/Adapter/LanguageAdapter.php
index 016728c3077bf..11a19dd2db60c 100644
--- a/libraries/src/Installer/Adapter/LanguageAdapter.php
+++ b/libraries/src/Installer/Adapter/LanguageAdapter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -486,6 +486,7 @@ protected function _install($cname, $basePath, $clientId, &$element)
 		$row->set('name', $this->name);
 		$row->set('type', 'language');
 		$row->set('element', $this->tag);
+		$row->set('changelogurl', (string) $this->getManifest()->changelogurl);
 
 		// There is no folder for languages
 		$row->set('folder', '');
@@ -765,6 +766,7 @@ public function update()
 		$row->set('type', 'language');
 		$row->set('element', $this->tag);
 		$row->set('manifest_cache', $this->parent->generateManifestCache());
+		$row->set('changelogurl', (string) $this->getManifest()->changelogurl);
 
 		// Clean installed languages cache.
 		Factory::getCache()->clean('com_languages');
@@ -790,8 +792,8 @@ public function update()
 	 */
 	public function discover()
 	{
-		$results = array();
-		$site_languages = Folder::folders(JPATH_SITE . '/language');
+		$results         = array();
+		$site_languages  = Folder::folders(JPATH_SITE . '/language');
 		$admin_languages = Folder::folders(JPATH_ADMINISTRATOR . '/language');
 
 		foreach ($site_languages as $language)
@@ -844,18 +846,18 @@ public function discover()
 	public function discover_install()
 	{
 		// Need to find to find where the XML file is since we don't store this normally
-		$client = ApplicationHelper::getClientInfo($this->parent->extension->client_id);
-		$short_element = $this->parent->extension->element;
-		$manifestPath = $client->path . '/language/' . $short_element . '/' . $short_element . '.xml';
+		$client                 = ApplicationHelper::getClientInfo($this->parent->extension->client_id);
+		$short_element          = $this->parent->extension->element;
+		$manifestPath           = $client->path . '/language/' . $short_element . '/' . $short_element . '.xml';
 		$this->parent->manifest = $this->parent->isManifest($manifestPath);
 		$this->parent->setPath('manifest', $manifestPath);
 		$this->parent->setPath('source', $client->path . '/language/' . $short_element);
 		$this->parent->setPath('extension_root', $this->parent->getPath('source'));
-		$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+		$manifest_details                        = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
 		$this->parent->extension->manifest_cache = json_encode($manifest_details);
-		$this->parent->extension->state = 0;
-		$this->parent->extension->name = $manifest_details['name'];
-		$this->parent->extension->enabled = 1;
+		$this->parent->extension->state          = 0;
+		$this->parent->extension->name           = $manifest_details['name'];
+		$this->parent->extension->enabled        = 1;
 
 		// @todo remove code: $this->parent->extension->params = $this->parent->getParams();
 		try
@@ -885,23 +887,21 @@ public function discover_install()
 	 */
 	public function refreshManifestCache()
 	{
-		$client = ApplicationHelper::getClientInfo($this->parent->extension->client_id);
-		$manifestPath = $client->path . '/language/' . $this->parent->extension->element . '/' . $this->parent->extension->element . '.xml';
+		$client                 = ApplicationHelper::getClientInfo($this->parent->extension->client_id);
+		$manifestPath           = $client->path . '/language/' . $this->parent->extension->element . '/' . $this->parent->extension->element . '.xml';
 		$this->parent->manifest = $this->parent->isManifest($manifestPath);
 		$this->parent->setPath('manifest', $manifestPath);
-		$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+		$manifest_details                        = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
 		$this->parent->extension->manifest_cache = json_encode($manifest_details);
-		$this->parent->extension->name = $manifest_details['name'];
+		$this->parent->extension->name           = $manifest_details['name'];
 
 		if ($this->parent->extension->store())
 		{
 			return true;
 		}
-		else
-		{
-			Log::add(Text::_('JLIB_INSTALLER_ERROR_MOD_REFRESH_MANIFEST_CACHE'), Log::WARNING, 'jerror');
 
-			return false;
-		}
+		Log::add(Text::_('JLIB_INSTALLER_ERROR_MOD_REFRESH_MANIFEST_CACHE'), Log::WARNING, 'jerror');
+
+		return false;
 	}
 }
diff --git a/libraries/src/Installer/Adapter/LibraryAdapter.php b/libraries/src/Installer/Adapter/LibraryAdapter.php
index 787d182805b41..c07240644e705 100644
--- a/libraries/src/Installer/Adapter/LibraryAdapter.php
+++ b/libraries/src/Installer/Adapter/LibraryAdapter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -94,10 +94,10 @@ protected function finaliseInstall()
 		// Clobber any possible pending updates
 		/** @var Update $update */
 		$update = Table::getInstance('update');
-		$uid = $update->find(
+		$uid    = $update->find(
 			array(
 				'element' => $this->element,
-				'type' => $this->type,
+				'type'    => $this->type,
 			)
 		);
 
@@ -109,9 +109,17 @@ protected function finaliseInstall()
 		// Lastly, we will copy the manifest file to its appropriate place.
 		if ($this->route !== 'discover_install')
 		{
-			$manifest = array();
-			$manifest['src'] = $this->parent->getPath('manifest');
-			$manifest['dest'] = JPATH_MANIFESTS . '/libraries/' . basename($this->parent->getPath('manifest'));
+			$manifest         = array();
+			$manifest['src']  = $this->parent->getPath('manifest');
+			$manifest['dest'] = JPATH_MANIFESTS . '/libraries/' . $this->element . '.xml';
+
+			$destFolder = dirname($manifest['dest']);
+
+			if (!is_dir($destFolder) && !@mkdir($destFolder))
+			{
+				// Install failed, rollback changes
+				throw new \RuntimeException(Text::_('JLIB_INSTALLER_ABORT_LIB_INSTALL_COPY_SETUP'));
+			}
 
 			if (!$this->parent->copyFiles(array($manifest), true))
 			{
@@ -122,7 +130,7 @@ protected function finaliseInstall()
 			// If there is a manifest script, let's copy it.
 			if ($this->manifest_script)
 			{
-				$path['src'] = $this->parent->getPath('source') . '/' . $this->manifest_script;
+				$path['src']  = $this->parent->getPath('source') . '/' . $this->manifest_script;
 				$path['dest'] = $this->parent->getPath('extension_root') . '/' . $this->manifest_script;
 
 				if ($this->parent->isOverwrite() || !file_exists($path['dest']))
@@ -196,8 +204,7 @@ public function getElement($element = null)
 	{
 		if (!$element)
 		{
-			$manifestPath = Path::clean($this->parent->getPath('manifest'));
-			$element = preg_replace('/\.xml/', '', basename($manifestPath));
+			$element  = (string) $this->getManifest()->libraryname;
 		}
 
 		return $element;
@@ -221,9 +228,9 @@ public function loadLanguage($path = null)
 			$this->parent->setPath('source', JPATH_PLATFORM . '/' . $this->getElement());
 		}
 
-		$extension = 'lib_' . $this->getElement();
+		$extension   = 'lib_' . str_replace('/', '_', $this->getElement());
 		$librarypath = (string) $this->getManifest()->libraryname;
-		$source = $path ?: JPATH_PLATFORM . '/' . $librarypath;
+		$source      = $path ?: JPATH_PLATFORM . '/' . $librarypath;
 
 		$this->doLoadLanguage($extension, $source, JPATH_SITE);
 	}
@@ -250,7 +257,7 @@ protected function parseOptionalTags()
 	 */
 	public function prepareDiscoverInstall()
 	{
-		$manifestPath = JPATH_MANIFESTS . '/libraries/' . $this->extension->element . '.xml';
+		$manifestPath           = JPATH_MANIFESTS . '/libraries/' . $this->extension->element . '.xml';
 		$this->parent->manifest = $this->parent->isManifest($manifestPath);
 		$this->parent->setPath('manifest', $manifestPath);
 		$this->setManifest($this->parent->getManifest());
@@ -286,6 +293,15 @@ protected function removeExtensionFiles()
 
 		$this->parent->removeFiles($this->getManifest()->media);
 		$this->parent->removeFiles($this->getManifest()->languages);
+
+		$elementParts = explode('/', $this->extension->element);
+
+		// Delete empty vendor folders
+		if (2 === count($elementParts))
+		{
+			Folder::delete(JPATH_MANIFESTS . '/libraries/' . $elementParts[0]);
+			Folder::delete(JPATH_PLATFORM . '/' . $elementParts[0]);
+		}
 	}
 
 	/**
@@ -372,10 +388,10 @@ protected function storeExtension()
 			$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
 
 			$this->extension->manifest_cache = json_encode($manifest_details);
-			$this->extension->state = 0;
-			$this->extension->name = $manifest_details['name'];
-			$this->extension->enabled = 1;
-			$this->extension->params = $this->parent->getParams();
+			$this->extension->state          = 0;
+			$this->extension->name           = $manifest_details['name'];
+			$this->extension->enabled        = 1;
+			$this->extension->params         = $this->parent->getParams();
 
 			if (!$this->extension->store())
 			{
@@ -386,9 +402,10 @@ protected function storeExtension()
 			return;
 		}
 
-		$this->extension->name = $this->name;
-		$this->extension->type = 'library';
-		$this->extension->element = $this->element;
+		$this->extension->name         = $this->name;
+		$this->extension->type         = 'library';
+		$this->extension->element      = $this->element;
+		$this->extension->changelogurl = $this->changelogurl;
 
 		// There is no folder for libraries
 		$this->extension->folder    = '';
@@ -444,8 +461,8 @@ public function update()
 		 */
 
 		// Set the extensions name
-		$name = (string) $this->getManifest()->name;
-		$name = InputFilter::getInstance()->clean($name, 'string');
+		$name    = (string) $this->getManifest()->name;
+		$name    = InputFilter::getInstance()->clean($name, 'string');
 		$element = str_replace('.xml', '', basename($this->parent->getPath('manifest')));
 
 		$this->name    = $name;
@@ -453,8 +470,8 @@ public function update()
 
 		// We don't want to compromise this instance!
 		$installer = new Installer;
-		$db = $this->parent->getDbo();
-		$query = $db->getQuery(true)
+		$db        = $this->parent->getDbo();
+		$query     = $db->getQuery(true)
 			->select($db->quoteName('extension_id'))
 			->from($db->quoteName('#__extensions'))
 			->where($db->quoteName('type') . ' = ' . $db->quote('library'))
@@ -471,7 +488,7 @@ public function update()
 
 			// Clear the cached data
 			$this->currentExtensionId = null;
-			$this->extension = Table::getInstance('Extension', 'JTable', array('dbo' => $this->db));
+			$this->extension          = Table::getInstance('Extension', 'JTable', array('dbo' => $this->db));
 		}
 
 		// Now create the new files
@@ -488,20 +505,28 @@ public function update()
 	public function discover()
 	{
 		$results = array();
-		$file_list = Folder::files(JPATH_MANIFESTS . '/libraries', '\.xml$');
 
-		foreach ($file_list as $file)
+		$mainFolder = JPATH_MANIFESTS . '/libraries';
+		$folder = new \RecursiveDirectoryIterator($mainFolder);
+		$iterator = new \RegexIterator(
+			new \RecursiveIteratorIterator($folder),
+			'/\.xml$/i',
+			\RecursiveRegexIterator::GET_MATCH
+		);
+
+		foreach ($iterator as $file => $pattern)
 		{
-			$manifest_details = Installer::parseXMLInstallFile(JPATH_MANIFESTS . '/libraries/' . $file);
-			$file = File::stripExt($file);
+			$element       = str_replace(array($mainFolder . DIRECTORY_SEPARATOR, '.xml'), '', $file);
+			$manifestCache = Installer::parseXMLInstallFile($file);
+
 			$extension = Table::getInstance('extension');
 			$extension->set('type', 'library');
 			$extension->set('client_id', 0);
-			$extension->set('element', $file);
+			$extension->set('element', $element);
 			$extension->set('folder', '');
-			$extension->set('name', $file);
+			$extension->set('name', $element);
 			$extension->set('state', -1);
-			$extension->set('manifest_cache', json_encode($manifest_details));
+			$extension->set('manifest_cache', json_encode($manifestCache));
 			$extension->set('params', '{}');
 			$results[] = $extension;
 		}
@@ -519,13 +544,13 @@ public function discover()
 	public function refreshManifestCache()
 	{
 		// Need to find to find where the XML file is since we don't store this normally
-		$manifestPath = JPATH_MANIFESTS . '/libraries/' . $this->parent->extension->element . '.xml';
+		$manifestPath           = JPATH_MANIFESTS . '/libraries/' . $this->parent->extension->element . '.xml';
 		$this->parent->manifest = $this->parent->isManifest($manifestPath);
 		$this->parent->setPath('manifest', $manifestPath);
 
-		$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+		$manifest_details                        = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
 		$this->parent->extension->manifest_cache = json_encode($manifest_details);
-		$this->parent->extension->name = $manifest_details['name'];
+		$this->parent->extension->name           = $manifest_details['name'];
 
 		try
 		{
diff --git a/libraries/src/Installer/Adapter/ModuleAdapter.php b/libraries/src/Installer/Adapter/ModuleAdapter.php
index 576ae27d206e4..925522b534abc 100644
--- a/libraries/src/Installer/Adapter/ModuleAdapter.php
+++ b/libraries/src/Installer/Adapter/ModuleAdapter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -619,10 +619,11 @@ protected function storeExtension()
 		}
 		else
 		{
-			$this->extension->name      = $this->name;
-			$this->extension->type      = 'module';
-			$this->extension->element   = $this->element;
-			$this->extension->namespace = (string) $this->manifest->namespace;
+			$this->extension->name         = $this->name;
+			$this->extension->type         = 'module';
+			$this->extension->element      = $this->element;
+			$this->extension->namespace    = (string) $this->manifest->namespace;
+			$this->extension->changelogurl = $this->changelogurl;
 
 			// There is no folder for modules
 			$this->extension->folder    = '';
diff --git a/libraries/src/Installer/Adapter/PackageAdapter.php b/libraries/src/Installer/Adapter/PackageAdapter.php
index 31a1f9cb5d7aa..f10fadf7f5b7a 100644
--- a/libraries/src/Installer/Adapter/PackageAdapter.php
+++ b/libraries/src/Installer/Adapter/PackageAdapter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -556,9 +556,10 @@ protected function storeExtension()
 		}
 		else
 		{
-			$this->extension->name    = $this->name;
-			$this->extension->type    = 'package';
-			$this->extension->element = $this->element;
+			$this->extension->name         = $this->name;
+			$this->extension->type         = 'package';
+			$this->extension->element      = $this->element;
+			$this->extension->changelogurl = $this->changelogurl;
 
 			// There is no folder for packages
 			$this->extension->folder    = '';
diff --git a/libraries/src/Installer/Adapter/PluginAdapter.php b/libraries/src/Installer/Adapter/PluginAdapter.php
index 7ac5e2147f9fa..91f11f21a0768 100644
--- a/libraries/src/Installer/Adapter/PluginAdapter.php
+++ b/libraries/src/Installer/Adapter/PluginAdapter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -443,10 +443,10 @@ protected function storeExtension()
 			$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
 
 			$this->extension->manifest_cache = json_encode($manifest_details);
-			$this->extension->state = 0;
-			$this->extension->name = $manifest_details['name'];
-			$this->extension->enabled = 'editors' === $this->extension->folder ? 1 : 0;
-			$this->extension->params = $this->parent->getParams();
+			$this->extension->state          = 0;
+			$this->extension->name           = $manifest_details['name'];
+			$this->extension->enabled        = 'editors' === $this->extension->folder ? 1 : 0;
+			$this->extension->params         = $this->parent->getParams();
 
 			if (!$this->extension->store())
 			{
@@ -482,16 +482,17 @@ protected function storeExtension()
 		else
 		{
 			// Store in the extensions table (1.6)
-			$this->extension->name      = $this->name;
-			$this->extension->type      = 'plugin';
-			$this->extension->ordering  = 0;
-			$this->extension->element   = $this->element;
-			$this->extension->folder    = $this->group;
-			$this->extension->enabled   = 0;
-			$this->extension->protected = 0;
-			$this->extension->access    = 1;
-			$this->extension->client_id = 0;
-			$this->extension->params    = $this->parent->getParams();
+			$this->extension->name         = $this->name;
+			$this->extension->type         = 'plugin';
+			$this->extension->ordering     = 0;
+			$this->extension->element      = $this->element;
+			$this->extension->folder       = $this->group;
+			$this->extension->enabled      = 0;
+			$this->extension->protected    = 0;
+			$this->extension->access       = 1;
+			$this->extension->client_id    = 0;
+			$this->extension->params       = $this->parent->getParams();
+			$this->extension->changelogurl = $this->changelogurl;
 
 			// Update the manifest cache for the entry
 			$this->extension->manifest_cache = $this->parent->generateManifestCache();
diff --git a/libraries/src/Installer/Adapter/TemplateAdapter.php b/libraries/src/Installer/Adapter/TemplateAdapter.php
index 5bfe4cdad9873..ae7cf74c2a00c 100644
--- a/libraries/src/Installer/Adapter/TemplateAdapter.php
+++ b/libraries/src/Installer/Adapter/TemplateAdapter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -343,8 +343,8 @@ protected function parseQueries()
 	 */
 	public function prepareDiscoverInstall()
 	{
-		$client = ApplicationHelper::getClientInfo($this->extension->client_id);
-		$manifestPath = $client->path . '/templates/' . $this->extension->element . '/templateDetails.xml';
+		$client                 = ApplicationHelper::getClientInfo($this->extension->client_id);
+		$manifestPath           = $client->path . '/templates/' . $this->extension->element . '/templateDetails.xml';
 		$this->parent->manifest = $this->parent->isManifest($manifestPath);
 		$this->parent->setPath('manifest', $manifestPath);
 		$this->setManifest($this->parent->getManifest());
@@ -398,13 +398,13 @@ protected function setupInstallPaths()
 				throw new \RuntimeException(Text::sprintf('JLIB_INSTALLER_ABORT_TPL_INSTALL_UNKNOWN_CLIENT', $cname));
 			}
 
-			$basePath = $client->path;
+			$basePath       = $client->path;
 			$this->clientId = $client->id;
 		}
 		else
 		{
 			// No client attribute was found so we assume the site as the client
-			$basePath = JPATH_SITE;
+			$basePath       = JPATH_SITE;
 			$this->clientId = 0;
 		}
 
@@ -537,12 +537,13 @@ protected function storeExtension()
 			$this->extension->element = $this->element;
 
 			// There is no folder for templates
-			$this->extension->folder    = '';
-			$this->extension->enabled   = 1;
-			$this->extension->protected = 0;
-			$this->extension->access    = 1;
-			$this->extension->client_id = $this->clientId;
-			$this->extension->params    = $this->parent->getParams();
+			$this->extension->folder       = '';
+			$this->extension->enabled      = 1;
+			$this->extension->protected    = 0;
+			$this->extension->access       = 1;
+			$this->extension->client_id    = $this->clientId;
+			$this->extension->params       = $this->parent->getParams();
+			$this->extension->changelogurl = $this->changelogurl;
 		}
 
 		// Name might change in an update
@@ -551,6 +552,8 @@ protected function storeExtension()
 		// Update the manifest cache for the entry
 		$this->extension->manifest_cache = $this->parent->generateManifestCache();
 
+		$this->extension->changelogurl = $this->changelogurl;
+
 		if (!$this->extension->store())
 		{
 			// Install failed, roll back changes
@@ -571,10 +574,10 @@ protected function storeExtension()
 	 */
 	public function discover()
 	{
-		$results = array();
-		$site_list = Folder::folders(JPATH_SITE . '/templates');
+		$results    = array();
+		$site_list  = Folder::folders(JPATH_SITE . '/templates');
 		$admin_list = Folder::folders(JPATH_ADMINISTRATOR . '/templates');
-		$site_info = ApplicationHelper::getClientInfo('site', true);
+		$site_info  = ApplicationHelper::getClientInfo('site', true);
 		$admin_info = ApplicationHelper::getClientInfo('administrator', true);
 
 		foreach ($site_list as $template)
@@ -588,7 +591,7 @@ public function discover()
 				}
 
 				$manifest_details = Installer::parseXMLInstallFile(JPATH_SITE . "/templates/$template/templateDetails.xml");
-				$extension = Table::getInstance('extension');
+				$extension        = Table::getInstance('extension');
 				$extension->set('type', 'template');
 				$extension->set('client_id', $site_info->id);
 				$extension->set('element', $template);
@@ -612,7 +615,7 @@ public function discover()
 				}
 
 				$manifest_details = Installer::parseXMLInstallFile(JPATH_ADMINISTRATOR . "/templates/$template/templateDetails.xml");
-				$extension = Table::getInstance('extension');
+				$extension        = Table::getInstance('extension');
 				$extension->set('type', 'template');
 				$extension->set('client_id', $admin_info->id);
 				$extension->set('element', $template);
@@ -638,14 +641,14 @@ public function discover()
 	public function refreshManifestCache()
 	{
 		// Need to find to find where the XML file is since we don't store this normally.
-		$client = ApplicationHelper::getClientInfo($this->parent->extension->client_id);
-		$manifestPath = $client->path . '/templates/' . $this->parent->extension->element . '/templateDetails.xml';
+		$client                 = ApplicationHelper::getClientInfo($this->parent->extension->client_id);
+		$manifestPath           = $client->path . '/templates/' . $this->parent->extension->element . '/templateDetails.xml';
 		$this->parent->manifest = $this->parent->isManifest($manifestPath);
 		$this->parent->setPath('manifest', $manifestPath);
 
-		$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+		$manifest_details                        = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
 		$this->parent->extension->manifest_cache = json_encode($manifest_details);
-		$this->parent->extension->name = $manifest_details['name'];
+		$this->parent->extension->name           = $manifest_details['name'];
 
 		try
 		{
diff --git a/libraries/src/Installer/Installer.php b/libraries/src/Installer/Installer.php
index ebf7d6f7c3c6b..1c27fd2d53b44 100644
--- a/libraries/src/Installer/Installer.php
+++ b/libraries/src/Installer/Installer.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -2412,7 +2412,7 @@ public function loadAdapter($adapter, $options = array())
 		$options['type'] = $adapter;
 
 		// Check for a possible service from the container otherwise manually instantiate the class
-		if (Factory::getContainer()->exists($class))
+		if (Factory::getContainer()->has($class))
 		{
 			return Factory::getContainer()->get($class);
 		}
diff --git a/libraries/src/Installer/InstallerAdapter.php b/libraries/src/Installer/InstallerAdapter.php
index 8869bd6658a07..ecd6725677254 100644
--- a/libraries/src/Installer/InstallerAdapter.php
+++ b/libraries/src/Installer/InstallerAdapter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -28,6 +28,14 @@
  */
 abstract class InstallerAdapter
 {
+	/**
+	 * Changelog URL of extensions
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 * */
+	protected $changelogurl = null;
+
 	/**
 	 * ID for the currently installed extension if present
 	 *
@@ -666,20 +674,18 @@ protected function getScriptClassName()
 	public function install()
 	{
 		// Get the extension's description
-		$description = (string) $this->getManifest()->description;
+		$description           = (string) $this->getManifest()->description;
+		$this->parent->message = '';
 
 		if ($description)
 		{
 			$this->parent->message = Text::_($description);
 		}
-		else
-		{
-			$this->parent->message = '';
-		}
 
 		// Set the extension's name and element
-		$this->name    = $this->getName();
-		$this->element = $this->getElement();
+		$this->name         = $this->getName();
+		$this->element      = $this->getElement();
+		$this->changelogurl = (string) $this->getManifest()->changelogurl;
 
 		/*
 		 * ---------------------------------------------------------------------------------------------
diff --git a/libraries/src/Installer/InstallerExtension.php b/libraries/src/Installer/InstallerExtension.php
index 0ddbad93d1b17..05eefea56316d 100644
--- a/libraries/src/Installer/InstallerExtension.php
+++ b/libraries/src/Installer/InstallerExtension.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Installer/InstallerHelper.php b/libraries/src/Installer/InstallerHelper.php
index 7f63fe427b95a..c2febec489a24 100644
--- a/libraries/src/Installer/InstallerHelper.php
+++ b/libraries/src/Installer/InstallerHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -19,6 +19,7 @@
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Version;
+use Joomla\CMS\Updater\Update;
 
 /**
  * Installer helper class
@@ -27,6 +28,30 @@
  */
 abstract class InstallerHelper
 {
+	/**
+	 * Hash not validated identifier.
+	 *
+	 * @var    integer
+	 * @since  3.9.0
+	 */	
+	const HASH_NOT_VALIDATED = 0;
+
+	/**
+	 * Hash validated identifier.
+	 *
+	 * @var    integer
+	 * @since  3.9.0
+	 */
+	const HASH_VALIDATED = 1;
+
+	/**
+	 * Hash not provided identifier.
+	 *
+	 * @var    integer
+	 * @since  3.9.0
+	 */
+	const HASH_NOT_PROVIDED = 2;
+
 	/**
 	 * Downloads a package
 	 *
@@ -312,4 +337,42 @@ public static function cleanupInstall($package, $resultdir)
 			File::delete(Path::clean(Factory::getApplication()->get('tmp_path') . '/' . $package));
 		}
 	}
+
+	/**
+	 * Return the result of the checksum of a package with the SHA256/SHA384/SHA512 tags in the update server manifest
+	 *
+	 * @param   string  $packagefile   Location of the package to be installed
+	 * @param   Update  $updateObject  The Update Object
+	 *
+	 * @return  integer  one if the hashes match, zero if hashes doesn't match, two if hashes not found
+	 *
+	 * @since   3.9.0
+	 */
+	public static function isChecksumValid($packagefile, $updateObject)
+	{
+		$hashes     = array('sha256', 'sha384', 'sha512');
+		$hashOnFile = false;
+
+		foreach ($hashes as $hash)
+		{
+			if ($updateObject->get($hash, false))
+			{
+				$hashPackage = hash_file($hash, $packagefile);
+				$hashRemote  = $updateObject->$hash->_data;
+				$hashOnFile  = true;
+
+				if ($hashPackage !== $hashRemote)
+				{
+					return self::HASH_NOT_VALIDATED;
+				}
+			}
+		}
+
+		if ($hashOnFile)
+		{
+			return self::HASH_VALIDATED;
+		}
+
+		return self::HASH_NOT_PROVIDED;
+	}
 }
diff --git a/libraries/src/Installer/InstallerScript.php b/libraries/src/Installer/InstallerScript.php
index 18ba38ef2e712..c7351f66915b4 100644
--- a/libraries/src/Installer/InstallerScript.php
+++ b/libraries/src/Installer/InstallerScript.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Installer/Manifest.php b/libraries/src/Installer/Manifest.php
index 703ad56e05829..2adf3a5a457d6 100644
--- a/libraries/src/Installer/Manifest.php
+++ b/libraries/src/Installer/Manifest.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Installer/Manifest/LibraryManifest.php b/libraries/src/Installer/Manifest/LibraryManifest.php
index 3ad2da4e208af..05f36da0928ba 100644
--- a/libraries/src/Installer/Manifest/LibraryManifest.php
+++ b/libraries/src/Installer/Manifest/LibraryManifest.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Installer/Manifest/PackageManifest.php b/libraries/src/Installer/Manifest/PackageManifest.php
index 2cd4b4c8c38de..f869703afaf91 100644
--- a/libraries/src/Installer/Manifest/PackageManifest.php
+++ b/libraries/src/Installer/Manifest/PackageManifest.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Language/Associations.php b/libraries/src/Language/Associations.php
index 4114f93fb2944..6c7fe7e52d285 100644
--- a/libraries/src/Language/Associations.php
+++ b/libraries/src/Language/Associations.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,6 +11,7 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\Registry\Registry;
 
 /**
@@ -157,7 +158,7 @@ public static function isEnabled()
 			// If already tested, don't test again.
 			if (!$tested)
 			{
-				$plugin = \JPluginHelper::getPlugin('system', 'languagefilter');
+				$plugin = PluginHelper::getPlugin('system', 'languagefilter');
 
 				if (!empty($plugin))
 				{
diff --git a/libraries/src/Language/CachingLanguageFactory.php b/libraries/src/Language/CachingLanguageFactory.php
index c307b453ac155..5825f07faaad8 100644
--- a/libraries/src/Language/CachingLanguageFactory.php
+++ b/libraries/src/Language/CachingLanguageFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Language/Language.php b/libraries/src/Language/Language.php
index 209d780ad8a58..4b249e3cfcf4b 100644
--- a/libraries/src/Language/Language.php
+++ b/libraries/src/Language/Language.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,11 +13,6 @@
 use Joomla\CMS\Factory;
 use Joomla\String\StringHelper;
 
-/**
- * Allows for quoting in language .ini files.
- */
-define('_QQ_', '"');
-
 /**
  * Languages/translation handler class
  *
@@ -198,19 +193,7 @@ public function __construct($lang = null, $debug = false)
 		$this->metadata = LanguageHelper::getMetadata($this->lang);
 		$this->setDebug($debug);
 
-		$filename = JPATH_BASE . "/language/overrides/$lang.override.ini";
-
-		if (file_exists($filename) && $contents = $this->parse($filename))
-		{
-			if (is_array($contents))
-			{
-				// Sort the underlying heap by key values to optimize merging
-				ksort($contents, SORT_STRING);
-				$this->override = $contents;
-			}
-
-			unset($contents);
-		}
+		$this->override = $this->parse(JPATH_BASE . '/language/overrides/' . $lang . '.override.ini');
 
 		// Look for a language specific localise class
 		$class = str_replace('-', '_', $lang . 'Localise');
@@ -334,11 +317,14 @@ public function _($string, $jsSafe = false, $interpretBackSlashes = true)
 
 		if (isset($this->strings[$key]))
 		{
-			$string = $this->debug ? '**' . $this->strings[$key] . '**' : $this->strings[$key];
+			$string = $this->strings[$key];
 
 			// Store debug information
 			if ($this->debug)
 			{
+				$value = \JFactory::getApplication()->get('debug_lang_const') == 0 ? $key : $string;
+				$string = '**' . $value . '**';
+
 				$caller = $this->getCallerInfo();
 
 				if (!array_key_exists($key, $this->used))
@@ -755,7 +741,7 @@ public function load($extension = 'joomla', $basePath = JPATH_BASE, $lang = null
 	 *
 	 * This method will not note the successful loading of a file - use load() instead.
 	 *
-	 * @param   string  $filename   The name of the file.
+	 * @param   string  $fileName   The name of the file.
 	 * @param   string  $extension  The name of the extension.
 	 *
 	 * @return  boolean  True if new strings have been added to the language
@@ -763,19 +749,14 @@ public function load($extension = 'joomla', $basePath = JPATH_BASE, $lang = null
 	 * @see     Language::load()
 	 * @since   1.7.0
 	 */
-	protected function loadLanguage($filename, $extension = 'unknown')
+	protected function loadLanguage($fileName, $extension = 'unknown')
 	{
 		$this->counter++;
 
-		$result = false;
-		$strings = false;
+		$result  = false;
+		$strings = $this->parse($fileName);
 
-		if (file_exists($filename))
-		{
-			$strings = $this->parse($filename);
-		}
-
-		if (is_array($strings) && count($strings))
+		if ($strings !== array())
 		{
 			$this->strings = array_replace($this->strings, $strings, $this->override);
 			$result = true;
@@ -787,7 +768,7 @@ protected function loadLanguage($filename, $extension = 'unknown')
 			$this->paths[$extension] = array();
 		}
 
-		$this->paths[$extension][$filename] = $result;
+		$this->paths[$extension][$fileName] = $result;
 
 		return $result;
 	}
@@ -795,51 +776,20 @@ protected function loadLanguage($filename, $extension = 'unknown')
 	/**
 	 * Parses a language file.
 	 *
-	 * @param   string  $filename  The name of the file.
+	 * @param   string  $fileName  The name of the file.
 	 *
 	 * @return  array  The array of parsed strings.
 	 *
 	 * @since   1.7.0
 	 */
-	protected function parse($filename)
+	protected function parse($fileName)
 	{
-		// Capture hidden PHP errors from the parsing.
-		if ($this->debug)
-		{
-			// See https://secure.php.net/manual/en/reserved.variables.phperrormsg.php
-			$php_errormsg = null;
+		$strings = LanguageHelper::parseIniFile($fileName, $this->debug);
 
-			$trackErrors = ini_get('track_errors');
-			ini_set('track_errors', true);
-		}
-
-		// This was required for https://github.com/joomla/joomla-cms/issues/17198 but not sure what server setup
-		// issue it is solving
-		$disabledFunctions = explode(',', ini_get('disable_functions'));
-		$isParseIniFileDisabled = in_array('parse_ini_file', array_map('trim', $disabledFunctions));
-
-		if (!function_exists('parse_ini_file') || $isParseIniFileDisabled)
+		// Debug the ini file if needed.
+		if ($this->debug === true && file_exists($fileName))
 		{
-			$contents = file_get_contents($filename);
-			$contents = str_replace('"_QQ_"', '\\"', $contents);
-			$strings  = @parse_ini_string($contents, INI_SCANNER_RAW);
-		}
-		else
-		{
-			$strings = @parse_ini_file($filename);
-		}
-
-		if (!is_array($strings))
-		{
-			$strings = array();
-		}
-
-		// Restore error tracking to what it was before.
-		if ($this->debug)
-		{
-			ini_set('track_errors', $trackErrors);
-
-			$this->debugFile($filename);
+			$this->debugFile($fileName);
 		}
 
 		return $strings;
@@ -980,7 +930,7 @@ protected function getTrace()
 	}
 
 	/**
-	 * Determine who called Language or JText.
+	 * Determine who called Language or Text.
 	 *
 	 * @return  array  Caller information.
 	 *
@@ -1006,7 +956,7 @@ protected function getCallerInfo()
 			$class = @ $step['class'];
 
 			// We're looking for something outside of language.php
-			if ($class != '\\Joomla\\CMS\\Language\\Language' && $class != 'JText')
+			if ($class != self::class && $class != Text::class)
 			{
 				$info['function'] = @ $step['function'];
 				$info['class'] = $class;
diff --git a/libraries/src/Language/LanguageFactory.php b/libraries/src/Language/LanguageFactory.php
index bc4506399a9ea..d54fca6cadec7 100644
--- a/libraries/src/Language/LanguageFactory.php
+++ b/libraries/src/Language/LanguageFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Language/LanguageFactoryInterface.php b/libraries/src/Language/LanguageFactoryInterface.php
index 03182b5428550..7efa09713d0b9 100644
--- a/libraries/src/Language/LanguageFactoryInterface.php
+++ b/libraries/src/Language/LanguageFactoryInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Language/LanguageHelper.php b/libraries/src/Language/LanguageHelper.php
index ef73fa57da7a5..847317624fd40 100644
--- a/libraries/src/Language/LanguageHelper.php
+++ b/libraries/src/Language/LanguageHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,6 +14,7 @@
 use Joomla\CMS\Cache\Controller\OutputController;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\File;
+use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Log\Log;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
@@ -21,7 +22,7 @@
 /**
  * Language helper class
  *
- * @since  1.7.0
+ * @since  1.5
  */
 class LanguageHelper
 {
@@ -35,7 +36,7 @@ class LanguageHelper
 	 *
 	 * @return  array  List of system languages
 	 *
-	 * @since   1.7.0
+	 * @since   1.5
 	 */
 	public static function createLanguageList($actualLanguage, $basePath = JPATH_BASE, $caching = false, $installed = false)
 	{
@@ -62,7 +63,7 @@ public static function createLanguageList($actualLanguage, $basePath = JPATH_BAS
 	 *
 	 * @return  string  locale or null if not found
 	 *
-	 * @since   1.7.0
+	 * @since   1.5
 	 */
 	public static function detectLanguage()
 	{
@@ -112,7 +113,7 @@ public static function detectLanguage()
 	 *
 	 * @return  array  An array of published languages
 	 *
-	 * @since   1.7.0
+	 * @since   1.6
 	 */
 	public static function getLanguages($key = 'default')
 	{
@@ -272,7 +273,7 @@ public static function getInstalledLanguages($clientId = null, $processMetaData
 				{
 					try
 					{
-						$lang->manifest = \JInstaller::parseXMLInstallFile($metafile);
+						$lang->manifest = Installer::parseXMLInstallFile($metafile);
 					}
 
 					// Not able to process xml language file. Fail silently.
@@ -418,17 +419,83 @@ public static function getContentLanguages($publishedStates = array(1), $checkIn
 		return $languages;
 	}
 
+	/**
+	 * Parse strings from a language file.
+	 *
+	 * @param   string   $fileName  The language ini file path.
+	 * @param   boolean  $debug     If set to true debug language ini file.
+	 *
+	 * @return  array  The strings parsed.
+	 *
+	 * @since   3.9.0
+	 */
+	public static function parseIniFile($fileName, $debug = false)
+	{
+		// Check if file exists.
+		if (!file_exists($fileName))
+		{
+			return array();
+		}
+
+		// @deprecated 3.9.0 Usage of "_QQ_" is deprecated. Use escaped double quotes (\") instead.
+		if (!defined('_QQ_'))
+		{
+			/**
+			 * Defines a placeholder for a double quote character (") in a language file
+			 *
+			 * @var    string
+			 * @since  1.6
+			 * @deprecated  4.0 Use escaped double quotes (\") instead.
+			 */
+			define('_QQ_', '"');
+		}
+
+		// Capture hidden PHP errors from the parsing.
+		if ($debug === true)
+		{
+			// See https://secure.php.net/manual/en/reserved.variables.phperrormsg.php
+			$php_errormsg = null;
+
+			$trackErrors = ini_get('track_errors');
+			ini_set('track_errors', true);
+		}
+
+		// This was required for https://github.com/joomla/joomla-cms/issues/17198 but not sure what server setup
+		// issue it is solving
+		$disabledFunctions = explode(',', ini_get('disable_functions'));
+		$isParseIniFileDisabled = in_array('parse_ini_file', array_map('trim', $disabledFunctions));
+
+		if (!function_exists('parse_ini_file') || $isParseIniFileDisabled)
+		{
+			$contents = file_get_contents($fileName);
+			$contents = str_replace('_QQ_', '"\""', $contents);
+			$strings = @parse_ini_string($contents);
+		}
+		else
+		{
+			$strings = @parse_ini_file($fileName);
+		}
+
+		// Restore error tracking to what it was before.
+		if ($debug === true)
+		{
+			ini_set('track_errors', $trackErrors);
+		}
+
+		return is_array($strings) ? $strings : array();
+	}
+
 	/**
 	 * Save strings to a language file.
 	 *
-	 * @param   string  $filename  The language ini file path.
+	 * @param   string  $fileName  The language ini file path.
 	 * @param   array   $strings   The array of strings.
 	 *
 	 * @return  boolean  True if saved, false otherwise.
 	 *
 	 * @since   3.7.0
 	 */
-	public static function saveToIniFile($filename, array $strings)
+	public static function saveToIniFile($fileName, array $strings)
 	{
 		// Escape double quotes.
 		foreach ($strings as $key => $string)
@@ -439,7 +506,7 @@ public static function saveToIniFile($filename, array $strings)
 		// Write override.ini file with the strings.
 		$registry = new Registry($strings);
 
-		return File::write($filename, $registry->toString('INI'));
+		return File::write($fileName, $registry->toString('INI'));
 	}
 
 	/**
diff --git a/libraries/src/Language/LanguageStemmer.php b/libraries/src/Language/LanguageStemmer.php
index 091c4b0ab1545..c2d5a869d5cfb 100644
--- a/libraries/src/Language/LanguageStemmer.php
+++ b/libraries/src/Language/LanguageStemmer.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Language/Multilanguage.php b/libraries/src/Language/Multilanguage.php
index f84f379d93186..42b9f7e22ed35 100644
--- a/libraries/src/Language/Multilanguage.php
+++ b/libraries/src/Language/Multilanguage.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Language/Stemmer/Porteren.php b/libraries/src/Language/Stemmer/Porteren.php
index a2227d87129ff..6ccd3b7c85445 100644
--- a/libraries/src/Language/Stemmer/Porteren.php
+++ b/libraries/src/Language/Stemmer/Porteren.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @copyright  Copyright (C) 2005 Richard Heyes (http://www.phpguru.org/). All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
diff --git a/libraries/src/Language/Text.php b/libraries/src/Language/Text.php
index fbbd70df24a79..7dfecd6136e26 100644
--- a/libraries/src/Language/Text.php
+++ b/libraries/src/Language/Text.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -33,7 +33,7 @@ class Text
 	 * Translates a string into the current language.
 	 *
 	 * Examples:
-	 * `<script>alert(Joomla.JText._('<?php echo Text::_("JDEFAULT", array("script"=>true)); ?>'));</script>`
+	 * `<script>alert(Joomla.Text._('<?php echo Text::_("JDEFAULT", array("script"=>true)); ?>'));</script>`
 	 * will generate an alert message containing 'Default'
 	 * `<?php echo Text::_("JDEFAULT"); ?>` will generate a 'Default' string
 	 *
@@ -184,7 +184,7 @@ public static function alt($string, $alt, $jsSafe = false, $interpretBackSlashes
 	 * script is a boolean to indicate that the string will be push in the javascript language store.
 	 *
 	 * Examples:
-	 * `<script>alert(Joomla.JText._('<?php echo Text::plural("COM_PLUGINS_N_ITEMS_UNPUBLISHED", 1, array("script"=>true)); ?>'));</script>`
+	 * `<script>alert(Joomla.Text._('<?php echo Text::plural("COM_PLUGINS_N_ITEMS_UNPUBLISHED", 1, array("script"=>true)); ?>'));</script>`
 	 * will generate an alert message containing '1 plugin successfully disabled'
 	 * `<?php echo Text::plural('COM_PLUGINS_N_ITEMS_UNPUBLISHED', 1); ?>` will generate a '1 plugin successfully disabled' string
 	 *
@@ -405,7 +405,7 @@ public static function script($string = null, $jsSafe = false, $interpretBackSla
 			// Load core.js dependency
 			HTMLHelper::_('behavior.core');
 
-			// Update Joomla.JText script options
+			// Update Joomla.Text script options
 			Factory::getDocument()->addScriptOptions('joomla.jtext', static::$strings, false);
 		}
 
diff --git a/libraries/src/Language/Transliterate.php b/libraries/src/Language/Transliterate.php
index fdab39914d103..1166d36a6ff89 100644
--- a/libraries/src/Language/Transliterate.php
+++ b/libraries/src/Language/Transliterate.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Layout/BaseLayout.php b/libraries/src/Layout/BaseLayout.php
index da0f62ad85221..7ffb5e9881255 100644
--- a/libraries/src/Layout/BaseLayout.php
+++ b/libraries/src/Layout/BaseLayout.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -110,6 +110,8 @@ public function resetOptions()
 	 *
 	 * @return  string  The escaped output.
 	 *
+	 * @note the ENT_COMPAT flag will be replaced by ENT_QUOTES in Joomla 4.0 to also escape single quotes
+	 *
 	 * @since   3.0
 	 */
 	public function escape($output)
diff --git a/libraries/src/Layout/FileLayout.php b/libraries/src/Layout/FileLayout.php
index a969db949f564..1c9cfc3b58887 100644
--- a/libraries/src/Layout/FileLayout.php
+++ b/libraries/src/Layout/FileLayout.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Layout/LayoutHelper.php b/libraries/src/Layout/LayoutHelper.php
index 0d63586e1c432..e7b84c29cb399 100644
--- a/libraries/src/Layout/LayoutHelper.php
+++ b/libraries/src/Layout/LayoutHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -31,7 +31,7 @@ class LayoutHelper
 	 * Method to render a layout with debug info
 	 *
 	 * @param   string  $layoutFile   Dot separated path to the layout file, relative to base path
-	 * @param   object  $displayData  Object which properties are used inside the layout file to build displayed output
+	 * @param   mixed   $displayData  Object which properties are used inside the layout file to build displayed output
 	 * @param   string  $basePath     Base path to use when loading layout files
 	 * @param   mixed   $options      Optional custom options to load. Registry or array format
 	 *
@@ -54,7 +54,7 @@ public static function debug($layoutFile, $displayData = null, $basePath = '', $
 	 * Method to render the layout.
 	 *
 	 * @param   string  $layoutFile   Dot separated path to the layout file, relative to base path
-	 * @param   object  $displayData  Object which properties are used inside the layout file to build displayed output
+	 * @param   mixed   $displayData  Object which properties are used inside the layout file to build displayed output
 	 * @param   string  $basePath     Base path to use when loading layout files
 	 * @param   mixed   $options      Optional custom options to load. Registry or array format
 	 *
diff --git a/libraries/src/Layout/LayoutInterface.php b/libraries/src/Layout/LayoutInterface.php
index 0001c4f2eb70a..839a98b3e08eb 100644
--- a/libraries/src/Layout/LayoutInterface.php
+++ b/libraries/src/Layout/LayoutInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Log/DelegatingPsrLogger.php b/libraries/src/Log/DelegatingPsrLogger.php
index 2026194cb32ad..e349c3dc3c576 100644
--- a/libraries/src/Log/DelegatingPsrLogger.php
+++ b/libraries/src/Log/DelegatingPsrLogger.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Log/Log.php b/libraries/src/Log/Log.php
index ea534be4625b6..afd658d66fbbc 100644
--- a/libraries/src/Log/Log.php
+++ b/libraries/src/Log/Log.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Log/LogEntry.php b/libraries/src/Log/LogEntry.php
index b973515bf5a10..4a53530fcf85a 100644
--- a/libraries/src/Log/LogEntry.php
+++ b/libraries/src/Log/LogEntry.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Log/Logger.php b/libraries/src/Log/Logger.php
index a01e127c83d72..3307514031dc2 100644
--- a/libraries/src/Log/Logger.php
+++ b/libraries/src/Log/Logger.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Log/Logger/CallbackLogger.php b/libraries/src/Log/Logger/CallbackLogger.php
index 855692a591cd4..da458056057a5 100644
--- a/libraries/src/Log/Logger/CallbackLogger.php
+++ b/libraries/src/Log/Logger/CallbackLogger.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Log/Logger/DatabaseLogger.php b/libraries/src/Log/Logger/DatabaseLogger.php
index cd97faf98d0cf..67ba382e04f13 100644
--- a/libraries/src/Log/Logger/DatabaseLogger.php
+++ b/libraries/src/Log/Logger/DatabaseLogger.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Log/Logger/EchoLogger.php b/libraries/src/Log/Logger/EchoLogger.php
index ac3bd901ab74b..169203cc1490a 100644
--- a/libraries/src/Log/Logger/EchoLogger.php
+++ b/libraries/src/Log/Logger/EchoLogger.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Log/Logger/FormattedtextLogger.php b/libraries/src/Log/Logger/FormattedtextLogger.php
index e67a1f5d21efb..c83458fc2e36e 100644
--- a/libraries/src/Log/Logger/FormattedtextLogger.php
+++ b/libraries/src/Log/Logger/FormattedtextLogger.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -52,6 +52,23 @@ class FormattedtextLogger extends Logger
 	 */
 	protected $path;
 
+	/**
+	 * If true, all writes will be deferred as long as possible.
+	 * NOTE: Deferred logs may never be written if the application encounters a fatal error.
+	 *
+	 * @var    boolean
+	 * @since  3.9.0
+	 */
+	protected $defer = false;
+
+	/**
+	 * If deferring, entries will be stored here prior to writing.
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 */
+	protected $deferredEntries = array();
+
 	/**
 	 * Constructor.
 	 *
@@ -91,10 +108,41 @@ public function __construct(array &$options)
 			$this->format = (string) $this->options['text_entry_format'];
 		}
 
+		// Wait as long as possible before writing logs
+		if (!empty($this->options['defer']))
+		{
+			$this->defer = (boolean) $this->options['defer'];
+		}
+
 		// Build the fields array based on the format string.
 		$this->parseFields();
 	}
 
+	/**
+	 * If deferred, write all pending logs.
+	 *
+	 * @since  3.9.0
+	 */
+	public function __destruct()
+	{
+		// Nothing to do
+		if (!$this->defer || empty($this->deferredEntries))
+		{
+			return;
+		}
+
+		// Initialise the file if not already done.
+		$this->initFile();
+
+		// Format all lines and write to file.
+		$lines = array_map(array($this, 'formatLine'), $this->deferredEntries);
+
+		if (!\JFile::append($this->path, implode("\n", $lines) . "\n"))
+		{
+			throw new RuntimeException('Cannot write to log file.');
+		}
+	}
+
 	/**
 	 * Method to add an entry to the log.
 	 *
@@ -107,9 +155,39 @@ public function __construct(array &$options)
 	 */
 	public function addEntry(LogEntry $entry)
 	{
-		// Initialise the file if not already done.
-		$this->initFile();
+		// Store the entry to be written later.
+		if ($this->defer)
+		{
+			$this->deferredEntries[] = $entry;
+		}
+		// Write it immediately.
+		else
+		{
+			// Initialise the file if not already done.
+			$this->initFile();
+
+			// Write the new entry to the file.
+			$line = $this->formatLine($entry);
+			$line .= "\n";
+
+			if (!\JFile::append($this->path, $line))
+			{
+				throw new RuntimeException('Cannot write to log file.');
+			}
+		}
+	}
 
+	/**
+	 * Format a line for the log file.
+	 *
+	 * @param   JLogEntry  $entry  The log entry to format as a string.
+	 *
+	 * @return  String
+	 *
+	 * @since  3.9.0
+	 */
+	protected function formatLine(LogEntry $entry)
+	{
 		// Set some default field values if not already set.
 		if (!isset($entry->clientIP))
 		{
@@ -151,13 +229,7 @@ public function addEntry(LogEntry $entry)
 			$line = str_replace('{' . $field . '}', $tmp[$field] ?? '-', $line);
 		}
 
-		// Write the new entry to the file.
-		$line .= "\n";
-
-		if (!File::append($this->path, $line))
-		{
-			throw new \RuntimeException('Cannot write to log file.');
-		}
+		return $line;
 	}
 
 	/**
diff --git a/libraries/src/Log/Logger/MessagequeueLogger.php b/libraries/src/Log/Logger/MessagequeueLogger.php
index e06364b974631..7c884529d2347 100644
--- a/libraries/src/Log/Logger/MessagequeueLogger.php
+++ b/libraries/src/Log/Logger/MessagequeueLogger.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Log/Logger/SyslogLogger.php b/libraries/src/Log/Logger/SyslogLogger.php
index 59103fd3c674a..8cf19f20b2b24 100644
--- a/libraries/src/Log/Logger/SyslogLogger.php
+++ b/libraries/src/Log/Logger/SyslogLogger.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Log/Logger/W3cLogger.php b/libraries/src/Log/Logger/W3cLogger.php
index 22bd537650c81..b3d72ca893f30 100644
--- a/libraries/src/Log/Logger/W3cLogger.php
+++ b/libraries/src/Log/Logger/W3cLogger.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Log/LoggerRegistry.php b/libraries/src/Log/LoggerRegistry.php
index 8014d8ce2eea6..4a5eb6746c6da 100644
--- a/libraries/src/Log/LoggerRegistry.php
+++ b/libraries/src/Log/LoggerRegistry.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/MVC/Controller/AdminController.php b/libraries/src/MVC/Controller/AdminController.php
index 0b6332f0cdfe5..235e8af2025e1 100644
--- a/libraries/src/MVC/Controller/AdminController.php
+++ b/libraries/src/MVC/Controller/AdminController.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -130,7 +130,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 	public function delete()
 	{
 		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Get items to remove from the request.
 		$cid = $this->input->get('cid', array(), 'array');
@@ -179,21 +179,6 @@ protected function postDeleteHook(BaseDatabaseModel $model, $id = null)
 	{
 	}
 
-	/**
-	 * Display is not supported by this controller.
-	 *
-	 * @param   boolean  $cachable   If true, the view output will be cached
-	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link InputFilter::clean()}.
-	 *
-     * @return  static  A \JControllerLegacy object to support chaining.
-	 *
-	 * @since   1.6
-	 */
-	public function display($cachable = false, $urlparams = array())
-	{
-		return $this;
-	}
-
 	/**
 	 * Method to publish a list of items
 	 *
@@ -204,7 +189,7 @@ public function display($cachable = false, $urlparams = array())
 	public function publish()
 	{
 		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Get items to publish from the request.
 		$cid   = $this->input->get('cid', array(), 'array');
@@ -281,7 +266,7 @@ public function publish()
 	public function reorder()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$ids = $this->input->post->get('cid', array(), 'array');
 		$inc = $this->getTask() === 'orderup' ? -1 : 1;
@@ -317,7 +302,7 @@ public function reorder()
 	public function saveorder()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		// Get the input
 		$pks = $this->input->post->get('cid', array(), 'array');
@@ -361,7 +346,7 @@ public function saveorder()
 	public function checkin()
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$ids = $this->input->post->get('cid', array(), 'array');
 
diff --git a/libraries/src/MVC/Controller/ApiController.php b/libraries/src/MVC/Controller/ApiController.php
new file mode 100644
index 0000000000000..62ae4c46fcfba
--- /dev/null
+++ b/libraries/src/MVC/Controller/ApiController.php
@@ -0,0 +1,514 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\MVC\Controller;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Access\Exception\NotAllowed;
+use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Factory\MvcFactoryInterface;
+use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\CMS\MVC\View\JsonApiView;
+use Joomla\Input\Input;
+use Joomla\String\Inflector;
+
+/**
+ * Base class for a Joomla API Controller
+ *
+ * Controller (controllers are where you put all the actual code) Provides basic
+ * functionality, such as rendering views (aka displaying templates).
+ *
+ * @since  4.0.0
+ */
+class ApiController extends BaseController
+{
+	/**
+	 * The content type of the item.
+	 *
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected $contentType;
+
+	/**
+	 * The URL option for the component.
+	 *
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected $option;
+
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected $text_prefix;
+
+	/**
+	 * The context for storing internal data, e.g. record.
+	 *
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected $context;
+
+	/**
+	 * Items on a page
+	 *
+	 * @var  int
+	 */
+	protected $itemsPerPage = 20;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array                $config   An optional associative array of configuration settings.
+	 * Recognized key values include 'name', 'default_task', 'model_path', and
+	 * 'view_path' (this list is not meant to be comprehensive).
+	 * @param   MvcFactoryInterface  $factory  The factory.
+	 * @param   CmsApplication       $app      The JApplication for the dispatcher
+	 * @param   Input                $input    Input
+	 *
+	 * @since   4.0.0
+	 * @throws  \Exception
+	 */
+	public function __construct($config = array(), MvcFactoryInterface $factory = null, $app = null, $input = null)
+	{
+		parent::__construct($config, $factory, $app, $input);
+
+		// Guess the option as com_NameOfController
+		if (empty($this->option))
+		{
+			$this->option = ComponentHelper::getComponentName($this, $this->getName());
+		}
+
+		// Guess the \JText message prefix. Defaults to the option.
+		if (empty($this->text_prefix))
+		{
+			$this->text_prefix = strtoupper($this->option);
+		}
+
+		// Guess the context as the suffix, eg: OptionControllerContent.
+		if (empty($this->context))
+		{
+			$r = null;
+
+			if (!preg_match('/(.*)Controller(.*)/i', get_class($this), $r))
+			{
+				throw new \Exception(Text::_('JLIB_APPLICATION_ERROR_CONTROLLER_GET_NAME'), 500);
+			}
+
+			$this->context = str_replace('\\', '', strtolower($r[2]));
+		}
+	}
+
+	/**
+	 * Basic display of an item view
+	 *
+	 * @param   integer  $id  The primary key to display. Leave empty if you want to retrieve data from the request
+	 *
+	 * @return  static  A \JControllerLegacy object to support chaining.
+	 *
+	 * @since   4.0.0
+	 */
+	public function displayItem($id = null)
+	{
+		if ($id === null)
+		{
+			$id = $this->input->get('id', 0, 'int');
+		}
+
+		$viewType = $this->app->getDocument()->getType();
+		$viewName = $this->input->get('view', $this->contentType);
+		$viewLayout = $this->input->get('layout', 'default', 'string');
+
+		try
+		{
+			/** @var JsonApiView $view */
+			$view = $this->getView($viewName, $viewType, '', ['base_path' => $this->basePath, 'layout' => $viewLayout, 'contentType' => $this->contentType]);
+		}
+		catch (\Exception $e)
+		{
+			return $this;
+		}
+
+		// Create the model, ignoring request data so we can safely set the state in the request, without it being
+		// reinitialised on the first getState call
+		$model = $this->getModel(Inflector::singularize($this->contentType), '', ['ignore_request' => true]);
+
+		if (!$model)
+		{
+			throw new \RuntimeException('Unable to create the model');
+		}
+
+		try
+		{
+			$modelName = $model->getName();
+		}
+		catch (\Exception $e)
+		{
+			return $this;
+		}
+
+		$model->setState($modelName . '.id', $id);
+
+		// Push the model into the view (as default)
+		$view->setModel($model, true);
+
+		$view->document = $this->app->getDocument();
+		$view->displayItem();
+
+		return $this;
+	}
+
+	/**
+	 * Basic display of a list view
+	 *
+	 * @return  static  A \JControllerLegacy object to support chaining.
+	 *
+	 * @since   4.0.0
+	 */
+	public function displayList()
+	{
+		// Assemble pagination information (using recommended JsonApi pagination notation for offset strategy)
+		$paginationInfo = $this->input->get('page', [], 'array');
+		$internalPaginationMapping = [];
+
+		if (array_key_exists('offset', $paginationInfo))
+		{
+			$this->input->set('limitstart', $paginationInfo['offset']);
+		}
+
+		if (array_key_exists('limit', $paginationInfo))
+		{
+			$internalPaginationMapping['limit'] = $paginationInfo['limit'];
+		}
+
+		$this->input->set('list', $internalPaginationMapping);
+
+		$viewType = $this->app->getDocument()->getType();
+		$viewName = $this->input->get('view', $this->contentType);
+		$viewLayout = $this->input->get('layout', 'default', 'string');
+
+		try
+		{
+			/** @var JsonApiView $view */
+			$view = $this->getView($viewName, $viewType, '', ['base_path' => $this->basePath, 'layout' => $viewLayout, 'contentType' => $this->contentType]);
+		}
+		catch (\Exception $e)
+		{
+			return $this;
+		}
+
+		/** @var ListModel $model */
+		$model = $this->getModel($this->contentType);
+
+		if (!$model)
+		{
+			throw new \RuntimeException('Model failed to be created', 500);
+		}
+
+		// Push the model into the view (as default)
+		$view->setModel($model, true);
+
+		/**
+		 * Sanity check we don't have too much data being requested as regularly in html we automatically set it back to
+		 * the last page of data. If there isn't a limit start then set
+		 */
+		if (!$this->input->getInt('limit', null))
+		{
+			$model->setState('list.limit', $this->itemsPerPage);
+		}
+
+		if ($this->input->getInt('limitstart', 0) > $model->getTotal())
+		{
+			throw new Exception\ResourceNotFound;
+		}
+
+		$view->document = $this->app->getDocument();
+
+		$view->displayList();
+
+		return $this;
+	}
+
+	/**
+	 * Removes an item.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function delete()
+	{
+		if (!$this->app->getIdentity()->authorise('core.delete', $this->option))
+		{
+			throw new NotAllowed('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED', 403);
+		}
+
+		$id = $this->input->get('id', 0, 'int');
+
+		/** @var \Joomla\CMS\MVC\Model\AdminModel $model */
+		$model = $this->getModel(Inflector::singularize($this->contentType));
+
+		// Remove the item.
+		if (!$model->delete($id))
+		{
+			if ($model->getError() !== false)
+			{
+				throw new \RuntimeException($model->getError(), 500);
+			}
+
+			// TODO: Convert to language string
+			throw new \RuntimeException('There was an error deleting the item', 500);
+		}
+
+		$this->app->setHeader('status', 204);
+	}
+
+	/**
+	 * Method to add a new record.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 * @throws  NotAllowed
+	 * @throws  \RuntimeException
+	 */
+	public function add()
+	{
+		// Access check.
+		if (!$this->allowAdd())
+		{
+			throw new NotAllowed('JLIB_APPLICATION_ERROR_CREATE_RECORD_NOT_PERMITTED', 403);
+		}
+		else
+		{
+			$success = $this->save();
+
+			if (!$success)
+			{
+				throw new \RuntimeException($this->message);
+			}
+
+			$this->displayItem($success);
+		}
+	}
+
+	/**
+	 * Method to edit an existing record.
+	 *
+	 * @return  boolean  True if save succeeded after access level check and checkout passes, false otherwise.
+	 *
+	 * @since   4.0.0
+	 */
+	public function edit()
+	{
+		/** @var \Joomla\CMS\MVC\Model\AdminModel $model */
+		$model = $this->getModel(Inflector::singularize($this->contentType));
+
+		try
+		{
+			$table = $model->getTable();
+		}
+		catch (\Exception $e)
+		{
+			$this->setMessage($e->getMessage());
+
+			return false;
+		}
+
+		$recordId = $this->input->getInt('id');
+
+		if (!$recordId)
+		{
+			// TODO: Lang string for exception
+			throw new Exception\ResourceNotFound('Record does not exist', 404);
+		}
+
+		$key      = $table->getKeyName();
+		$checkin  = property_exists($table, $table->getColumnAlias('checked_out'));
+
+		// Access check.
+		if (!$this->allowEdit(array($key => $recordId), $key))
+		{
+			throw new NotAllowed('JLIB_APPLICATION_ERROR_CREATE_RECORD_NOT_PERMITTED', 403);
+		}
+
+		// Attempt to check-out the new record for editing and redirect.
+		if ($checkin && !$model->checkout($recordId))
+		{
+			// Check-out failed, display a notice but allow the user to see the record.
+			$this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_CHECKOUT_FAILED', $model->getError()), 'error');
+
+			return false;
+		}
+
+		if (!$this->save($recordId))
+		{
+			throw new \RuntimeException($this->message);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to save a record.
+	 *
+	 * @param   int  $recordKey  The primary key of the item (if exists)
+	 *
+	 * @return  int|boolean  The record ID on success, false on failure
+	 *
+	 * @since   4.0.0
+	 */
+	protected function save($recordKey = null)
+	{
+		/** @var \Joomla\CMS\MVC\Model\AdminModel $model */
+		$model = $this->getModel(Inflector::singularize($this->contentType));
+
+		try
+		{
+			$table = $model->getTable();
+		}
+		catch (\Exception $e)
+		{
+			$this->setMessage($e->getMessage());
+
+			return false;
+		}
+
+		$key        = $table->getKeyName();
+		$data       = json_decode($this->input->json->getRaw(), true);
+		$checkin    = property_exists($table, $table->getColumnAlias('checked_out'));
+		$data[$key] = $recordKey;
+
+		// TODO: Not the cleanest thing ever but it works...
+		Form::addFormPath(JPATH_COMPONENT_ADMINISTRATOR . '/forms');
+
+		// Validate the posted data.
+		$form = $model->getForm($data, false);
+
+		if (!$form)
+		{
+			$this->setMessage($model->getError(), 'error');
+
+			return false;
+		}
+
+		// Test whether the data is valid.
+		$validData = $model->validate($form, $data);
+
+		// Check for validation errors.
+		if ($validData === false)
+		{
+			// Get the validation messages.
+			$errors = $model->getErrors();
+
+			// Push up to three validation messages out to the user.
+			for ($i = 0, $n = count($errors); $i < $n && $i < 3; $i++)
+			{
+				if ($errors[$i] instanceof \Exception)
+				{
+					$this->setMessage($errors[$i]->getMessage(), 'warning');
+				}
+				else
+				{
+					$this->setMessage($errors[$i], 'warning');
+				}
+			}
+
+			return false;
+		}
+
+		if (!isset($validData['tags']))
+		{
+			$validData['tags'] = array();
+		}
+
+		// Attempt to save the data.
+		if (!$model->save($validData))
+		{
+			$this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_SAVE_FAILED', $model->getError()), 'error');
+
+			return false;
+		}
+
+		try
+		{
+			$modelName = $model->getName();
+		}
+		catch (\Exception $e)
+		{
+			$this->setMessage($e->getMessage());
+
+			return false;
+		}
+
+		// Ensure we have the record ID in case we created a new article
+		$recordId = $model->getState($modelName . '.id');
+
+		if ($recordId === null)
+		{
+			$this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()), 'error');
+
+			return false;
+		}
+
+		// Save succeeded, so check-in the record.
+		if ($checkin && $model->checkin($recordId) === false)
+		{
+			// Check-in failed, so go back to the record and display a notice.
+			$this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()), 'error');
+
+			return false;
+		}
+
+		return $recordId;
+	}
+
+	/**
+	 * Method to check if you can edit an existing record.
+	 *
+	 * Extended classes can override this if necessary.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key; default is id.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   4.0.0
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		return $this->app->getIdentity()->authorise('core.edit', $this->option);
+	}
+
+	/**
+	 * Method to check if you can add a new record.
+	 *
+	 * Extended classes can override this if necessary.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   4.0.0
+	 */
+	protected function allowAdd($data = array())
+	{
+		$user = $this->app->getIdentity();
+
+		return $user->authorise('core.create', $this->option) || count($user->getAuthorisedCategories($this->option, 'core.create'));
+	}
+}
diff --git a/libraries/src/MVC/Controller/BaseController.php b/libraries/src/MVC/Controller/BaseController.php
index 7c8f703a44f75..5bc79a231af2c 100644
--- a/libraries/src/MVC/Controller/BaseController.php
+++ b/libraries/src/MVC/Controller/BaseController.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -339,7 +339,7 @@ public static function getInstance($prefix, $config = array())
 		}
 
 		// Check for a possible service from the container otherwise manually instantiate the class
-		if (Factory::getContainer()->exists($class))
+		if (Factory::getContainer()->has($class))
 		{
 			self::$instance = Factory::getContainer()->get($class);
 		}
@@ -764,6 +764,13 @@ public function getModel($name = '', $prefix = '', $config = array())
 			// Task is a reserved state
 			$model->setState('task', $this->task);
 
+			// We don't have the concept on a menu tree in the api app, so skip setting it's information and
+			// return early
+			if ($this->app->isClient('api'))
+			{
+				return $model;
+			}
+
 			// Let's get the application object and set menu information if it's available
 			$menu = Factory::getApplication()->getMenu();
 
diff --git a/libraries/src/MVC/Controller/ControllerInterface.php b/libraries/src/MVC/Controller/ControllerInterface.php
index 4a705f5e84414..5038e4b6e75e4 100644
--- a/libraries/src/MVC/Controller/ControllerInterface.php
+++ b/libraries/src/MVC/Controller/ControllerInterface.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/MVC/Controller/Exception/ResourceNotFound.php b/libraries/src/MVC/Controller/Exception/ResourceNotFound.php
new file mode 100644
index 0000000000000..ad67adfc6db7c
--- /dev/null
+++ b/libraries/src/MVC/Controller/Exception/ResourceNotFound.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\MVC\Controller\Exception;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Exception class defining a resource not found exception
+ *
+ * @since  4.0.0
+ */
+class ResourceNotFound extends \RuntimeException
+{
+}
diff --git a/libraries/src/MVC/Controller/FormController.php b/libraries/src/MVC/Controller/FormController.php
index 869ae79fc97f9..6ff9f4f38748a 100644
--- a/libraries/src/MVC/Controller/FormController.php
+++ b/libraries/src/MVC/Controller/FormController.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -20,7 +20,6 @@
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 
 /**
@@ -298,7 +297,7 @@ public function batch($model)
 	 */
 	public function cancel($key = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$model = $this->getModel();
 		$table = $model->getTable();
@@ -331,12 +330,19 @@ public function cancel($key = null)
 		$this->releaseEditId($context, $recordId);
 		Factory::getApplication()->setUserState($context . '.data', null);
 
-		$this->setRedirect(
-			Route::_(
-				'index.php?option=' . $this->option . '&view=' . $this->view_list
-				. $this->getRedirectToListAppend(), false
-			)
-		);
+		$url = 'index.php?option=' . $this->option . '&view=' . $this->view_list
+			. $this->getRedirectToListAppend();
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+
+		if (!is_null($return) && \JUri::isInternal(base64_decode($return)))
+		{
+			$url = base64_decode($return);
+		}
+
+		// Redirect to the list screen.
+		$this->setRedirect(Route::_($url, false));
 
 		return true;
 	}
@@ -618,7 +624,7 @@ public function loadhistory()
 	public function save($key = null, $urlVar = null)
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$app   = Factory::getApplication();
 		$model = $this->getModel();
@@ -861,7 +867,7 @@ public function save($key = null, $urlVar = null)
 	public function reload($key = null, $urlVar = null)
 	{
 		// Check for request forgeries.
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->checkToken();
 
 		$app     = Factory::getApplication();
 		$model   = $this->getModel();
@@ -921,4 +927,22 @@ public function reload($key = null, $urlVar = null)
 		$this->setRedirect($redirectUrl);
 		$this->redirect();
 	}
+
+	/**
+	 * Load item to edit associations in com_associations
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function editAssociations()
+	{
+		// Initialise variables.
+		$app   = \JFactory::getApplication();
+		$input = $app->input;
+		$model = $this->getModel();
+
+		$data = $input->get('jform', array(), 'array');
+		$model->editAssociations($data);
+	}
 }
diff --git a/libraries/src/MVC/Factory/ApiMVCFactory.php b/libraries/src/MVC/Factory/ApiMVCFactory.php
new file mode 100644
index 0000000000000..603415cb9e21f
--- /dev/null
+++ b/libraries/src/MVC/Factory/ApiMVCFactory.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\CMS\MVC\Factory;
+
+use Joomla\CMS\Factory;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Factory to create MVC objects based on a namespace. Note that in an API Application model and table objects will be
+ * created from their administrator counterparts.
+ *
+ * @since  4.0.0
+ */
+final class ApiMVCFactory extends MVCFactory
+{
+	/**
+	 * Method to load and return a model object.
+	 *
+	 * @param   string  $name    The name of the model.
+	 * @param   string  $prefix  Optional model prefix.
+	 * @param   array   $config  Optional configuration array for the model.
+	 *
+	 * @return  \Joomla\CMS\MVC\Model\ModelInterface  The model object
+	 *
+	 * @since   4.0.0
+	 * @throws  \Exception
+	 */
+	public function createModel($name, $prefix = '', array $config = array())
+	{
+		$model = parent::createModel($name, $prefix, $config);
+
+		if (!$model)
+		{
+			$model = parent::createModel($name, 'Administrator', $config);
+		}
+
+		return $model;
+	}
+
+	/**
+	 * Method to load and return a table object.
+	 *
+	 * @param   string  $name    The name of the table.
+	 * @param   string  $prefix  Optional table prefix.
+	 * @param   array   $config  Optional configuration array for the table.
+	 *
+	 * @return  \Joomla\CMS\Table\Table  The table object
+	 *
+	 * @since   4.0.0
+	 * @throws  \Exception
+	 */
+	public function createTable($name, $prefix = '', array $config = array())
+	{
+		$table = parent::createTable($name, $prefix, $config);
+
+		if (!$table)
+		{
+			$table = parent::createTable($name, 'Administrator', $config);
+		}
+
+		return $table;
+	}
+}
diff --git a/libraries/src/MVC/Factory/LegacyFactory.php b/libraries/src/MVC/Factory/LegacyFactory.php
index 52dca2b5d07a3..d00aa4802d965 100644
--- a/libraries/src/MVC/Factory/LegacyFactory.php
+++ b/libraries/src/MVC/Factory/LegacyFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/MVC/Factory/MVCFactory.php b/libraries/src/MVC/Factory/MVCFactory.php
index 46d2c4fb087ab..3edd373bc28d7 100644
--- a/libraries/src/MVC/Factory/MVCFactory.php
+++ b/libraries/src/MVC/Factory/MVCFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -243,7 +243,7 @@ public function createTable($name, $prefix = '', array $config = [])
 	 *
 	 * @since   4.0.0
 	 */
-	private function getClassName(string $suffix, string $prefix)
+	protected function getClassName(string $suffix, string $prefix)
 	{
 		if (!$prefix)
 		{
diff --git a/libraries/src/MVC/Factory/MVCFactoryAwareTrait.php b/libraries/src/MVC/Factory/MVCFactoryAwareTrait.php
index 7317c60162647..5134c229f79f0 100644
--- a/libraries/src/MVC/Factory/MVCFactoryAwareTrait.php
+++ b/libraries/src/MVC/Factory/MVCFactoryAwareTrait.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,7 +11,7 @@
 /**
  * MVCFactory aware trait.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 trait MVCFactoryAwareTrait
 {
@@ -19,7 +19,7 @@ trait MVCFactoryAwareTrait
 	 * The mvc factory.
 	 *
 	 * @var    MVCFactoryInterfaceCF
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	private $mvcFactory;
 
@@ -28,7 +28,7 @@ trait MVCFactoryAwareTrait
 	 *
 	 * @return  MVCFactoryInterface
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 * @throws  \UnexpectedValueException
 	 */
 	protected function getMVCFactory(): MVCFactoryInterface
@@ -48,7 +48,7 @@ protected function getMVCFactory(): MVCFactoryInterface
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function setMVCFactory(MVCFactoryInterface $mvcFactory)
 	{
diff --git a/libraries/src/MVC/Factory/MVCFactoryInterface.php b/libraries/src/MVC/Factory/MVCFactoryInterface.php
index 7d686b80c8aeb..3517e4845d0de 100644
--- a/libraries/src/MVC/Factory/MVCFactoryInterface.php
+++ b/libraries/src/MVC/Factory/MVCFactoryInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/MVC/Factory/MVCFactoryServiceInterface.php b/libraries/src/MVC/Factory/MVCFactoryServiceInterface.php
index 3ca1421aa4591..22f57705687e7 100644
--- a/libraries/src/MVC/Factory/MVCFactoryServiceInterface.php
+++ b/libraries/src/MVC/Factory/MVCFactoryServiceInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/MVC/Factory/MVCFactoryServiceTrait.php b/libraries/src/MVC/Factory/MVCFactoryServiceTrait.php
index 8f1b8bd586342..9e180562748a7 100644
--- a/libraries/src/MVC/Factory/MVCFactoryServiceTrait.php
+++ b/libraries/src/MVC/Factory/MVCFactoryServiceTrait.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/MVC/Model/AdminModel.php b/libraries/src/MVC/Model/AdminModel.php
index b7f0a73d7bb34..16fa731ca5555 100644
--- a/libraries/src/MVC/Model/AdminModel.php
+++ b/libraries/src/MVC/Model/AdminModel.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -22,6 +22,7 @@
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Language\LanguageHelper;
 
 /**
  * Prototype admin model.
@@ -496,6 +497,8 @@ protected function batchCopy($value, $pks, $contexts)
 			// Get the new item ID
 			$newId = $this->table->get('id');
 
+			$this->cleanupPostBatchCopy($this->table, $newId, $pk);
+
 			// Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
@@ -506,6 +509,21 @@ protected function batchCopy($value, $pks, $contexts)
 		return $newIds;
 	}
 
+	/**
+	 * Function that can be overriden to do any data cleanup after batch copying data
+	 *
+	 * @param   \JTableInterface  $table  The table object containing the newly created item
+	 * @param   integer           $newId  The id of the new item
+	 * @param   integer           $oldId  The original item id
+	 *
+	 * @return  void
+	 *
+	 * @since  3.8.12
+	 */
+	protected function cleanupPostBatchCopy(\JTableInterface $table, $newId, $oldId)
+	{
+	}
+
 	/**
 	 * Batch language changes for a group of rows.
 	 *
@@ -1519,4 +1537,99 @@ public function initBatch()
 				?: $this->contentType->getTypeByAlias($this->typeAlias);
 		}
 	}
+
+	/**
+	 * Method to load an item in com_associations.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   3.9.0
+	 */
+	public function editAssociations($data)
+	{
+		// Save the item
+		$this->save($data);
+
+		$app = \JFactory::getApplication();
+		$id  = $data['id'];
+
+		// Deal with categories associations
+		if ($this->text_prefix === 'COM_CATEGORIES')
+		{
+			$extension       = $app->input->get('extension', 'com_content');
+			$this->typeAlias = $extension . '.category';
+			$component       = strtolower($this->text_prefix);
+			$view            = 'category';
+		}
+		else
+		{
+			$aliasArray = explode('.', $this->typeAlias);
+			$component  = $aliasArray[0];
+			$view       = $aliasArray[1];
+			$extension  = '';
+		}
+
+		// Menu item redirect needs admin client
+		$client = $component === 'com_menus' ? '&client_id=0' : '';
+
+		if ($id == 0)
+		{
+			$app->enqueueMessage(\JText::_('JGLOBAL_ASSOCIATIONS_NEW_ITEM_WARNING'), 'error');
+			$app->redirect(
+				\JRoute::_('index.php?option=' . $component . '&view=' . $view . $client . '&layout=edit&id=' . $id . $extension, false)
+			);
+
+			return false;
+		}
+
+		if ($data['language'] === '*')
+		{
+			$app->enqueueMessage(\JText::_('JGLOBAL_ASSOC_NOT_POSSIBLE'), 'notice');
+			$app->redirect(
+				\JRoute::_('index.php?option=' . $component . '&view=' . $view . $client . '&layout=edit&id=' . $id . $extension, false)
+			);
+
+			return false;
+		}
+
+		$languages = LanguageHelper::getContentLanguages(array(0, 1));
+		$target    = '';
+
+		/* If the site contains only 2 languages and an association exists for the item
+		   load directly the associated target item in the side by side view
+		   otherwise select already the target language
+		*/
+		if (count($languages) === 2)
+		{
+			foreach ($languages as $language)
+			{
+				$lang_code[] = $language->lang_code;
+			}
+
+			$refLang    = array($data['language']);
+			$targetLang = array_diff($lang_code, $refLang);
+			$targetLang = implode(',', $targetLang);
+			$targetId   = $data['associations'][$targetLang];
+
+			if ($targetId)
+			{
+				$target = '&target=' . $targetLang . '%3A' . $targetId . '%3Aedit';
+			}
+			else
+			{
+				$target = '&target=' . $targetLang . '%3A0%3Aadd';
+			}
+		}
+
+		$app->redirect(
+			\JRoute::_(
+				'index.php?option=com_associations&view=association&layout=edit&itemtype=' . $this->typeAlias
+				. '&task=association.edit&id=' . $id . $target, false
+			)
+		);
+
+		return true;
+	}
 }
diff --git a/libraries/src/MVC/Model/BaseDatabaseModel.php b/libraries/src/MVC/Model/BaseDatabaseModel.php
index 7981195c75868..c787779dc5805 100644
--- a/libraries/src/MVC/Model/BaseDatabaseModel.php
+++ b/libraries/src/MVC/Model/BaseDatabaseModel.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/MVC/Model/BaseModel.php b/libraries/src/MVC/Model/BaseModel.php
index d0b2a59fb4941..e56c1ec18d0ac 100644
--- a/libraries/src/MVC/Model/BaseModel.php
+++ b/libraries/src/MVC/Model/BaseModel.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,7 @@
 /**
  * Base class for a Joomla Model
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 abstract class BaseModel extends CMSObject implements ModelInterface, StatefulModelInterface
 {
@@ -26,7 +26,7 @@ abstract class BaseModel extends CMSObject implements ModelInterface, StatefulMo
 	 * The model (base) name
 	 *
 	 * @var    string
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $name;
 
@@ -35,7 +35,7 @@ abstract class BaseModel extends CMSObject implements ModelInterface, StatefulMo
 	 *
 	 * @param   array  $config  An array of configuration options (name, state, ignore_request).
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 * @throws  \Exception
 	 */
 	public function __construct($config = array())
@@ -74,7 +74,7 @@ public function __construct($config = array())
 	 *
 	 * @return  string  The name of the model
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 * @throws  \Exception
 	 */
 	public function getName()
diff --git a/libraries/src/MVC/Model/DatabaseAwareTrait.php b/libraries/src/MVC/Model/DatabaseAwareTrait.php
index 1a3fcc3fdd4af..93253df12c6fd 100644
--- a/libraries/src/MVC/Model/DatabaseAwareTrait.php
+++ b/libraries/src/MVC/Model/DatabaseAwareTrait.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,7 @@
 /**
  * Database aware trait.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 trait DatabaseAwareTrait
 {
@@ -23,7 +23,7 @@ trait DatabaseAwareTrait
 	 * The database driver.
 	 *
 	 * @var    DatabaseInterface
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $_db;
 
@@ -32,7 +32,7 @@ trait DatabaseAwareTrait
 	 *
 	 * @return  DatabaseInterface  The database driver.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 * @throws  \UnexpectedValueException
 	 */
 	public function getDbo()
@@ -52,7 +52,7 @@ public function getDbo()
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function setDbo(DatabaseInterface $db = null)
 	{
diff --git a/libraries/src/MVC/Model/DatabaseModelInterface.php b/libraries/src/MVC/Model/DatabaseModelInterface.php
index b627788d31de9..818961e9eab3b 100644
--- a/libraries/src/MVC/Model/DatabaseModelInterface.php
+++ b/libraries/src/MVC/Model/DatabaseModelInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,7 @@
 /**
  * Interface for a database model.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 interface DatabaseModelInterface
 {
@@ -24,7 +24,7 @@ interface DatabaseModelInterface
 	 *
 	 * @return  DatabaseInterface
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getDbo();
 }
diff --git a/libraries/src/MVC/Model/FormBehaviorTrait.php b/libraries/src/MVC/Model/FormBehaviorTrait.php
index e6189bab7dfaf..18186388d58c7 100644
--- a/libraries/src/MVC/Model/FormBehaviorTrait.php
+++ b/libraries/src/MVC/Model/FormBehaviorTrait.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -20,7 +20,7 @@
 /**
  * Trait which supports form behavior.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 trait FormBehaviorTrait
 {
@@ -28,7 +28,7 @@ trait FormBehaviorTrait
 	 * Array of form objects.
 	 *
 	 * @var    Form[]
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $_forms = array();
 
@@ -44,7 +44,7 @@ trait FormBehaviorTrait
 	 * @return  Form
 	 *
 	 * @see     Form
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 * @throws  \Exception
 	 */
 	protected function loadForm($name, $source = null, $options = array(), $clear = false, $xpath = false)
@@ -130,7 +130,7 @@ protected function loadForm($name, $source = null, $options = array(), $clear =
 	 *
 	 * @return  array  The default data is an empty array.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	protected function loadFormData()
 	{
@@ -146,7 +146,7 @@ protected function loadFormData()
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	protected function preprocessData($context, &$data, $group = 'content')
 	{
@@ -167,7 +167,7 @@ protected function preprocessData($context, &$data, $group = 'content')
 	 * @return  void
 	 *
 	 * @see     FormField
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 * @throws  \Exception if there is an error in the form event.
 	 */
 	protected function preprocessForm(Form $form, $data, $group = 'content')
@@ -184,7 +184,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
 	 *
 	 * @return  FormFactoryInterface
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 * @throws  \UnexpectedValueException May be thrown if the FormFactory has not been set.
 	 */
 	abstract public function getFormFactory(): FormFactoryInterface;
diff --git a/libraries/src/MVC/Model/FormModel.php b/libraries/src/MVC/Model/FormModel.php
index ce7100aac9390..dd2ebbc058051 100644
--- a/libraries/src/MVC/Model/FormModel.php
+++ b/libraries/src/MVC/Model/FormModel.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/MVC/Model/FormModelInterface.php b/libraries/src/MVC/Model/FormModelInterface.php
index d9d75010dabc5..b20f8372ec220 100644
--- a/libraries/src/MVC/Model/FormModelInterface.php
+++ b/libraries/src/MVC/Model/FormModelInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,7 @@
 /**
  * Interface for a form model.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 interface FormModelInterface
 {
@@ -25,7 +25,7 @@ interface FormModelInterface
 	 *
 	 * @return  Form
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 *
 	 * @throws \Exception
 	 */
diff --git a/libraries/src/MVC/Model/ItemModel.php b/libraries/src/MVC/Model/ItemModel.php
index 6ca0c00fd720e..ac3f9ddef8ab2 100644
--- a/libraries/src/MVC/Model/ItemModel.php
+++ b/libraries/src/MVC/Model/ItemModel.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/MVC/Model/ItemModelInterface.php b/libraries/src/MVC/Model/ItemModelInterface.php
index 99873c6b495fd..4a1f687e43343 100644
--- a/libraries/src/MVC/Model/ItemModelInterface.php
+++ b/libraries/src/MVC/Model/ItemModelInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,7 @@
 /**
  * Interface for an item model.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 interface ItemModelInterface
 {
@@ -24,7 +24,7 @@ interface ItemModelInterface
 	 *
 	 * @return  object
 	 *
-	 * @since __DEPLOY_VERSION__
+	 * @since 4.0.0
 	 * @throws \Exception
 	 */
 	public function getItem($pk = null);
diff --git a/libraries/src/MVC/Model/LeagcyModelLoaderTrait.php b/libraries/src/MVC/Model/LeagcyModelLoaderTrait.php
index f9b4de05db048..7d2500d32563e 100644
--- a/libraries/src/MVC/Model/LeagcyModelLoaderTrait.php
+++ b/libraries/src/MVC/Model/LeagcyModelLoaderTrait.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/MVC/Model/ListModel.php b/libraries/src/MVC/Model/ListModel.php
index 5107e41d6e895..7530f7ece2c6d 100644
--- a/libraries/src/MVC/Model/ListModel.php
+++ b/libraries/src/MVC/Model/ListModel.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,8 +15,9 @@
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormFactoryAwareTrait;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
-use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Pagination\Pagination;
+use Joomla\Database\DatabaseQuery;
+use Joomla\Utilities\ArrayHelper;
 
 /**
  * Model class for handling lists of items.
@@ -221,7 +222,7 @@ protected function getListQuery()
 	/**
 	 * Method to get a \JPagination object for the data set.
 	 *
-	 * @return  \JPagination  A \JPagination object for the data set.
+	 * @return  Pagination  A Pagination object for the data set.
 	 *
 	 * @since   1.6
 	 */
@@ -343,7 +344,7 @@ public function getStart()
 	 * @param   array    $data      data
 	 * @param   boolean  $loadData  load current data
 	 *
-	 * @return  Form
+	 * @return  Form|null  The \JForm object or null if the form can't be found
 	 *
 	 * @since   3.2
 	 */
diff --git a/libraries/src/MVC/Model/ListModelInterface.php b/libraries/src/MVC/Model/ListModelInterface.php
index 0026a0967684c..808c86806e9d7 100644
--- a/libraries/src/MVC/Model/ListModelInterface.php
+++ b/libraries/src/MVC/Model/ListModelInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,7 @@
 /**
  * Interface for a list model.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 interface ListModelInterface
 {
@@ -22,7 +22,7 @@ interface ListModelInterface
 	 *
 	 * @return  mixed  An array of data items
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 *
 	 * @throws \Exception
 	 */
diff --git a/libraries/src/MVC/Model/ModelInterface.php b/libraries/src/MVC/Model/ModelInterface.php
index 7ba3a7afa6879..0f8f7d4ec8d43 100644
--- a/libraries/src/MVC/Model/ModelInterface.php
+++ b/libraries/src/MVC/Model/ModelInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,7 @@
 /**
  * Interface for a base model.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 interface ModelInterface
 {
@@ -22,7 +22,7 @@ interface ModelInterface
 	 *
 	 * @return  string  The name of the model
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 * @throws  \Exception
 	 */
 	public function getName();
diff --git a/libraries/src/MVC/Model/StateBehaviorTrait.php b/libraries/src/MVC/Model/StateBehaviorTrait.php
index dd06bf0bf6c97..7330bf6dc093c 100644
--- a/libraries/src/MVC/Model/StateBehaviorTrait.php
+++ b/libraries/src/MVC/Model/StateBehaviorTrait.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -15,7 +15,7 @@
 /**
  * Trait which supports state behavior
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 trait StateBehaviorTrait
 {
@@ -23,7 +23,7 @@ trait StateBehaviorTrait
 	 * Indicates if the internal state has been set
 	 *
 	 * @var    boolean
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $__state_set = null;
 
@@ -31,7 +31,7 @@ trait StateBehaviorTrait
 	 * A state object
 	 *
 	 * @var    CMSObject
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $state = null;
 
@@ -43,7 +43,7 @@ trait StateBehaviorTrait
 	 *
 	 * @return  mixed  The property where specified, the state object where omitted
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getState($property = null, $default = null)
 	{
@@ -72,7 +72,7 @@ public function getState($property = null, $default = null)
 	 *
 	 * @return  mixed  The previous value of the property or null if not set
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function setState($property, $value = null)
 	{
@@ -94,7 +94,7 @@ public function setState($property, $value = null)
 	 * @return  void
 	 *
 	 * @note    Calling getState in this method will result in recursion.
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	protected function populateState()
 	{
diff --git a/libraries/src/MVC/Model/StatefulModelInterface.php b/libraries/src/MVC/Model/StatefulModelInterface.php
index 2e03bfe2e0f9a..3a9c30058a3f8 100644
--- a/libraries/src/MVC/Model/StatefulModelInterface.php
+++ b/libraries/src/MVC/Model/StatefulModelInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,7 @@
 /**
  * Interface for a stateful model.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 interface StatefulModelInterface
 {
@@ -25,7 +25,7 @@ interface StatefulModelInterface
 	 *
 	 * @return  mixed  The property where specified, the state object where omitted
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getState($property = null, $default = null);
 
@@ -37,7 +37,7 @@ public function getState($property = null, $default = null);
 	 *
 	 * @return  mixed  The previous value of the property or null if not set.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function setState($property, $value = null);
 }
diff --git a/libraries/src/MVC/View/AbstractView.php b/libraries/src/MVC/View/AbstractView.php
index 6ce8775233ff0..ffc93eed52775 100644
--- a/libraries/src/MVC/View/AbstractView.php
+++ b/libraries/src/MVC/View/AbstractView.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/MVC/View/CategoriesView.php b/libraries/src/MVC/View/CategoriesView.php
index 634aff25bbea6..2c4db9c52e119 100644
--- a/libraries/src/MVC/View/CategoriesView.php
+++ b/libraries/src/MVC/View/CategoriesView.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/MVC/View/CategoryFeedView.php b/libraries/src/MVC/View/CategoryFeedView.php
index 2bd9fc3a66870..c7465d77a505a 100644
--- a/libraries/src/MVC/View/CategoryFeedView.php
+++ b/libraries/src/MVC/View/CategoryFeedView.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/MVC/View/CategoryView.php b/libraries/src/MVC/View/CategoryView.php
index 2af4852708ae9..0294ba84e891e 100644
--- a/libraries/src/MVC/View/CategoryView.php
+++ b/libraries/src/MVC/View/CategoryView.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/MVC/View/FormView.php b/libraries/src/MVC/View/FormView.php
index 77325c335e8dc..20ec947269791 100644
--- a/libraries/src/MVC/View/FormView.php
+++ b/libraries/src/MVC/View/FormView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Cms
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/MVC/View/HtmlView.php b/libraries/src/MVC/View/HtmlView.php
index fcfa41850396b..11eb045243d87 100644
--- a/libraries/src/MVC/View/HtmlView.php
+++ b/libraries/src/MVC/View/HtmlView.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -204,6 +204,8 @@ public function display($tpl = null)
 	 *
 	 * @return  mixed  The escaped value.
 	 *
+	 * @note the ENT_COMPAT flag will be replaced by ENT_QUOTES in Joomla 4.0 to also escape single quotes
+	 *
 	 * @since   3.0
 	 */
 	public function escape($var)
diff --git a/libraries/src/MVC/View/JsonApiView.php b/libraries/src/MVC/View/JsonApiView.php
new file mode 100644
index 0000000000000..558c1206c89d1
--- /dev/null
+++ b/libraries/src/MVC/View/JsonApiView.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\MVC\View;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Document\JsonapiDocument;
+use Joomla\CMS\Router\Exception\RouteNotFoundException;
+use Joomla\CMS\Serializer\JoomlaSerializer;
+use Joomla\CMS\Uri\Uri;
+use Tobscure\JsonApi\Collection;
+use Tobscure\JsonApi\Resource;
+
+/**
+ * Base class for a Joomla Json List View
+ *
+ * Class holding methods for displaying presentation data.
+ *
+ * @since  4.0.0
+ */
+abstract class JsonApiView extends JsonView
+{
+	/**
+	 * The active document object (Redeclared for typehinting)
+	 *
+	 * @var    JsonapiDocument
+	 * @since  3.0
+	 */
+	public $document;
+
+	/**
+	 * The content type
+	 *
+	 * @var  string
+	 */
+	protected $type;
+
+	/**
+	 * The fields to render in the documents
+	 *
+	 * @var  string
+	 */
+	protected $fieldsToRender = [];
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  A named configuration array for object construction.
+	 *                          contentType: the name (optional) of the content type to use for the serialization
+	 *
+	 * @since   4.0.0
+	 */
+	public function __construct($config = array())
+	{
+		if (array_key_exists('contentType', $config))
+		{
+			$this->type = $config['contentType'];
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @return  string
+	 *
+	 * @since   4.0.0
+	 */
+	public function displayList()
+	{
+		/** @var \Joomla\CMS\MVC\Model\ListModel $model */
+		$model = $this->getModel();
+
+		$items      = $model->getItems();
+		$pagination = $model->getPagination();
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new \JViewGenericdataexception(implode("\n", $errors), 500);
+		}
+
+		if ($this->type === null)
+		{
+			throw new \RuntimeException('Content type missing');
+		}
+
+		// Set up links for pagination
+		$currentUrl = Uri::getInstance();
+		$currentPageDefaultInformation = array('offset' => $pagination->limitstart, 'limit' => $pagination->limit);
+		$currentPageQuery = $currentUrl->getVar('page', $currentPageDefaultInformation);
+		$totalPagesAvailable = ($pagination->pagesTotal * $pagination->limit);
+
+		$firstPage = clone $currentUrl;
+		$firstPageQuery = $currentPageQuery;
+		$firstPageQuery['offset'] = 0;
+		$firstPage->setVar('page', $firstPageQuery);
+
+		$nextPage = clone $currentUrl;
+		$nextPageQuery = $currentPageQuery;
+		$nextOffset = $currentPageQuery['offset'] + $pagination->limit;
+		$nextPageQuery['offset'] = ($nextOffset > ($totalPagesAvailable * $pagination->limit)) ? $totalPagesAvailable - $pagination->limit : $nextOffset;
+		$nextPage->setVar('page', $nextPageQuery);
+
+		$previousPage = clone $currentUrl;
+		$previousPageQuery = $currentPageQuery;
+		$previousOffset = $currentPageQuery['offset'] - $pagination->limit;
+		$previousPageQuery['offset'] = $previousOffset >= 0 ? $previousOffset : 0;
+		$previousPage->setVar('page', $previousPageQuery);
+
+		$lastPage = clone $currentUrl;
+		$lastPageQuery = $currentPageQuery;
+		$lastPageQuery['offset'] = $totalPagesAvailable - $pagination->limit;
+		$lastPage->setVar('page', $lastPageQuery);
+
+		$collection = (new Collection($items, new JoomlaSerializer($this->type)))
+			->fields([$this->type => $this->fieldsToRender]);
+
+		// Set the data into the document and render it
+		$this->document->addMeta('total-pages', $pagination->pagesTotal)
+			->setData($collection)
+			->addLink('self', (string) $currentUrl)
+			->addLink('first', (string) $firstPage)
+			->addLink('next', (string) $nextPage)
+			->addLink('previous', (string) $previousPage)
+			->addLink('last', (string) $lastPage);
+
+		return $this->document->render();
+	}
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @return  string
+	 *
+	 * @since   4.0.0
+	 */
+	public function displayItem()
+	{
+		/** @var \Joomla\CMS\MVC\Model\AdminModel $model */
+		$model = $this->getModel();
+		$item = $model->getItem();
+
+		if ($item->id === null)
+		{
+			throw new RouteNotFoundException('Item does not exist');
+		}
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new \JViewGenericdataexception(implode("\n", $errors), 500);
+		}
+
+		if ($this->type === null)
+		{
+			throw new \RuntimeException('Content type missing');
+		}
+
+		$serializer = new JoomlaSerializer($this->type);
+		$element = (new Resource($item, $serializer))
+			->fields([$this->type => $this->fieldsToRender]);
+
+		$this->document->setData($element);
+		$this->document->addLink('self', Uri::current());
+
+		return $this->document->render();
+	}
+}
diff --git a/libraries/src/MVC/View/JsonView.php b/libraries/src/MVC/View/JsonView.php
new file mode 100644
index 0000000000000..ad7587f39af82
--- /dev/null
+++ b/libraries/src/MVC/View/JsonView.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\MVC\View;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Base class for a Joomla Json View
+ *
+ * Class holding methods for displaying presentation data.
+ *
+ * @since  4.0.0
+ */
+class JsonView extends AbstractView
+{
+	/**
+	 * The base path of the view
+	 *
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected $_basePath = null;
+
+	/**
+	 * Charset to use in escaping mechanisms; defaults to urf8 (UTF-8)
+	 *
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected $_charset = 'UTF-8';
+
+	/**
+	 * The output of the view.
+	 *
+	 * @var    array
+	 * @since  4.0.0
+	 */
+	protected $_output = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $config  A named configuration array for object construction.
+	 *                          name: the name (optional) of the view (defaults to the view class name suffix).
+	 *                          charset: the character set to use for display
+	 *                          escape: the name (optional) of the function to use for escaping strings
+	 *                          base_path: the parent path (optional) of the views directory (defaults to the component folder)
+	 *                          template_plath: the path (optional) of the layout directory (defaults to base_path + /views/ + view name
+	 *                          helper_path: the path (optional) of the helper files (defaults to base_path + /helpers/)
+	 *                          layout: the layout (optional) to use to display the view
+	 *
+	 * @since   4.0.0
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		// Set the charset (used by the variable escaping functions)
+		if (array_key_exists('charset', $config))
+		{
+			\JLog::add('Setting a custom charset for escaping is deprecated. Override \JViewLegacy::escape() instead.', \JLog::WARNING, 'deprecated');
+			$this->_charset = $config['charset'];
+		}
+
+		// Set a base path for use by the view
+		if (array_key_exists('base_path', $config))
+		{
+			$this->_basePath = $config['base_path'];
+		}
+		else
+		{
+			$this->_basePath = JPATH_COMPONENT;
+		}
+	}
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function display($tpl = null)
+	{
+		// Serializing the output
+		$result = json_encode($this->_output);
+
+		// Pushing output to the document
+		$this->document->setBuffer($result);
+	}
+}
diff --git a/libraries/src/MVC/View/ListView.php b/libraries/src/MVC/View/ListView.php
index 7d0dae48e39a4..f4652a2d0e1a8 100644
--- a/libraries/src/MVC/View/ListView.php
+++ b/libraries/src/MVC/View/ListView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Cms
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/MVC/View/ViewInterface.php b/libraries/src/MVC/View/ViewInterface.php
index cccaac0cb8ab9..6fb9161254bf0 100644
--- a/libraries/src/MVC/View/ViewInterface.php
+++ b/libraries/src/MVC/View/ViewInterface.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -14,7 +14,7 @@
 /**
  * Joomla Platform CMS Interface
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 interface ViewInterface
 {
@@ -25,7 +25,7 @@ interface ViewInterface
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function display($tpl = null);
 }
diff --git a/libraries/src/Mail/Mail.php b/libraries/src/Mail/Mail.php
index a300d15429c82..c9d658b240c65 100644
--- a/libraries/src/Mail/Mail.php
+++ b/libraries/src/Mail/Mail.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -266,7 +266,7 @@ protected function add($recipient, $name = '', $method = 'addAddress')
 					$recipientName = MailHelper::cleanLine($recipientName);
 
 					// Check for boolean false return if exception handling is disabled
-					if (call_user_func('parent' . $method, $recipientEmail, $recipientName) === false)
+					if (call_user_func('parent::' . $method, $recipientEmail, $recipientName) === false)
 					{
 						return false;
 					}
@@ -369,7 +369,8 @@ public function addBcc($bcc, $name = '')
 	 * Add file attachment to the email
 	 *
 	 * @param   mixed   $path         Either a string or array of strings [filenames]
-	 * @param   mixed   $name         Either a string or array of strings [names]
+	 * @param   mixed   $name         Either a string or array of strings [names]. N.B. if this is an array it must contain the same
+	 *                                number of elements as the array of paths supplied.
 	 * @param   mixed   $encoding     The encoding of the attachment
 	 * @param   mixed   $type         The mime type
 	 * @param   string  $disposition  The disposition of the attachment
diff --git a/libraries/src/Mail/MailHelper.php b/libraries/src/Mail/MailHelper.php
index c13ac0b24a84d..53e6c0a33e03d 100644
--- a/libraries/src/Mail/MailHelper.php
+++ b/libraries/src/Mail/MailHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Mail/language/phpmailer.lang-en_gb.php b/libraries/src/Mail/language/phpmailer.lang-en_gb.php
index 9dd87776bdd1c..689f7fcc41bc4 100644
--- a/libraries/src/Mail/language/phpmailer.lang-en_gb.php
+++ b/libraries/src/Mail/language/phpmailer.lang-en_gb.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Mail
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Menu/AbstractMenu.php b/libraries/src/Menu/AbstractMenu.php
index e99eb7fbebb35..eefa074c82931 100644
--- a/libraries/src/Menu/AbstractMenu.php
+++ b/libraries/src/Menu/AbstractMenu.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\User\User;
 use Joomla\Registry\Registry;
 
 /**
@@ -56,7 +57,7 @@ abstract class AbstractMenu
 	/**
 	 * User object to check access levels for
 	 *
-	 * @var    \JUser
+	 * @var    User
 	 * @since  3.5
 	 */
 	protected $user;
@@ -81,7 +82,7 @@ public function __construct($options = array())
 			}
 		}
 
-		$this->user = isset($options['user']) && $options['user'] instanceof \JUser ? $options['user'] : Factory::getUser();
+		$this->user = isset($options['user']) && $options['user'] instanceof User ? $options['user'] : Factory::getUser();
 	}
 
 	/**
diff --git a/libraries/src/Menu/AdministratorMenu.php b/libraries/src/Menu/AdministratorMenu.php
index 49a1fdfadeb95..4a1c2d88deb3c 100644
--- a/libraries/src/Menu/AdministratorMenu.php
+++ b/libraries/src/Menu/AdministratorMenu.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Menu/MenuFactory.php b/libraries/src/Menu/MenuFactory.php
index 6156070f46e4c..652ba16d29581 100644
--- a/libraries/src/Menu/MenuFactory.php
+++ b/libraries/src/Menu/MenuFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Menu/MenuFactoryInterface.php b/libraries/src/Menu/MenuFactoryInterface.php
index cbeb3f05b2bd4..fab9e131a1abe 100644
--- a/libraries/src/Menu/MenuFactoryInterface.php
+++ b/libraries/src/Menu/MenuFactoryInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Menu/MenuHelper.php b/libraries/src/Menu/MenuHelper.php
deleted file mode 100644
index 489e02a9f1fca..0000000000000
--- a/libraries/src/Menu/MenuHelper.php
+++ /dev/null
@@ -1,388 +0,0 @@
-<?php
-/**
- * Joomla! Content Management System
- *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-namespace Joomla\CMS\Menu;
-
-defined('JPATH_PLATFORM') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Folder;
-use Joomla\Registry\Registry;
-
-/**
- * Menu Helper utility
- *
- * @since  3.8.0
- */
-class MenuHelper
-{
-	/**
-	 * List of preset include paths
-	 *
-	 * @var  array
-	 *
-	 * @since   3.8.0
-	 */
-	protected static $presets = null;
-
-	/**
-	 * Private constructor
-	 *
-	 * @since   3.8.0
-	 */
-	private function __construct()
-	{
-	}
-
-	/**
-	 * Add a custom preset externally via plugin or any other means.
-	 * WARNING: Presets with same name will replace previously added preset *except* Joomla's default preset (joomla)
-	 *
-	 * @param   string  $name     The unique identifier for the preset.
-	 * @param   string  $title    The display label for the preset.
-	 * @param   string  $path     The path to the preset file.
-	 * @param   bool    $replace  Whether to replace the preset with the same name if any (except 'joomla').
-	 *
-	 * @return  void
-	 *
-	 * @since   3.8.0
-	 */
-	public static function addPreset($name, $title, $path, $replace = true)
-	{
-		if (static::$presets === null)
-		{
-			static::getPresets();
-		}
-
-		if ($name == 'joomla')
-		{
-			$replace = false;
-		}
-
-		if (($replace || !array_key_exists($name, static::$presets)) && is_file($path))
-		{
-			$preset = new \stdClass;
-
-			$preset->name  = $name;
-			$preset->title = $title;
-			$preset->path  = $path;
-
-			static::$presets[$name] = $preset;
-		}
-	}
-
-	/**
-	 * Get a list of available presets.
-	 *
-	 * @return  \stdClass[]
-	 *
-	 * @since   3.8.0
-	 */
-	public static function getPresets()
-	{
-		if (static::$presets === null)
-		{
-			// Important: 'null' will cause infinite recursion.
-			static::$presets = array();
-
-			static::addPreset('joomla', 'JLIB_MENUS_PRESET_JOOMLA', JPATH_ADMINISTRATOR . '/components/com_menus/presets/joomla.xml');
-			static::addPreset('modern', 'JLIB_MENUS_PRESET_MODERN', JPATH_ADMINISTRATOR . '/components/com_menus/presets/modern.xml');
-
-			// Load from template folder automatically
-			$app = Factory::getApplication();
-			$tpl = JPATH_THEMES . '/' . $app->getTemplate() . '/html/com_menus/presets';
-
-			if (is_dir($tpl))
-			{
-				$files = Folder::files($tpl, '\.xml$');
-
-				foreach ($files as $file)
-				{
-					$name  = substr($file, 0, -4);
-					$title = str_replace('-', ' ', $name);
-
-					static::addPreset(strtolower($name), ucwords($title), $tpl . '/' . $file);
-				}
-			}
-		}
-
-		return static::$presets;
-	}
-
-	/**
-	 * Load the menu items from a preset file into a hierarchical list of objects
-	 *
-	 * @param   string  $name      The preset name
-	 * @param   bool    $fallback  Fallback to default (joomla) preset if the specified one could not be loaded?
-	 *
-	 * @return  \stdClass[]
-	 *
-	 * @since   3.8.0
-	 */
-	public static function loadPreset($name, $fallback = true)
-	{
-		$items   = array();
-		$presets = static::getPresets();
-
-		if (isset($presets[$name]) && ($xml = simplexml_load_file($presets[$name]->path, null, LIBXML_NOCDATA)) && $xml instanceof \SimpleXMLElement)
-		{
-			static::loadXml($xml, $items);
-		}
-		elseif ($fallback && isset($presets['joomla']))
-		{
-			if (($xml = simplexml_load_file($presets['joomla']->path, null, LIBXML_NOCDATA)) && $xml instanceof \SimpleXMLElement)
-			{
-				static::loadXml($xml, $items);
-			}
-		}
-
-		return $items;
-	}
-
-	/**
-	 * Method to resolve the menu item alias type menu item
-	 *
-	 * @param   \stdClass  &$item  The alias object
-	 *
-	 * @return  void
-	 *
-	 * @since   3.8.0
-	 */
-	public static function resolveAlias(&$item)
-	{
-		$obj = $item;
-
-		while ($obj->type == 'alias')
-		{
-			$params  = new Registry($obj->params);
-			$aliasTo = $params->get('aliasoptions');
-
-			$db = Factory::getDbo();
-			$query = $db->getQuery(true);
-			$query->select('a.id, a.link, a.type, e.element')
-				->from('#__menu a')
-				->where('a.id = ' . (int) $aliasTo)
-				->join('left', '#__extensions e ON e.id = a.component_id = e.id');
-
-			try
-			{
-				$obj = $db->setQuery($query)->loadObject();
-
-				if (!$obj)
-				{
-					$item->link = '';
-
-					return;
-				}
-			}
-			catch (\Exception $e)
-			{
-				$item->link = '';
-
-				return;
-			}
-		}
-
-		$item->id      = $obj->id;
-		$item->link    = $obj->link;
-		$item->type    = $obj->type;
-		$item->element = $obj->element;
-	}
-
-	/**
-	 * Parse the flat list of menu items and prepare the hierarchy of them using parent-child relationship.
-	 *
-	 * @param   \stdClass[]  $menuItems  List of menu items loaded from database
-	 *
-	 * @return  \stdClass[]
-	 *
-	 * @since   3.8.0
-	 */
-	public static function createLevels($menuItems)
-	{
-		$result    = array();
-		$result[1] = array();
-
-		foreach ($menuItems as $i => &$item)
-		{
-			// Resolve the alias item to get the original item
-			if ($item->type == 'alias')
-			{
-				static::resolveAlias($item);
-			}
-
-			if ($item->link = in_array($item->type, array('separator', 'heading', 'container')) ? '#' : trim($item->link))
-			{
-				$item->submenu    = array();
-				$item->class      = $item->img ?? '';
-				$item->scope      = $item->scope ?? null;
-				$item->browserNav = $item->browserNav ? '_blank' : '';
-
-				$result[$item->parent_id][$item->id] = $item;
-			}
-		}
-
-		// Move each of the items under respective parent menu items.
-		if (count($result[1]))
-		{
-			foreach ($result as $parentId => &$mItems)
-			{
-				foreach ($mItems as &$mItem)
-				{
-					if (isset($result[$mItem->id]))
-					{
-						$mItem->submenu = &$result[$mItem->id];
-					}
-				}
-			}
-		}
-
-		// Return only top level items, subtree follows
-		return $result[1];
-	}
-
-	/**
-	 * Load a menu tree from an XML file
-	 *
-	 * @param   \SimpleXMLElement[]  $elements  The xml menuitem nodes
-	 * @param   \stdClass[]          &$items    The menu hierarchy list to be populated
-	 * @param   string[]             $replace   The substring replacements for iterator type items
-	 *
-	 * @return  void
-	 *
-	 * @since  3.8.0
-	 */
-	protected static function loadXml($elements, &$items, $replace = array())
-	{
-		foreach ($elements as $element)
-		{
-			if ($element->getName() != 'menuitem')
-			{
-				continue;
-			}
-
-			$select = (string) $element['sql_select'];
-			$from   = (string) $element['sql_from'];
-
-			/**
-			 * Following is a repeatable group based on simple database query. This requires sql_* attributes (sql_select and sql_from are required)
-			 * The values can be used like - "{sql:columnName}" in any attribute of repeated elements.
-			 * The repeated elements are place inside this xml node but they will be populated in the same level in the rendered menu
-			 */
-			if ($select && $from)
-			{
-				$hidden = $element['hidden'] == 'true';
-				$where  = (string) $element['sql_where'];
-				$order  = (string) $element['sql_order'];
-				$group  = (string) $element['sql_group'];
-				$lJoin  = (string) $element['sql_leftjoin'];
-				$iJoin  = (string) $element['sql_innerjoin'];
-
-				$db    = Factory::getDbo();
-				$query = $db->getQuery(true);
-				$query->select($select)->from($from);
-
-				if ($where)
-				{
-					$query->where($where);
-				}
-
-				if ($order)
-				{
-					$query->order($order);
-				}
-
-				if ($group)
-				{
-					$query->group($group);
-				}
-
-				if ($lJoin)
-				{
-					$query->leftJoin($lJoin);
-				}
-
-				if ($iJoin)
-				{
-					$query->innerJoin($iJoin);
-				}
-
-				$results = $db->setQuery($query)->loadObjectList();
-
-				// Skip the entire group if no items to iterate over.
-				if ($results)
-				{
-					// Show the repeatable group heading node only if not set as hidden.
-					if (!$hidden)
-					{
-						$items[] = static::parseXmlNode($element, $replace);
-					}
-
-					// Iterate over the matching records, items goes in the same level (not $item->submenu) as this node.
-					foreach ($results as $result)
-					{
-						static::loadXml($element->menuitem, $items, $result);
-					}
-				}
-			}
-			else
-			{
-				$item = static::parseXmlNode($element, $replace);
-
-				// Process the child nodes
-				static::loadXml($element->menuitem, $item->submenu, $replace);
-
-				$items[] = $item;
-			}
-		}
-	}
-
-	/**
-	 * Create a menu item node from an xml element
-	 *
-	 * @param   \SimpleXMLElement  $node     A menuitem element from preset xml
-	 * @param   string[]           $replace  The values to substitute in the title, link and element texts
-	 *
-	 * @return  \stdClass
-	 *
-	 * @since   3.8.0
-	 */
-	protected static function parseXmlNode($node, $replace = array())
-	{
-		$item = new \stdClass;
-
-		$item->id         = null;
-		$item->type       = (string) $node['type'];
-		$item->title      = (string) $node['title'];
-		$item->link       = (string) $node['link'];
-		$item->element    = (string) $node['element'];
-		$item->class      = (string) $node['class'];
-		$item->icon       = (string) $node['icon'];
-		$item->browserNav = (string) $node['target'];
-		$item->access     = (int) $node['access'];
-		$item->params     = new Registry(trim($node->params));
-		$item->scope      = (string) $node['scope'] ?: 'default';
-		$item->submenu    = array();
-
-		if ($item->type == 'separator' && trim($item->title, '- '))
-		{
-			$item->params->set('text_separator', 1);
-		}
-
-		// Translate attributes for iterator values
-		foreach ($replace as $var => $val)
-		{
-			$item->title   = str_replace("{sql:$var}", $val, $item->title);
-			$item->element = str_replace("{sql:$var}", $val, $item->element);
-			$item->link    = str_replace("{sql:$var}", $val, $item->link);
-			$item->class   = str_replace("{sql:$var}", $val, $item->class);
-			$item->icon    = str_replace("{sql:$var}", $val, $item->icon);
-		}
-
-		return $item;
-	}
-}
diff --git a/libraries/src/Menu/MenuItem.php b/libraries/src/Menu/MenuItem.php
index 0aa78b0eb8471..4d57a6cf96b2b 100644
--- a/libraries/src/Menu/MenuItem.php
+++ b/libraries/src/Menu/MenuItem.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,16 +10,20 @@
 
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Menu\AbstractMenu;
+use Joomla\CMS\Tree\NodeInterface;
+use Joomla\CMS\Tree\NodeTrait;
 use Joomla\Registry\Registry;
 
 /**
  * Object representing a menu item
  *
  * @since  3.7.0
- * @note   This class will no longer extend stdClass in Joomla 4
  */
-class MenuItem extends \stdClass
+class MenuItem implements NodeInterface
 {
+	use NodeTrait;
+
 	/**
 	 * Primary key
 	 *
diff --git a/libraries/src/Menu/Node.php b/libraries/src/Menu/Node.php
deleted file mode 100644
index da97db3d536b4..0000000000000
--- a/libraries/src/Menu/Node.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/**
- * Joomla! Content Management System
- *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-namespace Joomla\CMS\Menu;
-
-defined('JPATH_PLATFORM') or die;
-
-use Joomla\Registry\Registry;
-
-/**
- * A Node for MenuTree
- *
- * @see    Tree
- *
- * @since  3.8.0
- */
-class Node
-{
-	/**
-	 * Node Id
-	 *
-	 * @var  string
-	 *
-	 * @since   3.8.0
-	 */
-	protected $id = null;
-
-	/**
-	 * CSS Class for node
-	 *
-	 * @var  string
-	 *
-	 * @since   3.8.0
-	 */
-	protected $class = null;
-
-	/**
-	 * Whether this node is active
-	 *
-	 * @var  bool
-	 *
-	 * @since   3.8.0
-	 */
-	protected $active = false;
-
-	/**
-	 * Additional custom node params
-	 *
-	 * @var  Registry
-	 *
-	 * @since   3.8.0
-	 */
-	protected $params;
-
-	/**
-	 * Parent node object
-	 *
-	 * @var  Node
-	 *
-	 * @since   3.8.0
-	 */
-	protected $parent = null;
-
-	/**
-	 * Array of Children node objects
-	 *
-	 * @var  Node[]
-	 *
-	 * @since   3.8.0
-	 */
-	protected $children = array();
-
-	/**
-	 * Constructor
-	 *
-	 * @since   3.8.0
-	 */
-	public function __construct()
-	{
-		$this->params = new Registry;
-	}
-
-	/**
-	 * Add child to this node
-	 *
-	 * If the child already has a parent, the link is unset
-	 *
-	 * @param   Node  $child  The child to be added
-	 *
-	 * @return  Node  The new added child
-	 *
-	 * @since   3.8.0
-	 */
-	public function addChild(Node $child)
-	{
-		$hash = spl_object_hash($child);
-
-		if (isset($child->parent))
-		{
-			$child->parent->removeChild($child);
-		}
-
-		$child->parent         = $this;
-		$this->children[$hash] = $child;
-
-		return $child;
-	}
-
-	/**
-	 * Remove a child from this node
-	 *
-	 * If the child exists it is unset
-	 *
-	 * @param   Node  $child  The child to be added
-	 *
-	 * @return  void
-	 *
-	 * @since   3.8.0
-	 */
-	public function removeChild(Node $child)
-	{
-		$hash = spl_object_hash($child);
-
-		if (isset($this->children[$hash]))
-		{
-			$child->parent = null;
-
-			unset($this->children[$hash]);
-		}
-	}
-
-	/**
-	 * Test if this node has a parent
-	 *
-	 * @return  boolean  True if there is a parent
-	 *
-	 * @since   3.8.0
-	 */
-	public function hasParent()
-	{
-		return isset($this->parent);
-	}
-
-	/**
-	 * Get the parent of this node
-	 *
-	 * @return  Node  The Node object's parent or null for no parent
-	 *
-	 * @since   3.8.0
-	 */
-	public function getParent()
-	{
-		return $this->parent;
-	}
-
-	/**
-	 * Test if this node has children
-	 *
-	 * @return  boolean
-	 *
-	 * @since   3.8.0
-	 */
-	public function hasChildren()
-	{
-		return count($this->children) > 0;
-	}
-
-	/**
-	 * Get the children of this node
-	 *
-	 * @return  Node[]  The children
-	 *
-	 * @since   3.8.0
-	 */
-	public function getChildren()
-	{
-		return $this->children;
-	}
-
-	/**
-	 * Find the current node depth in the tree hierarchy
-	 *
-	 * @return  integer  The node level in the hierarchy, where ROOT == 0, First level menu item == 1, and so on.
-	 *
-	 * @since   3.8.0
-	 */
-	public function getLevel()
-	{
-		return $this->hasParent() ? $this->getParent()->getLevel() + 1 : 0;
-	}
-
-	/**
-	 * Check whether the object instance node is the root node
-	 *
-	 * @return  boolean
-	 *
-	 * @since   3.8.0
-	 */
-	public function isRoot()
-	{
-		return !$this->hasParent();
-	}
-
-	/**
-	 * Set the active state on or off
-	 *
-	 * @param   bool  $active  The new active state
-	 *
-	 * @return  void
-	 *
-	 * @since   3.8.0
-	 */
-	public function setActive($active)
-	{
-		$this->active = (bool) $active;
-	}
-
-	/**
-	 * set the params array
-	 *
-	 * @param   Registry  $params  The params attributes
-	 *
-	 * @return  void
-	 *
-	 * @since   3.8.0
-	 */
-	public function setParams(Registry $params)
-	{
-		$this->params = $params;
-	}
-
-	/**
-	 * Get the param value from the node params
-	 *
-	 * @param   string  $key  The param name
-	 *
-	 * @return  mixed
-	 *
-	 * @since   3.8.0
-	 */
-	public function getParam($key)
-	{
-		return $this->params[$key] ?? null;
-	}
-
-	/**
-	 * Get an attribute value
-	 *
-	 * @param   string  $name  The attribute name
-	 *
-	 * @return  mixed
-	 *
-	 * @since   3.8.0
-	 */
-	public function get($name)
-	{
-		switch ($name)
-		{
-			case 'id':
-			case 'class':
-			case 'active':
-			case 'params':
-				return $this->$name;
-		}
-
-		return null;
-	}
-}
diff --git a/libraries/src/Menu/Node/Component.php b/libraries/src/Menu/Node/Component.php
deleted file mode 100644
index eb16726d5523c..0000000000000
--- a/libraries/src/Menu/Node/Component.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * Joomla! Content Management System
- *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-namespace Joomla\CMS\Menu\Node;
-
-defined('JPATH_PLATFORM') or die;
-
-use Joomla\CMS\Filter\OutputFilter;
-use Joomla\CMS\Menu\Node;
-
-/**
- * A Component type of node for MenuTree
- *
- * @see    Node
- *
- * @since  3.8.0
- */
-class Component extends Node
-{
-	/**
-	 * Node Title
-	 *
-	 * @var  string
-	 *
-	 * @since   3.8.0
-	 */
-	protected $title = null;
-
-	/**
-	 * The component name for this node link
-	 *
-	 * @var  string
-	 *
-	 * @since   3.8.0
-	 */
-	protected $element = null;
-
-	/**
-	 * Node Link
-	 *
-	 * @var  string
-	 *
-	 * @since   3.8.0
-	 */
-	protected $link = null;
-
-	/**
-	 * Link Target
-	 *
-	 * @var  string
-	 *
-	 * @since   3.8.0
-	 */
-	protected $target = null;
-
-	/**
-	 * Link title icon
-	 *
-	 * @var  string
-	 *
-	 * @since   3.8.0
-	 */
-	protected $icon = null;
-
-	/**
-	 * Constructor for the class.
-	 *
-	 * @param   string  $title    The title of the node
-	 * @param   string  $element  The component name
-	 * @param   string  $link     The node link
-	 * @param   string  $target   The link target
-	 * @param   string  $class    The CSS class for the node
-	 * @param   string  $id       The node id
-	 * @param   string  $icon     The title icon for the node
-	 *
-	 * @since   3.8.0
-	 */
-	public function __construct($title, $element, $link, $target = null, $class = null, $id = null, $icon = null)
-	{
-		$this->title   = $title;
-		$this->element = $element;
-		$this->link    = $link ? OutputFilter::ampReplace($link) : 'index.php?option=' . $element;
-		$this->target  = $target;
-		$this->class   = $class;
-		$this->id      = $id;
-		$this->icon    = $icon;
-
-		parent::__construct();
-	}
-
-	/**
-	 * Get an attribute value
-	 *
-	 * @param   string  $name  The attribute name
-	 *
-	 * @return  mixed
-	 *
-	 * @since   3.8.0
-	 */
-	public function get($name)
-	{
-		switch ($name)
-		{
-			case 'title':
-			case 'element':
-			case 'link':
-			case 'target':
-			case 'icon':
-				return $this->$name;
-		}
-
-		return parent::get($name);
-	}
-}
diff --git a/libraries/src/Menu/Node/Container.php b/libraries/src/Menu/Node/Container.php
deleted file mode 100644
index 506fa504b943d..0000000000000
--- a/libraries/src/Menu/Node/Container.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Joomla! Content Management System
- *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-namespace Joomla\CMS\Menu\Node;
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * A Container type of node for MenuTree
- *
- * @see    Node
- *
- * @since  3.8.0
- */
-class Container extends Heading
-{
-}
diff --git a/libraries/src/Menu/Node/Heading.php b/libraries/src/Menu/Node/Heading.php
deleted file mode 100644
index 2010c48c79a26..0000000000000
--- a/libraries/src/Menu/Node/Heading.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Joomla! Content Management System
- *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-namespace Joomla\CMS\Menu\Node;
-
-defined('JPATH_PLATFORM') or die;
-
-use Joomla\CMS\Menu\Node;
-
-/**
- * A Heading type of node for MenuTree
- *
- * @see    Node
- *
- * @since  3.8.0
- */
-class Heading extends Node
-{
-	/**
-	 * Node Title
-	 *
-	 * @var  string
-	 *
-	 * @since   3.8.0
-	 */
-	protected $title = null;
-
-	/**
-	 * Node Link
-	 *
-	 * @var  string
-	 *
-	 * @since   3.8.0
-	 */
-	protected $link = '#';
-
-	/**
-	 * Link title icon
-	 *
-	 * @var  string
-	 *
-	 * @since   3.8.0
-	 */
-	protected $icon = null;
-
-	/**
-	 * Constructor for the class.
-	 *
-	 * @param   string  $title  The title of the node
-	 * @param   string  $class  The CSS class for the node
-	 * @param   string  $id     The node id
-	 * @param   string  $icon   The title icon for the node
-	 *
-	 * @since   3.8.0
-	 */
-	public function __construct($title, $class = null, $id = null, $icon = null)
-	{
-		$this->title = $title;
-		$this->class = $class;
-		$this->id    = $id;
-		$this->icon  = $icon;
-
-		parent::__construct();
-	}
-
-	/**
-	 * Get an attribute value
-	 *
-	 * @param   string  $name  The attribute name
-	 *
-	 * @return  mixed
-	 *
-	 * @since   3.8.0
-	 */
-	public function get($name)
-	{
-		switch ($name)
-		{
-			case 'title':
-			case 'link':
-			case 'icon':
-				return $this->$name;
-		}
-
-		return parent::get($name);
-	}
-}
diff --git a/libraries/src/Menu/Node/Separator.php b/libraries/src/Menu/Node/Separator.php
deleted file mode 100644
index c5eb1f445c9cd..0000000000000
--- a/libraries/src/Menu/Node/Separator.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Joomla! Content Management System
- *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-namespace Joomla\CMS\Menu\Node;
-
-defined('JPATH_PLATFORM') or die;
-
-use Joomla\CMS\Menu\Node;
-
-/**
- * A Separator type of node for MenuTree
- *
- * @see    Node
- *
- * @since  3.8.0
- */
-class Separator extends Node
-{
-	/**
-	 * Node Title
-	 *
-	 * @var  string
-	 *
-	 * @since   3.8.0
-	 */
-	protected $title = null;
-
-	/**
-	 * Constructor for the class.
-	 *
-	 * @param   string  $title  The title of the node
-	 *
-	 * @since   3.8.0
-	 */
-	public function __construct($title = null)
-	{
-		$this->title = trim($title, '- ') ? $title : null;
-
-		parent::__construct();
-	}
-
-	/**
-	 * Get an attribute value
-	 *
-	 * @param   string  $name  The attribute name
-	 *
-	 * @return  mixed
-	 *
-	 * @since   3.8.0
-	 */
-	public function get($name)
-	{
-		switch ($name)
-		{
-			case 'title':
-				return $this->$name;
-		}
-
-		return parent::get($name);
-	}
-}
diff --git a/libraries/src/Menu/Node/Url.php b/libraries/src/Menu/Node/Url.php
deleted file mode 100644
index 6d043520cffca..0000000000000
--- a/libraries/src/Menu/Node/Url.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * Joomla! Content Management System
- *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-namespace Joomla\CMS\Menu\Node;
-
-defined('JPATH_PLATFORM') or die;
-
-use Joomla\CMS\Filter\OutputFilter;
-use Joomla\CMS\Menu\Node;
-
-/**
- * An external Url type of node for MenuTree
- *
- * @see    Node
- *
- * @since  3.8.0
- */
-class Url extends Node
-{
-	/**
-	 * Node Title
-	 *
-	 * @var  string
-	 *
-	 * @since   3.8.0
-	 */
-	protected $title = null;
-
-	/**
-	 * Node Link
-	 *
-	 * @var  string
-	 *
-	 * @since   3.8.0
-	 */
-	protected $link = null;
-
-	/**
-	 * Link Target
-	 *
-	 * @var  string
-	 *
-	 * @since   3.8.0
-	 */
-	protected $target = null;
-
-	/**
-	 * Link title icon
-	 *
-	 * @var  string
-	 *
-	 * @since   3.8.0
-	 */
-	protected $icon = null;
-
-	/**
-	 * Constructor for the class.
-	 *
-	 * @param   string  $title   The title of the node
-	 * @param   string  $link    The node link
-	 * @param   string  $target  The link target
-	 * @param   string  $class   The CSS class for the node
-	 * @param   string  $id      The node id
-	 * @param   string  $icon    The title icon for the node
-	 *
-	 * @since   3.8.0
-	 */
-	public function __construct($title, $link, $target = null, $class = null, $id = null, $icon = null)
-	{
-		$this->title  = $title;
-		$this->link   =	OutputFilter::ampReplace($link);
-		$this->target = $target;
-		$this->class  = $class;
-		$this->id     = $id;
-		$this->icon   = $icon;
-
-		parent::__construct();
-	}
-
-	/**
-	 * Get an attribute value
-	 *
-	 * @param   string  $name  The attribute name
-	 *
-	 * @return  mixed
-	 *
-	 * @since   3.8.0
-	 */
-	public function get($name)
-	{
-		switch ($name)
-		{
-			case 'title':
-			case 'link':
-			case 'target':
-			case 'icon':
-				return $this->$name;
-		}
-
-		return parent::get($name);
-	}
-}
diff --git a/libraries/src/Menu/SiteMenu.php b/libraries/src/Menu/SiteMenu.php
index dc1f4d009702f..e4370bc3228bc 100644
--- a/libraries/src/Menu/SiteMenu.php
+++ b/libraries/src/Menu/SiteMenu.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,11 +13,13 @@
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Cache\CacheControllerFactoryInterface;
 use Joomla\CMS\Cache\Controller\CallbackController;
+use Joomla\CMS\Cache\Exception\CacheExceptionInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Language;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Database\Exception\ExecutionFailureException;
 
 /**
  * Menu class
@@ -102,20 +104,20 @@ public function load()
 
 			$this->items = $cache->get($loader, array(), md5(get_class($this)), false);
 		}
-		catch (\JCacheException $e)
+		catch (CacheExceptionInterface $e)
 		{
 			try
 			{
 				$this->items = $loader();
 			}
-			catch (\JDatabaseExceptionExecuting $databaseException)
+			catch (ExecutionFailureException $databaseException)
 			{
 				$this->app->enqueueMessage(Text::sprintf('JERROR_LOADING_MENUS', $databaseException->getMessage()), 'warning');
 
 				return false;
 			}
 		}
-		catch (\JDatabaseExceptionExecuting $e)
+		catch (ExecutionFailureException $e)
 		{
 			$this->app->enqueueMessage(Text::sprintf('JERROR_LOADING_MENUS', $e->getMessage()), 'warning');
 
@@ -129,6 +131,7 @@ public function load()
 
 			if (isset($this->getMenu()[$item->parent_id]))
 			{
+				$item->setParent($this->getMenu()[$item->parent_id]);
 				$parent_tree  = $this->getMenu()[$item->parent_id]->tree;
 			}
 
diff --git a/libraries/src/Menu/Tree.php b/libraries/src/Menu/Tree.php
deleted file mode 100644
index 1a46531b834a2..0000000000000
--- a/libraries/src/Menu/Tree.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-/**
- * Joomla! Content Management System
- *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-namespace Joomla\CMS\Menu;
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * Menu Tree class to represent a menu tree hierarchy
- *
- * @since  3.8.0
- */
-class Tree
-{
-	/**
-	 * The root menu node
-	 *
-	 * @var  Node
-	 *
-	 * @since   3.8.0
-	 */
-	protected $root = null;
-
-	/**
-	 * The current working menu node
-	 *
-	 * @var  Node
-	 *
-	 * @since   3.8.0
-	 */
-	protected $current = null;
-
-	/**
-	 * The CSS style array
-	 *
-	 * @var  string[]
-	 *
-	 * @since   3.8.0
-	 */
-	protected $css = array();
-
-	/**
-	 * Counter
-	 *
-	 * @var  int
-	 */
-	protected static $counter = 0;
-
-	/**
-	 * Constructor
-	 *
-	 * @since   3.8.0
-	 */
-	public function __construct()
-	{
-		$this->root    = new Node;
-		$this->current = $this->root;
-	}
-
-	/**
-	 * Get the root node
-	 *
-	 * @return  Node
-	 *
-	 * @since   3.8.0
-	 */
-	public function getRoot()
-	{
-		return $this->root;
-	}
-
-	/**
-	 * Get the current node
-	 *
-	 * @return  Node
-	 *
-	 * @since   3.8.0
-	 */
-	public function getCurrent()
-	{
-		return $this->current;
-	}
-
-	/**
-	 * Get the current node
-	 *
-	 * @param   Node  $node  The node to be set as current
-	 *
-	 * @return  void
-	 *
-	 * @since   3.8.0
-	 */
-	public function setCurrent($node)
-	{
-		if ($node)
-		{
-			$this->current = $node;
-		}
-	}
-
-	/**
-	 * Method to get the parent and set it as active optionally
-	 *
-	 * @param   bool  $setCurrent  Set that parent as the current node for further working
-	 *
-	 * @return  Node
-	 *
-	 * @since   3.8.0
-	 */
-	public function getParent($setCurrent = true)
-	{
-		$parent = $this->current->getParent();
-
-		if ($setCurrent)
-		{
-			$this->setCurrent($parent);
-		}
-
-		return $parent;
-	}
-
-	/**
-	 * Method to reset the working pointer to the root node and optionally clear all menu nodes
-	 *
-	 * @param   bool  $clear  Whether to clear the existing menu items or just reset the pointer to root element
-	 *
-	 * @return  Node  The root node
-	 *
-	 * @since   3.8.0
-	 */
-	public function reset($clear = false)
-	{
-		if ($clear)
-		{
-			$this->root = new Node;
-			$this->css  = array();
-		}
-
-		$this->current = $this->root;
-
-		return  $this->current;
-	}
-
-	/**
-	 * Method to add a child
-	 *
-	 * @param   Node  $node        The node to process
-	 * @param   bool  $setCurrent  Set this new child as the current node for further working
-	 *
-	 * @return  Node  The newly added node
-	 *
-	 * @since   3.8.0
-	 */
-	public function addChild(Node $node, $setCurrent = false)
-	{
-		$this->current->addChild($node);
-
-		if ($setCurrent)
-		{
-			$this->setCurrent($node);
-		}
-
-		return $node;
-	}
-
-	/**
-	 * Method to get the CSS class name for an icon identifier or create one if
-	 * a custom image path is passed as the identifier
-	 *
-	 * @return  string	CSS class name
-	 *
-	 * @since   3.8.0
-	 */
-	public function getIconClass()
-	{
-		static $classes = array();
-
-		$identifier = $this->current->get('class');
-		$html       = '';
-
-		// Top level is special
-		if (trim($identifier) == '' || !$this->current->hasParent())
-		{
-			return null;
-		}
-
-		if (!isset($classes[$identifier]))
-		{
-			// We were passed a class name
-			if (substr($identifier, 0, 6) == 'class:')
-			{
-				$class = substr($identifier, 6);
-			}
-			// We were passed background icon url. Build the CSS class for the icon
-			else
-			{
-				if ($identifier == null)
-				{
-					return null;
-				}
-
-				$class = preg_replace('#\.[^.]*$#', '', basename($identifier));
-				$class = preg_replace('#\.\.[^A-Za-z0-9\.\_\- ]#', '', $class);
-			}
-
-			$html = 'fa-fw fa fa-' . $class;
-		}
-
-		return $html;
-	}
-
-	/**
-	 * Get the CSS declarations for this tree
-	 *
-	 * @return  string[]
-	 *
-	 * @since   3.8.0
-	 */
-	public function getCss()
-	{
-		return $this->css;
-	}
-
-	/**
-	 * Create unique identifier
-	 *
-	 * @return  string
-	 *
-	 * @since   4.0.0
-	 */
-	public function getCounter()
-	{
-		self::$counter++;
-
-		return self::$counter;
-	}
-}
diff --git a/libraries/src/Microdata/Microdata.php b/libraries/src/Microdata/Microdata.php
index 5cc458e5cd7f3..143d94dc15de8 100644
--- a/libraries/src/Microdata/Microdata.php
+++ b/libraries/src/Microdata/Microdata.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Object/CMSObject.php b/libraries/src/Object/CMSObject.php
index 43573f39f1e09..9eefd887e4fcf 100644
--- a/libraries/src/Object/CMSObject.php
+++ b/libraries/src/Object/CMSObject.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Pagination/Pagination.php b/libraries/src/Pagination/Pagination.php
index 1f4c1a141a047..9e01f8e6034e2 100644
--- a/libraries/src/Pagination/Pagination.php
+++ b/libraries/src/Pagination/Pagination.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -73,6 +73,12 @@ class Pagination
 	 */
 	public $pagesTotal;
 
+	/**
+	 * @var    boolean  The flag indicates whether to add limitstart=0 to URL
+	 * @since  3.9.0
+	 */
+	public $hideEmptyLimitstart = false;
+
 	/**
 	 * @var    boolean  View all flag
 	 * @since  3.0
@@ -145,8 +151,8 @@ public function __construct($total, $limitstart, $limit, $prefix = '', CMSApplic
 		// Set the total pages and current page values.
 		if ($this->limit > 0)
 		{
-			$this->pagesTotal = ceil($this->total / $this->limit);
-			$this->pagesCurrent = ceil(($this->limitstart + 1) / $this->limit);
+			$this->pagesTotal = (int) ceil($this->total / $this->limit);
+			$this->pagesCurrent = (int) ceil(($this->limitstart + 1) / $this->limit);
 		}
 
 		// Set the pagination iteration loop values.
@@ -728,7 +734,15 @@ protected function _buildDataObject()
 		if (!$this->viewall)
 		{
 			$data->all->base = '0';
-			$data->all->link = Route::_($params . '&' . $this->prefix . 'limitstart=');
+
+			if ($this->hideEmptyLimitstart)
+			{
+				$data->all->link = Route::_($params ?: '&');
+			}
+			else
+			{
+				$data->all->link = Route::_($params . '&' . $this->prefix . 'limitstart=');
+			}
 		}
 
 		// Set the start and previous data objects.
@@ -737,11 +751,28 @@ protected function _buildDataObject()
 
 		if ($this->pagesCurrent > 1)
 		{
-			$page                 = ($this->pagesCurrent - 2) * $this->limit;
+			$page = ($this->pagesCurrent - 2) * $this->limit;
+
+			if ($this->hideEmptyLimitstart)
+			{
+				$data->start->link = Route::_($params ?: '&');
+			}
+			else
+			{
+				$data->start->link = Route::_($params . '&' . $this->prefix . 'limitstart=0');
+			}
+
 			$data->start->base    = '0';
-			$data->start->link    = Route::_($params . '&' . $this->prefix . 'limitstart=0');
 			$data->previous->base = $page;
-			$data->previous->link = Route::_($params . '&' . $this->prefix . 'limitstart=' . $page);
+
+			if ($page === 0 && $this->hideEmptyLimitstart)
+			{
+				$data->previous->link = $data->start->link;
+			}
+			else
+			{
+				$data->previous->link = Route::_($params . '&' . $this->prefix . 'limitstart=' . $page);
+			}
 		}
 
 		// Set the next and end data objects.
@@ -771,7 +802,15 @@ protected function _buildDataObject()
 			if ($i != $this->pagesCurrent || $this->viewall)
 			{
 				$data->pages[$i]->base = $offset;
-				$data->pages[$i]->link = Route::_($params . '&' . $this->prefix . 'limitstart=' . $offset);
+
+				if ($offset === 0 && $this->hideEmptyLimitstart)
+				{
+					$data->pages[$i]->link = $data->start->link;
+				}
+				else
+				{
+					$data->pages[$i]->link = Route::_($params . '&' . $this->prefix . 'limitstart=' . $offset);
+				}
 			}
 			else
 			{
diff --git a/libraries/src/Pagination/PaginationObject.php b/libraries/src/Pagination/PaginationObject.php
index 1d3526f1547fe..d7dc3d2cb053b 100644
--- a/libraries/src/Pagination/PaginationObject.php
+++ b/libraries/src/Pagination/PaginationObject.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Pathway/Pathway.php b/libraries/src/Pathway/Pathway.php
index e5c61c749d92a..cf8323db0c24a 100644
--- a/libraries/src/Pathway/Pathway.php
+++ b/libraries/src/Pathway/Pathway.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Pathway/SitePathway.php b/libraries/src/Pathway/SitePathway.php
index 184ab74f1aac0..aaafa49f301e3 100644
--- a/libraries/src/Pathway/SitePathway.php
+++ b/libraries/src/Pathway/SitePathway.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Plugin/CMSPlugin.php b/libraries/src/Plugin/CMSPlugin.php
index aefec1c29c707..bb9b4c54884ee 100644
--- a/libraries/src/Plugin/CMSPlugin.php
+++ b/libraries/src/Plugin/CMSPlugin.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Plugin/PluginHelper.php b/libraries/src/Plugin/PluginHelper.php
index aad3de3ff8d49..1fe2873f9c3d1 100644
--- a/libraries/src/Plugin/PluginHelper.php
+++ b/libraries/src/Plugin/PluginHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -245,6 +245,17 @@ protected static function import($plugin, $autocreate = true, DispatcherInterfac
 				{
 					$className = 'Plg' . str_replace('-', '', $plugin->type) . $plugin->name;
 
+					if ($plugin->type == 'editors-xtd')
+					{
+						// This type doesn't follow the convention
+						$className = 'PlgEditorsXtd' . $plugin->name;
+
+						if (!class_exists($className))
+						{
+							$className = 'PlgButton' . $plugin->name;
+						}
+					}
+
 					if (class_exists($className))
 					{
 						// Load the plugin from the database.
diff --git a/libraries/src/Profiler/Profiler.php b/libraries/src/Profiler/Profiler.php
index 576f1de4ddb52..be04d965270df 100644
--- a/libraries/src/Profiler/Profiler.php
+++ b/libraries/src/Profiler/Profiler.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Response/JsonResponse.php b/libraries/src/Response/JsonResponse.php
index 01a862bbbd258..d465078669a14 100644
--- a/libraries/src/Response/JsonResponse.php
+++ b/libraries/src/Response/JsonResponse.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Router/AdministratorRouter.php b/libraries/src/Router/AdministratorRouter.php
index d71736186c6d9..cc6b7d53630d5 100644
--- a/libraries/src/Router/AdministratorRouter.php
+++ b/libraries/src/Router/AdministratorRouter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -40,7 +40,7 @@ public function parse(&$uri, $setVars = false)
 	 *
 	 * @param   string  $url  The internal URL
 	 *
-	 * @return  string  The absolute search engine friendly URL
+	 * @return  Uri  The absolute search engine friendly URL
 	 *
 	 * @since   1.5
 	 */
@@ -53,7 +53,7 @@ public function build($url)
 		$route = $uri->getPath();
 
 		// Add basepath to the uri
-		$uri->setPath(Uri::base(true) . '/' . $route);
+		$uri->setPath(Uri::root(true) . '/' . basename(JPATH_ADMINISTRATOR) . '/' . $route);
 
 		return $uri;
 	}
diff --git a/libraries/src/Router/ApiRouter.php b/libraries/src/Router/ApiRouter.php
new file mode 100644
index 0000000000000..1f2cfaf1b621e
--- /dev/null
+++ b/libraries/src/Router/ApiRouter.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Router;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Application\CMSApplicationInterface;
+use Joomla\CMS\Router\Exception\RouteNotFoundException;
+use Joomla\Router\Router;
+use Joomla\Router\Route;
+
+/**
+ * Joomla! API Router class
+ *
+ * @since  4.0.0
+ */
+class ApiRouter extends Router
+{
+	/**
+	 * The application object
+	 *
+	 * @type   CMSApplicationInterface
+	 * @since  4.0.0
+	 */
+	protected $app;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   CMSApplicationInterface  $app   The application object
+	 * @param   array                    $maps  An optional array of route maps
+	 *
+	 * @since   1.0
+	 */
+	public function __construct(CMSApplicationInterface $app, array $maps = [])
+	{
+		$this->app = $app;
+
+		parent::__construct($maps);
+	}
+
+	/**
+	 * Creates routes map for CRUD
+	 *
+	 * @param   string  $baseName    The base name of the component.
+	 * @param   string  $controller  The name of the controller that contains CRUD functions.
+	 * @param   array   $defaults    An array of default values that are used when the URL is matched.
+	 * @param   bool    $publicGets  Allow the public to make GET requests.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function createCRUDRoutes($baseName, $controller, $defaults = array(), $publicGets = false)
+	{
+		$getDefaults = array_merge(array('public' => $publicGets), $defaults);
+
+		$routes = array(
+			new Route(['GET'], $baseName, $controller . '.displayList', [], $getDefaults),
+			new Route(['GET'], $baseName . '/:id', $controller . '.displayItem', ['id' => '(\d+)'], $getDefaults),
+			new Route(['POST'], $baseName, $controller . '.add', [], $defaults),
+			new Route(['PUT'], $baseName . '/:id', $controller . '.edit', ['id' => '(\d+)'], $defaults),
+			new Route(['DELETE'], $baseName . '/:id', $controller . '.delete', ['id' => '(\d+)'], $defaults),
+		);
+
+		$this->addRoutes($routes);
+	}
+
+	/**
+	 * Parse the given route and return the name of a controller mapped to the given route.
+	 *
+	 * @param   string  $method  Request method to match. One of GET, POST, PUT, DELETE, HEAD, OPTIONS, TRACE or PATCH
+	 *
+	 * @return  array   An array containing the controller and the matched variables.
+	 *
+	 * @since   4.0.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public function parseApiRoute($method = 'GET')
+	{
+		$method = strtoupper($method);
+
+		$validMethods = ["GET", "POST", "PUT", "DELETE", "HEAD", "OPTIONS", "TRACE", "PATCH"];
+
+		if (!in_array($method, $validMethods))
+		{
+			throw new \InvalidArgumentException(sprintf('%s is not a valid HTTP method.', $method));
+		}
+
+		// Get the path from the route and remove and leading or trailing slash.
+		$uri = \JUri::getInstance();
+		$path = urldecode($uri->getPath());
+
+		/**
+		 * In some environments (e.g. CLI we can't form a valid base URL). In this case we catch the exception thrown
+		 * by URI and set an empty base URI for further work.
+		 * TODO: This should probably be handled better
+		 */
+		try
+		{
+			$baseUri = \JUri::base(true);
+		}
+		catch (\RuntimeException $e)
+		{
+			$baseUri = '';
+		}
+
+		// Remove the base URI path.
+		$path = substr_replace($path, '', 0, strlen($baseUri));
+
+		if (!$this->app->get('sef_rewrite'))
+		{
+			// Transform the route
+			if ($path === 'index.php')
+			{
+				$path = '';
+			}
+			else
+			{
+				$path = str_replace('index.php/', '', $path);
+			}
+		}
+
+		$query = \JUri::getInstance()->getQuery(true);
+
+		// Iterate through all of the known routes looking for a match.
+		foreach ($this->routes as $route)
+		{
+			if (in_array($method, $route->getMethods()))
+			{
+				if (preg_match($route->getRegex(), ltrim($path, '/'), $matches))
+				{
+					// If we have gotten this far then we have a positive match.
+					$vars = $route->getDefaults();
+
+					foreach ($route->getRouteVariables() as $i => $var)
+					{
+						$vars[$var] = $matches[$i + 1];
+					}
+
+					$controller = preg_split("/[.]+/", $route->getController());
+					$vars       = array_merge($vars, $query);
+
+					return [
+						'controller' => $controller[0],
+						'task'       => $controller[1],
+						'vars'       => $vars
+					];
+				}
+			}
+		}
+
+		throw new RouteNotFoundException(sprintf('Unable to handle request for route `%s`.', $path));
+	}
+}
diff --git a/libraries/src/Router/Exception/RouteNotFoundException.php b/libraries/src/Router/Exception/RouteNotFoundException.php
index 59007166d4f0e..1d842afa060a6 100644
--- a/libraries/src/Router/Exception/RouteNotFoundException.php
+++ b/libraries/src/Router/Exception/RouteNotFoundException.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Router/Route.php b/libraries/src/Router/Route.php
index 87790fa8cc47d..3697d96b81808 100644
--- a/libraries/src/Router/Route.php
+++ b/libraries/src/Router/Route.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,6 +11,7 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\Uri\Uri;
 
 /**
@@ -23,13 +24,13 @@ class Route
 	/**
 	 * The route object so we don't have to keep fetching it.
 	 *
-	 * @var    Router
+	 * @var    Router[]
 	 * @since  3.0.1
 	 */
-	private static $_router = null;
+	private static $_router = array();
 
 	/**
-	 * Translates an internal Joomla URL to a humanly readable URL.
+	 * Translates an internal Joomla URL to a humanly readable URL. This method builds links for the current active client.
 	 *
 	 * @param   string   $url    Absolute or Relative URI to Joomla resource.
 	 * @param   boolean  $xhtml  Replace & by &amp; for XML compliance.
@@ -38,33 +39,68 @@ class Route
 	 *                             1: Make URI secure using global secure site URI.
 	 *                             2: Make URI unsecure using the global unsecure site URI.
 	 *
-	 * @return string The translated humanly readable URL.
+	 * @return  string  The translated humanly readable URL.
 	 *
 	 * @since   1.7.0
 	 */
 	public static function _($url, $xhtml = true, $ssl = null)
 	{
-		if (!self::$_router)
+		try
 		{
-			// Get the router.
-			$app = Factory::getApplication();
-			self::$_router = $app::getRouter();
+			$app    = Factory::getApplication();
+			$client = $app->getName();
 
-			// Make sure that we have our router
-			if (!self::$_router)
-			{
-				return;
-			}
+			return static::link($client, $url, $xhtml, $ssl);
+		}
+		catch (\RuntimeException $e)
+		{
+			// Before 3.9.0 this method failed silently on router error. This B/C will be removed in Joomla 4.0.
+			return null;
 		}
+	}
 
+	/**
+	 * Translates an internal Joomla URL to a humanly readable URL.
+	 * NOTE: To build link for active client instead of a specific client, you can use <var>JRoute::_()</var>
+	 *
+	 * @param   string   $client  The client name for which to build the link.
+	 * @param   string   $url     Absolute or Relative URI to Joomla resource.
+	 * @param   boolean  $xhtml   Replace & by &amp; for XML compliance.
+	 * @param   integer  $ssl     Secure state for the resolved URI.
+	 *                              0: (default) No change, use the protocol currently used in the request
+	 *                              1: Make URI secure using global secure site URI.
+	 *                              2: Make URI unsecure using the global unsecure site URI.
+	 *
+	 * @return  string  The translated humanly readable URL.
+	 *
+	 * @throws  \RuntimeException
+	 *
+	 * @since   3.9.0
+	 */
+	public static function link($client, $url, $xhtml = true, $ssl = null)
+	{
+		// If we cannot process this $url exit early.
 		if (!is_array($url) && (strpos($url, '&') !== 0) && (strpos($url, 'index.php') !== 0))
 		{
 			return $url;
 		}
 
-		// Build route.
-		$uri = self::$_router->build($url);
+		// Get the router instance, only attempt when a client name is given.
+		if ($client && !isset(self::$_router[$client]))
+		{
+			$app = Factory::getApplication();
 
+			self::$_router[$client] = $app->getRouter($client);
+		}
+
+		// Make sure that we have our router
+		if (!isset(self::$_router[$client]))
+		{
+			throw new \RuntimeException(Text::sprintf('JLIB_APPLICATION_ERROR_ROUTER_LOAD', $client), 500);
+		}
+
+		// Build route.
+		$uri    = self::$_router[$client]->build($url);
 		$scheme = array('path', 'query', 'fragment');
 
 		/*
@@ -80,7 +116,7 @@ public static function _($url, $xhtml = true, $ssl = null)
 
 			if (!is_array($host_port))
 			{
-				$uri2 = Uri::getInstance();
+				$uri2      = Uri::getInstance();
 				$host_port = array($uri2->getHost(), $uri2->getPort());
 			}
 
diff --git a/libraries/src/Router/Router.php b/libraries/src/Router/Router.php
index 06a46d94a3668..84b7f8c651b6f 100644
--- a/libraries/src/Router/Router.php
+++ b/libraries/src/Router/Router.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -110,7 +110,7 @@ public static function getInstance($client, $options = array())
 			}
 
 			// Check for a possible service from the container otherwise manually instantiate the class
-			if (Factory::getContainer()->exists($classname))
+			if (Factory::getContainer()->has($classname))
 			{
 				self::$instances[$client] = Factory::getContainer()->get($classname);
 			}
diff --git a/libraries/src/Router/SiteRouter.php b/libraries/src/Router/SiteRouter.php
index 3176830335f47..f2961d6244cad 100644
--- a/libraries/src/Router/SiteRouter.php
+++ b/libraries/src/Router/SiteRouter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -225,55 +225,46 @@ public function parseSefRoute(&$router, &$uri)
 		else
 		{
 			// Get menu items.
-			$items = $this->menu->getMenu();
+			$items    = $this->menu->getItems('parent_id', 1);
+			$lang_tag = $this->app->getLanguage()->getTag();
+			$found   = null;
 
-			$found           = false;
-			$route_lowercase = StringHelper::strtolower($route);
-			$lang_tag        = $this->app->getLanguage()->getTag();
-
-			// Iterate through all items and check route matches.
-			foreach ($items as $item)
+			foreach ($segments as $segment)
 			{
-				if ($item->route && StringHelper::strpos($route_lowercase . '/', $item->route . '/') === 0 && $item->type !== 'menulink')
+				$matched = false;
+
+				foreach ($items as $item)
 				{
-					// Usual method for non-multilingual site.
-					if (!$this->app->getLanguageFilter())
-					{
-						// Exact route match. We can break iteration because exact item was found.
-						if ($item->route === $route_lowercase)
-						{
-							$found = $item;
-							break;
-						}
-
-						// Partial route match. Item with highest level takes priority.
-						if (!$found || $found->level < $item->level)
-						{
-							$found = $item;
-						}
-					}
-					// Multilingual site.
-					elseif ($item->language === '*' || $item->language === $lang_tag)
+					if ($item->alias == $segment
+						&& (!$this->app->getLanguageFilter() 
+						|| ($item->language === '*' 
+						|| $item->language === $lang_tag)))
 					{
-						// Exact route match.
-						if ($item->route === $route_lowercase)
-						{
-							$found = $item;
-
-							// Break iteration only if language is matched.
-							if ($item->language === $lang_tag)
-							{
-								break;
-							}
-						}
-
-						// Partial route match. Item with highest level or same language takes priority.
-						if (!$found || $found->level < $item->level || $item->language === $lang_tag)
-						{
-							$found = $item;
-						}
+						$found = $item;
+						$matched = true;
+						$items = $item->getChildren();
+						break;
 					}
 				}
+
+				if (!$matched)
+				{
+					break;
+				}
+			}
+
+			// Menu links are not valid URLs. Find the first parent that isn't a menulink
+			if ($found && $found->type == 'menulink')
+			{
+				while ($found->hasParent() && $found->type == 'menulink')
+				{
+					$found = $found->getParent();
+				}
+
+				if ($found->type == 'menulink')
+				{
+					$found = null;
+				}
 			}
 
 			if (!$found)
@@ -597,8 +588,8 @@ public function buildRewrite(&$router, &$uri)
 	 */
 	public function buildBase(&$router, &$uri)
 	{
-		// Add basepath to the uri
-		$uri->setPath(Uri::base(true) . '/' . $uri->getPath());
+		// Add frontend basepath to the uri
+		$uri->setPath(Uri::root(true) . '/' . $uri->getPath());
 	}
 
 	/**
diff --git a/libraries/src/Schema/ChangeItem.php b/libraries/src/Schema/ChangeItem.php
index 8694798a6b2b0..c3a0f8eda6cc5 100644
--- a/libraries/src/Schema/ChangeItem.php
+++ b/libraries/src/Schema/ChangeItem.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Schema/ChangeItem/MysqlChangeItem.php b/libraries/src/Schema/ChangeItem/MysqlChangeItem.php
index 2520188691cd2..01c9cd7a241d0 100644
--- a/libraries/src/Schema/ChangeItem/MysqlChangeItem.php
+++ b/libraries/src/Schema/ChangeItem/MysqlChangeItem.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Schema/ChangeItem/PostgresqlChangeItem.php b/libraries/src/Schema/ChangeItem/PostgresqlChangeItem.php
index 14be04f90974b..46b1b3eb048d0 100644
--- a/libraries/src/Schema/ChangeItem/PostgresqlChangeItem.php
+++ b/libraries/src/Schema/ChangeItem/PostgresqlChangeItem.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -40,20 +40,28 @@ protected function buildCheckQuery()
 	{
 		// Initialize fields in case we can't create a check query
 		$this->checkStatus = -1; // change status to skipped
+
 		$result = null;
+		$splitIntoWords = "~'[^']*'(*SKIP)(*F)|\s+~";
+		$splitIntoActions = "~'[^']*'(*SKIP)(*F)|\([^)]*\)(*SKIP)(*F)|,~";
 
 		// Remove any newlines
 		$this->updateQuery = str_replace("\n", '', $this->updateQuery);
 
+		// Remove trailing whitespace and semicolon
+		$this->updateQuery = rtrim($this->updateQuery, "; \t\n\r\0\x0B");
+
 		// Fix up extra spaces around () and in general
 		$find = array('#((\s*)\(\s*([^)\s]+)\s*)(\))#', '#(\s)(\s*)#');
 		$replace = array('($3)', '$1');
 		$updateQuery = preg_replace($find, $replace, $this->updateQuery);
-		$wordArray = explode(' ', $updateQuery);
+		$wordArray = preg_split($splitIntoWords, $updateQuery, null, PREG_SPLIT_NO_EMPTY);
+
+		$totalWords = count($wordArray);
 
 		// First, make sure we have an array of at least 6 elements
 		// if not, we can't make a check query for this one
-		if (count($wordArray) < 6)
+		if ($totalWords < 6)
 		{
 			// Done with method
 			return;
@@ -64,93 +72,164 @@ protected function buildCheckQuery()
 
 		if ($command === 'ALTER TABLE')
 		{
+			// Check only the last action
+			$actions = ltrim(substr($updateQuery, strpos($updateQuery, $wordArray[2]) + strlen($wordArray[2])));
+			$actions = preg_split($splitIntoActions, $actions);
+
+			// Get the last action
+			$lastActionArray = preg_split($splitIntoWords, end($actions), null, PREG_SPLIT_NO_EMPTY);
+
+			// Replace all actions by the last one
+			array_splice($wordArray, 3, $totalWords, $lastActionArray);
+
 			$alterCommand = strtoupper($wordArray[3] . ' ' . $wordArray[4]);
 
 			if ($alterCommand === 'ADD COLUMN')
 			{
-				$result = 'SELECT column_name FROM information_schema.columns WHERE table_name='
-				. $this->fixQuote($wordArray[2]) . ' AND column_name=' . $this->fixQuote($wordArray[5]);
+				$result = 'SELECT column_name'
+					. ' FROM information_schema.columns'
+					. ' WHERE table_name='
+					. $this->fixQuote($wordArray[2])
+					. ' AND column_name=' . $this->fixQuote($wordArray[5]);
 
 				$this->queryType = 'ADD_COLUMN';
-				$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]));
+				$this->msgElements = array(
+					$this->fixQuote($wordArray[2]),
+					$this->fixQuote($wordArray[5])
+				);
 			}
 			elseif ($alterCommand === 'DROP COLUMN')
 			{
-				$result = 'SELECT column_name FROM information_schema.columns WHERE table_name='
-				. $this->fixQuote($wordArray[2]) . ' AND column_name=' . $this->fixQuote($wordArray[5]);
+				$result = 'SELECT column_name'
+					. ' FROM information_schema.columns'
+					. ' WHERE table_name='
+					. $this->fixQuote($wordArray[2])
+					. ' AND column_name=' . $this->fixQuote($wordArray[5]);
 
 				$this->queryType = 'DROP_COLUMN';
 				$this->checkQueryExpected = 0;
-				$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]));
+				$this->msgElements = array(
+					$this->fixQuote($wordArray[2]),
+					$this->fixQuote($wordArray[5])
+				);
 			}
 			elseif ($alterCommand === 'ALTER COLUMN')
 			{
-				if (strtoupper($wordArray[6]) === 'TYPE')
+				$alterAction = strtoupper($wordArray[6]);
+
+				if ($alterAction === 'TYPE')
 				{
-					$type = '';
+					$type = implode(' ', array_slice($wordArray, 7));
 
-					for ($i = 7, $iMax = count($wordArray); $i < $iMax; $i++)
+					if ($pos = stripos($type, ' USING '))
 					{
-						$type .= $wordArray[$i] . ' ';
+						$type = substr($type, 0, $pos);
 					}
 
 					if ($pos = strpos($type, '('))
 					{
-						$type = substr($type, 0, $pos);
+						$datatype = substr($type, 0, $pos);
 					}
-
-					if ($pos = strpos($type, ';'))
+					else
 					{
-						$type = substr($type, 0, $pos);
+						$datatype = $type;
 					}
 
-					$result = 'SELECT column_name, data_type FROM information_schema.columns WHERE table_name='
-						. $this->fixQuote($wordArray[2]) . ' AND column_name=' . $this->fixQuote($wordArray[5])
-						. ' AND data_type=' . $this->fixQuote($type);
+					$result = 'SELECT column_name, data_type '
+						. 'FROM information_schema.columns WHERE table_name='
+						. $this->fixQuote($wordArray[2]) . ' AND column_name='
+						. $this->fixQuote($wordArray[5])
+						. ' AND data_type=' . $this->fixQuote($datatype);
+
+					if ($datatype === 'character varying')
+					{
+						$result .= ' AND character_maximum_length = ' . (int) substr($type, $pos + 1);
+					}
 
 					$this->queryType = 'CHANGE_COLUMN_TYPE';
-					$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]), $type);
+					$this->msgElements = array(
+						$this->fixQuote($wordArray[2]),
+						$this->fixQuote($wordArray[5]),
+						$type
+					);
 				}
-				elseif (strtoupper($wordArray[7] . ' ' . $wordArray[8]) === 'NOT NULL')
+				elseif ($alterAction === 'SET')
 				{
-					if (strtoupper($wordArray[6]) === 'SET')
+					$alterType = strtoupper($wordArray[7]);
+
+					if ($alterType === 'NOT' && strtoupper($wordArray[8]) === 'NULL')
 					{
-						// SET NOT NULL
-						$isNullable = $this->fixQuote('NO');
+						$result = 'SELECT column_name, data_type, is_nullable'
+							. ' FROM information_schema.columns'
+							. ' WHERE table_name=' . $this->fixQuote($wordArray[2])
+							. ' AND column_name=' . $this->fixQuote($wordArray[5])
+							. ' AND is_nullable=' . $this->fixQuote('NO');
+
+						$this->queryType = 'CHANGE_COLUMN_TYPE';
+						$this->msgElements = array(
+							$this->fixQuote($wordArray[2]),
+							$this->fixQuote($wordArray[5]),
+							'NOT NULL'
+						);
 					}
-					else
+					elseif ($alterType === 'DEFAULT')
 					{
-						// DROP NOT NULL
-						$isNullable = $this->fixQuote('YES');
-					}
+						$result = 'SELECT column_name, data_type, is_nullable'
+							. ' FROM information_schema.columns'
+							. ' WHERE table_name=' . $this->fixQuote($wordArray[2])
+							. ' AND column_name=' . $this->fixQuote($wordArray[5])
+							. ' AND (CASE (position(' . $this->db->quote('::') . ' in column_default))'
+							. ' WHEN 0 THEN '
+							. ' column_default = ' . $this->db->quote($wordArray[8])
+							. ' ELSE '
+							. ' substring(column_default, 1, (position(' . $this->db->quote('::')
+							. ' in column_default) -1))  = ' . $this->db->quote($wordArray[8])
+							. ' END)';
 
-					$result = 'SELECT column_name, data_type, is_nullable FROM information_schema.columns WHERE table_name='
-						. $this->fixQuote($wordArray[2]) . ' AND column_name=' . $this->fixQuote($wordArray[5])
-						. ' AND is_nullable=' . $isNullable;
-
-					$this->queryType = 'CHANGE_COLUMN_TYPE';
-					$this->checkQueryExpected = 1;
-					$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]), $isNullable);
+						$this->queryType = 'CHANGE_COLUMN_TYPE';
+						$this->msgElements = array(
+							$this->fixQuote($wordArray[2]),
+							$this->fixQuote($wordArray[5]),
+							'DEFAULT ' . $wordArray[8]
+						);
+					}
 				}
-				elseif (strtoupper($wordArray[7]) === 'DEFAULT')
+				elseif ($alterAction === 'DROP')
 				{
-					if (strtoupper($wordArray[6]) === 'SET')
+					$alterType = strtoupper($wordArray[7]);
+
+					if ($alterType === 'DEFAULT')
 					{
-						$isNullDef = 'IS NOT NULL';
+						$result = 'SELECT column_name, data_type, is_nullable , column_default'
+							. ' FROM information_schema.columns'
+							. ' WHERE table_name=' . $this->fixQuote($wordArray[2])
+							. ' AND column_name=' . $this->fixQuote($wordArray[5])
+							. ' AND column_default IS NOT NULL';
+
+						$this->queryType = 'CHANGE_COLUMN_TYPE';
+						$this->checkQueryExpected = 0;
+						$this->msgElements = array(
+							$this->fixQuote($wordArray[2]),
+							$this->fixQuote($wordArray[5]),
+							'NOT DEFAULT'
+						);
 					}
-					else
+					elseif ($alterType === 'NOT' && strtoupper($wordArray[8]) === 'NULL')
 					{
-						// DROP DEFAULT
-						$isNullDef = 'IS NULL';
-					}
+						$result = 'SELECT column_name, data_type, is_nullable , column_default'
+							. ' FROM information_schema.columns'
+							. ' WHERE table_name=' . $this->fixQuote($wordArray[2])
+							. ' AND column_name=' . $this->fixQuote($wordArray[5])
+							. ' AND is_nullable = ' . $this->fixQuote('NO');
 
-					$result = 'SELECT column_name, data_type, column_default FROM information_schema.columns WHERE table_name='
-						. $this->fixQuote($wordArray[2]) . ' AND column_name=' . $this->fixQuote($wordArray[5])
-						. ' AND column_default ' . $isNullDef;
-
-					$this->queryType = 'CHANGE_COLUMN_TYPE';
-					$this->checkQueryExpected = 1;
-					$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]), $isNullDef);
+						$this->queryType = 'CHANGE_COLUMN_TYPE';
+						$this->checkQueryExpected = 0;
+						$this->msgElements = array(
+							$this->fixQuote($wordArray[2]),
+							$this->fixQuote($wordArray[5]),
+							'NULL'
+						);
+					}
 				}
 			}
 		}
diff --git a/libraries/src/Schema/ChangeItem/SqlsrvChangeItem.php b/libraries/src/Schema/ChangeItem/SqlsrvChangeItem.php
index cb3ad019a441a..2b0a79b6c0d8e 100644
--- a/libraries/src/Schema/ChangeItem/SqlsrvChangeItem.php
+++ b/libraries/src/Schema/ChangeItem/SqlsrvChangeItem.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Schema/ChangeSet.php b/libraries/src/Schema/ChangeSet.php
index 1c0c1c02e9f9a..0ae0b833d0d6c 100644
--- a/libraries/src/Schema/ChangeSet.php
+++ b/libraries/src/Schema/ChangeSet.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Serializer/JoomlaSerializer.php b/libraries/src/Serializer/JoomlaSerializer.php
new file mode 100644
index 0000000000000..d8bac46eaf930
--- /dev/null
+++ b/libraries/src/Serializer/JoomlaSerializer.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Serializer;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Table\Table;
+use Tobscure\JsonApi\AbstractSerializer;
+
+/**
+ * Temporary serializer
+ *
+ * @since  4.0.0
+ */
+class JoomlaSerializer extends AbstractSerializer
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   string  $type  The content type to be loaded
+	 *
+	 * @since 4.0.0
+	 */
+	public function __construct(string $type)
+	{
+		$this->type = $type;
+	}
+
+	/**
+	 * Get the attributes array.
+	 *
+	 * @param   Table|array|\stdClass|CMSobject  $post    The model
+	 * @param   array                            $fields  The fields can be array or null
+	 *
+	 * @return  array
+	 *
+	 * @since   4.0.0
+	 */
+	public function getAttributes($post, array $fields = null)
+	{
+		if (!($post instanceof Table) && !($post instanceof \stdClass) && !(is_array($post))
+			&& !($post instanceof CMSObject))
+		{
+			$message = sprintf(
+				'Invalid argument for TableSerializer. Expected array or %s. Got %s',
+				Table::class,
+				gettype($post)
+			);
+
+			throw new \InvalidArgumentException($message);
+		}
+
+		// The response from a standard ListModel query
+		if ($post instanceof \stdClass)
+		{
+			$post = (array) $post;
+		}
+
+		// The response from a standard AdminModel query
+		if ($post instanceof CMSObject)
+		{
+			$post = $post->getProperties();
+		}
+
+		// TODO: Find a way to make this an instance of TableInterface instead of the concrete class
+		if ($post instanceof Table)
+		{
+			$post = $post->getProperties();
+		}
+
+		return is_array($fields) ? array_intersect_key($post, array_flip($fields)) : $post;
+	}
+}
diff --git a/libraries/src/Service/Provider/ApiRouter.php b/libraries/src/Service/Provider/ApiRouter.php
new file mode 100644
index 0000000000000..8fe96828880a4
--- /dev/null
+++ b/libraries/src/Service/Provider/ApiRouter.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Service\Provider;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\SiteApplication;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+/**
+ * Service provider for the application's API router dependency
+ *
+ * @since  4.0.0
+ */
+class ApiRouter implements ServiceProviderInterface
+{
+	/**
+	 * Registers the service provider with a DI container.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function register(Container $container)
+	{
+		$container->alias('ApiRouter', 'Joomla\CMS\Router\ApiRouter')
+			->share(
+			'Joomla\CMS\Router\ApiRouter',
+			function (Container $container)
+			{
+				return new \Joomla\CMS\Router\ApiRouter($container->get(SiteApplication::class));
+			},
+			true
+		);
+	}
+}
diff --git a/libraries/src/Service/Provider/Application.php b/libraries/src/Service/Provider/Application.php
index 11f88eba243a2..b68d4cbe9880c 100644
--- a/libraries/src/Service/Provider/Application.php
+++ b/libraries/src/Service/Provider/Application.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Service
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,18 +12,21 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Application\AdministratorApplication;
+use Joomla\CMS\Application\ApiApplication;
 use Joomla\CMS\Application\ConsoleApplication;
 use Joomla\CMS\Application\SiteApplication;
+use Joomla\CMS\Console\Loader\WritableContainerLoader;
+use Joomla\CMS\Console\Loader\WritableLoaderInterface;
 use Joomla\CMS\Console\SessionGcCommand;
 use Joomla\CMS\Console\SessionMetadataGcCommand;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Session\Session;
+use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\Console\Application as BaseConsoleApplication;
-use Joomla\Console\Loader\ContainerLoader;
 use Joomla\Console\Loader\LoaderInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use Joomla\Session\Storage\RuntimeStorage;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Session\SessionInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -57,9 +60,10 @@ function (Container $container)
 						Factory::$application = $app;
 					}
 
-					$app->setDispatcher($container->get('Joomla\Event\DispatcherInterface'));
+					$app->setDispatcher($container->get(DispatcherInterface::class));
 					$app->setLogger($container->get(LoggerInterface::class));
-					$app->setSession($container->get('Joomla\Session\SessionInterface'));
+					$app->setSession($container->get(SessionInterface::class));
+					$app->setUserFactory($container->get(UserFactoryInterface::class));
 
 					return $app;
 				},
@@ -79,9 +83,10 @@ function (Container $container)
 						Factory::$application = $app;
 					}
 
-					$app->setDispatcher($container->get('Joomla\Event\DispatcherInterface'));
+					$app->setDispatcher($container->get(DispatcherInterface::class));
 					$app->setLogger($container->get(LoggerInterface::class));
-					$app->setSession($container->get('Joomla\Session\SessionInterface'));
+					$app->setSession($container->get(SessionInterface::class));
+					$app->setUserFactory($container->get(UserFactoryInterface::class));
 
 					return $app;
 				},
@@ -93,35 +98,59 @@ function (Container $container)
 				BaseConsoleApplication::class,
 				function (Container $container)
 				{
-					$app = new ConsoleApplication(null, $container->get('config'));
+					$dispatcher = $container->get(DispatcherInterface::class);
 
-					$dispatcher = $container->get('Joomla\Event\DispatcherInterface');
+					$app = new ConsoleApplication(null, null, $container->get('config'), $dispatcher, $container);
 
-					$session = new Session(new RuntimeStorage);
-					$session->setDispatcher($dispatcher);
+					// The session service provider needs Factory::$application, set it if still null
+					if (Factory::$application === null)
+					{
+						Factory::$application = $app;
+					}
 
 					$app->setCommandLoader($container->get(LoaderInterface::class));
-					$app->setContainer($container);
-					$app->setDispatcher($dispatcher);
 					$app->setLogger($container->get(LoggerInterface::class));
-					$app->setSession($session);
+					$app->setSession($container->get(SessionInterface::class));
+					$app->setUserFactory($container->get(UserFactoryInterface::class));
 
 					return $app;
 				},
 				true
 			);
 
-		$container->alias(ContainerLoader::class, LoaderInterface::class)
+		$container->alias(WritableContainerLoader::class, LoaderInterface::class)
+			->alias(WritableLoaderInterface::class, LoaderInterface::class)
 			->share(
 				LoaderInterface::class,
 				function (Container $container)
 				{
 					$mapping = [
-						'session:gc'          => SessionGcCommand::class,
-						'session:metadata:gc' => SessionMetadataGcCommand::class,
+						SessionGcCommand::getDefaultName()         => SessionGcCommand::class,
+						SessionMetadataGcCommand::getDefaultName() => SessionMetadataGcCommand::class,
 					];
 
-					return new ContainerLoader($container, $mapping);
+					return new WritableContainerLoader($container, $mapping);
+				},
+				true
+			);
+
+		$container->alias(ApiApplication::class, 'JApplicationApi')
+			->share(
+				'JApplicationApi',
+				function (Container $container) {
+					$app = new ApiApplication(null, null, null, $container);
+
+					// The session service provider needs JFactory::$application, set it if still null
+					if (Factory::$application === null)
+					{
+						Factory::$application = $app;
+					}
+
+					$app->setDispatcher($container->get('Joomla\Event\DispatcherInterface'));
+					$app->setLogger($container->get(LoggerInterface::class));
+					$app->setSession($container->get('Joomla\Session\SessionInterface'));
+
+					return $app;
 				},
 				true
 			);
diff --git a/libraries/src/Service/Provider/Authentication.php b/libraries/src/Service/Provider/Authentication.php
index c177a8d2dfa31..a1e9fd708b1cf 100644
--- a/libraries/src/Service/Provider/Authentication.php
+++ b/libraries/src/Service/Provider/Authentication.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Service/Provider/CacheController.php b/libraries/src/Service/Provider/CacheController.php
index 3464a4107efb0..f191251fc6151 100644
--- a/libraries/src/Service/Provider/CacheController.php
+++ b/libraries/src/Service/Provider/CacheController.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Service/Provider/Config.php b/libraries/src/Service/Provider/Config.php
index 405b7fd54b7ab..e23d69fca2292 100644
--- a/libraries/src/Service/Provider/Config.php
+++ b/libraries/src/Service/Provider/Config.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Service/Provider/Console.php b/libraries/src/Service/Provider/Console.php
index 3f97a454abbc0..998d16af6ac2b 100644
--- a/libraries/src/Service/Provider/Console.php
+++ b/libraries/src/Service/Provider/Console.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Service
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Service/Provider/Database.php b/libraries/src/Service/Provider/Database.php
index fd0ee8b776aec..577de99b6f6be 100644
--- a/libraries/src/Service/Provider/Database.php
+++ b/libraries/src/Service/Provider/Database.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Service
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Service/Provider/Dispatcher.php b/libraries/src/Service/Provider/Dispatcher.php
index 3f11aff2da312..88ca5ee8eb8c4 100644
--- a/libraries/src/Service/Provider/Dispatcher.php
+++ b/libraries/src/Service/Provider/Dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Service
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Service/Provider/Document.php b/libraries/src/Service/Provider/Document.php
index 2874b090cccc9..7bd74b4573c8c 100644
--- a/libraries/src/Service/Provider/Document.php
+++ b/libraries/src/Service/Provider/Document.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Service/Provider/Form.php b/libraries/src/Service/Provider/Form.php
index 9d7081cac5cbd..5a25d9d9d42f0 100644
--- a/libraries/src/Service/Provider/Form.php
+++ b/libraries/src/Service/Provider/Form.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Service/Provider/HTMLRegistry.php b/libraries/src/Service/Provider/HTMLRegistry.php
index 51953c015feb6..89b0701917c66 100644
--- a/libraries/src/Service/Provider/HTMLRegistry.php
+++ b/libraries/src/Service/Provider/HTMLRegistry.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Service/Provider/Language.php b/libraries/src/Service/Provider/Language.php
index 4c55b9f7107eb..98088fc031210 100644
--- a/libraries/src/Service/Provider/Language.php
+++ b/libraries/src/Service/Provider/Language.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Service/Provider/Logger.php b/libraries/src/Service/Provider/Logger.php
index 8ac7280051f5d..7abd09b0229f6 100644
--- a/libraries/src/Service/Provider/Logger.php
+++ b/libraries/src/Service/Provider/Logger.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Service
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Service/Provider/Menu.php b/libraries/src/Service/Provider/Menu.php
index fae05460c9278..2a02844ec9112 100644
--- a/libraries/src/Service/Provider/Menu.php
+++ b/libraries/src/Service/Provider/Menu.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Service/Provider/Pathway.php b/libraries/src/Service/Provider/Pathway.php
index b594cbc5afee2..3b5e0aaa661bc 100644
--- a/libraries/src/Service/Provider/Pathway.php
+++ b/libraries/src/Service/Provider/Pathway.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Service/Provider/Session.php b/libraries/src/Service/Provider/Session.php
index f3b6e637d4f8a..1407a804e2623 100644
--- a/libraries/src/Service/Provider/Session.php
+++ b/libraries/src/Service/Provider/Session.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Service
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -16,8 +16,10 @@
 use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\Application\ConsoleApplication;
 use Joomla\CMS\Application\SiteApplication;
+use Joomla\CMS\Event\LazyServiceEventListener;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Installation\Application\InstallationApplication;
+use Joomla\CMS\Session\EventListener\MetadataManagerListener;
 use Joomla\CMS\Session\MetadataManager;
 use Joomla\CMS\Session\SessionFactory;
 use Joomla\CMS\Session\Storage\JoomlaStorage;
@@ -28,7 +30,6 @@
 use Joomla\Event\DispatcherInterface;
 use Joomla\Event\Priority;
 use Joomla\Registry\Registry;
-use Joomla\Session\SessionEvent;
 use Joomla\Session\SessionEvents;
 use Joomla\Session\SessionInterface;
 use Joomla\Session\Storage\RuntimeStorage;
@@ -223,31 +224,22 @@ function (Container $container)
 				true
 			);
 
-		/*
-		 * This is all sorts of hacky but there is no way to create an event listener with an injected database driver and the dispatcher
-		 * doesn't have a native form of "lazy" listeners; there is a better way but we don't have it at the moment.
-		 */
-
-		if ($container->has(DispatcherInterface::class))
-		{
-			/** @var DispatcherInterface $dispatcher */
-			$dispatcher = $container->get(DispatcherInterface::class);
-			$dispatcher->addListener(
-				SessionEvents::START,
-				function (SessionEvent $event) use ($container)
+		$container->alias(MetadataManagerListener::class, 'session.event_listener.metadata_manager')
+			->share(
+				'session.event_listener.metadata_manager',
+				function (Container $container)
 				{
-					/** @var Registry $config */
-					$config = $container->get('config');
-
-					if ($config->get('session_metadata', true) && $event->getSession()->has('user'))
-					{
-						/** @var MetadataManager $metadataManager */
-						$metadataManager = $container->get(MetadataManager::class);
-						$metadataManager->createOrUpdateRecord($event->getSession(), $event->getSession()->get('user'));
-					}
-				}
+					return new MetadataManagerListener($container->get(MetadataManager::class), $container->get('config'));
+				},
+				true
 			);
-		}
+
+		$listener = new LazyServiceEventListener('session.event_listener.metadata_manager', 'onAfterSessionStart');
+		$listener->setContainer($container);
+
+		/** @var DispatcherInterface $dispatcher */
+		$dispatcher = $container->get(DispatcherInterface::class);
+		$dispatcher->addListener(SessionEvents::START, $listener);
 	}
 
 	/**
diff --git a/libraries/src/Service/Provider/Toolbar.php b/libraries/src/Service/Provider/Toolbar.php
index 506635cfee056..0d7540d372c70 100644
--- a/libraries/src/Service/Provider/Toolbar.php
+++ b/libraries/src/Service/Provider/Toolbar.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Service/Provider/User.php b/libraries/src/Service/Provider/User.php
new file mode 100644
index 0000000000000..c172a734a92d6
--- /dev/null
+++ b/libraries/src/Service/Provider/User.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Service\Provider;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\User\UserFactory;
+use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\Database\DatabaseInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+/**
+ * Service provider for the user dependency
+ *
+ * @since  4.0
+ */
+class User implements ServiceProviderInterface
+{
+	/**
+	 * Registers the service provider with a DI container.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0
+	 */
+	public function register(Container $container)
+	{
+		$container->alias('user.factory', UserFactoryInterface::class)
+			->alias(UserFactory::class, UserFactoryInterface::class)
+			->share(
+				UserFactoryInterface::class,
+				function (Container $container)
+				{
+					return new UserFactory($container->get(DatabaseInterface::class));
+				},
+				true
+			);
+	}
+}
diff --git a/libraries/src/Service/Provider/WebAssetRegistry.php b/libraries/src/Service/Provider/WebAssetRegistry.php
index 2182accc17d58..dbdecce692f92 100644
--- a/libraries/src/Service/Provider/WebAssetRegistry.php
+++ b/libraries/src/Service/Provider/WebAssetRegistry.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Session/EventListener/MetadataManagerListener.php b/libraries/src/Session/EventListener/MetadataManagerListener.php
new file mode 100644
index 0000000000000..566e0a8621999
--- /dev/null
+++ b/libraries/src/Session/EventListener/MetadataManagerListener.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Session\EventListener;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Session\MetadataManager;
+use Joomla\Registry\Registry;
+use Joomla\Session\SessionEvent;
+
+/**
+ * Event listener for session events regarding the session metadata for users.
+ *
+ * @since  4.0.0
+ */
+final class MetadataManagerListener
+{
+	/**
+	 * Session metadata manager.
+	 *
+	 * @var    MetadataManager
+	 * @since  4.0.0
+	 */
+	private $metadataManager;
+
+	/**
+	 * Application configuration.
+	 *
+	 * @var    Registry
+	 * @since  4.0.0
+	 */
+	private $config;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   MetadataManager  $metadataManager  Session metadata manager.
+	 * @param   Registry         $config           Application configuration.
+	 *
+	 * @since   4.0.0
+	 */
+	public function __construct(MetadataManager $metadataManager, Registry $config)
+	{
+		$this->metadataManager = $metadataManager;
+		$this->config          = $config;
+	}
+
+	/**
+	 * Listener for the `session.start` event.
+	 *
+	 * @param   SessionEvent  $event  The session event.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function onAfterSessionStart(SessionEvent $event)
+	{
+		if ($this->config->get('session_metadata', true) && $event->getSession()->has('user'))
+		{
+			$this->metadataManager->createOrUpdateRecord($event->getSession(), $event->getSession()->get('user'));
+		}
+	}
+}
diff --git a/libraries/src/Session/Exception/UnsupportedStorageException.php b/libraries/src/Session/Exception/UnsupportedStorageException.php
index 9bd89e1a03c42..6d6987b310589 100644
--- a/libraries/src/Session/Exception/UnsupportedStorageException.php
+++ b/libraries/src/Session/Exception/UnsupportedStorageException.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Session/MetadataManager.php b/libraries/src/Session/MetadataManager.php
index bbdeba19e4a64..a457f785666e1 100644
--- a/libraries/src/Session/MetadataManager.php
+++ b/libraries/src/Session/MetadataManager.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -30,7 +30,7 @@ final class MetadataManager
 	 * Internal variable indicating a session record exists.
 	 *
 	 * @var    integer
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 * @note   Once PHP 7.1 is the minimum supported version this should become a private constant
 	 */
 	private static $sessionRecordExists = 1;
@@ -39,7 +39,7 @@ final class MetadataManager
 	 * Internal variable indicating a session record does not exist.
 	 *
 	 * @var    integer
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 * @note   Once PHP 7.1 is the minimum supported version this should become a private constant
 	 */
 	private static $sessionRecordDoesNotExist = 0;
@@ -48,7 +48,7 @@ final class MetadataManager
 	 * Internal variable indicating an unknown session record statue.
 	 *
 	 * @var    integer
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 * @note   Once PHP 7.1 is the minimum supported version this should become a private constant
 	 */
 	private static $sessionRecordUnknown = -1;
@@ -115,7 +115,7 @@ public function createRecordIfNonExisting(SessionInterface $session, User $user)
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 * @throws  \RuntimeException
 	 */
 	public function createOrUpdateRecord(SessionInterface $session, User $user)
@@ -123,7 +123,7 @@ public function createOrUpdateRecord(SessionInterface $session, User $user)
 		$exists = $this->checkSessionRecordExists($session->getId());
 
 		// Do not try to touch the database if we can't determine the record state
-		if ($exists === self::$sessionRecordDoesNotExist)
+		if ($exists === self::$sessionRecordUnknown)
 		{
 			return;
 		}
@@ -173,7 +173,7 @@ public function deletePriorTo($time)
 	 *
 	 * @return  integer  Status value for record presence
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	private function checkSessionRecordExists(string $sessionId): int
 	{
@@ -211,7 +211,7 @@ private function checkSessionRecordExists(string $sessionId): int
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	private function createSessionRecord(SessionInterface $session, User $user)
 	{
@@ -243,7 +243,7 @@ private function createSessionRecord(SessionInterface $session, User $user)
 		$username    = $user->username === null ? '' : $user->username;
 
 		$query->bind(':session_id', $sessionId)
-			->bind(':guest', $userIsGuest, ParameterType::BOOLEAN)
+			->bind(':guest', $userIsGuest, ParameterType::INTEGER)
 			->bind(':time', $time)
 			->bind(':user_id', $userId, ParameterType::INTEGER)
 			->bind(':username', $username);
@@ -282,7 +282,7 @@ private function createSessionRecord(SessionInterface $session, User $user)
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	private function updateSessionRecord(SessionInterface $session, User $user)
 	{
@@ -304,7 +304,7 @@ private function updateSessionRecord(SessionInterface $session, User $user)
 		$username    = $user->username === null ? '' : $user->username;
 
 		$query->bind(':session_id', $sessionId)
-			->bind(':guest', $userIsGuest, ParameterType::BOOLEAN)
+			->bind(':guest', $userIsGuest, ParameterType::INTEGER)
 			->bind(':time', $time)
 			->bind(':user_id', $userId, ParameterType::INTEGER)
 			->bind(':username', $username);
diff --git a/libraries/src/Session/Session.php b/libraries/src/Session/Session.php
index f567806625d25..2e9d8c8a9a47c 100644
--- a/libraries/src/Session/Session.php
+++ b/libraries/src/Session/Session.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Session/SessionFactory.php b/libraries/src/Session/SessionFactory.php
index 79bf739116896..be30960877db1 100644
--- a/libraries/src/Session/SessionFactory.php
+++ b/libraries/src/Session/SessionFactory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Service
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/Session/Storage/JoomlaStorage.php b/libraries/src/Session/Storage/JoomlaStorage.php
index 4de9dde830cbf..d298f075ab797 100644
--- a/libraries/src/Session/Storage/JoomlaStorage.php
+++ b/libraries/src/Session/Storage/JoomlaStorage.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/src/String/PunycodeHelper.php b/libraries/src/String/PunycodeHelper.php
index d7834fbcf053f..662991b11291d 100644
--- a/libraries/src/String/PunycodeHelper.php
+++ b/libraries/src/String/PunycodeHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Table/Asset.php b/libraries/src/Table/Asset.php
index 1a31f8431be6c..adcfdf0dddf5f 100644
--- a/libraries/src/Table/Asset.php
+++ b/libraries/src/Table/Asset.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Table/Category.php b/libraries/src/Table/Category.php
index 6f15bbf69e10f..818c18be65a3a 100644
--- a/libraries/src/Table/Category.php
+++ b/libraries/src/Table/Category.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Table/Content.php b/libraries/src/Table/Content.php
index 890e2f77d7219..03c515631361d 100644
--- a/libraries/src/Table/Content.php
+++ b/libraries/src/Table/Content.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -305,30 +305,6 @@ public function check()
 		return true;
 	}
 
-	/**
-	 * Gets the default asset values for a component.
-	 *
-	 * @param   string  $component  The component asset name to search for
-	 *
-	 * @return  Rules  The Rules object for the asset
-	 *
-	 * @since   3.4
-	 * @deprecated  3.4 Class will be removed upon completion of transition to UCM
-	 */
-	protected function getDefaultAssetValues($component)
-	{
-		// Need to find the asset id by the name of the component.
-		$db = $this->getDbo();
-		$query = $db->getQuery(true)
-			->select($db->quoteName('id'))
-			->from($db->quoteName('#__assets'))
-			->where($db->quoteName('name') . ' = ' . $db->quote($component));
-		$db->setQuery($query);
-		$assetId = (int) $db->loadResult();
-
-		return Access::getAssetRules($assetId);
-	}
-
 	/**
 	 * Overrides Table::store to set modified data and user id.
 	 *
diff --git a/libraries/src/Table/ContentHistory.php b/libraries/src/Table/ContentHistory.php
index 6d97741063d48..c517b40a4e97c 100644
--- a/libraries/src/Table/ContentHistory.php
+++ b/libraries/src/Table/ContentHistory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Table/ContentType.php b/libraries/src/Table/ContentType.php
index 3fa8361cbc934..46a6a09f4752f 100644
--- a/libraries/src/Table/ContentType.php
+++ b/libraries/src/Table/ContentType.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Table/CoreContent.php b/libraries/src/Table/CoreContent.php
index 47b85f77c8595..c72371df44089 100644
--- a/libraries/src/Table/CoreContent.php
+++ b/libraries/src/Table/CoreContent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Table/Extension.php b/libraries/src/Table/Extension.php
index fc850c7cba252..3afc6a6905378 100644
--- a/libraries/src/Table/Extension.php
+++ b/libraries/src/Table/Extension.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Table/Language.php b/libraries/src/Table/Language.php
index 5ce84e5a06810..d26a93a651715 100644
--- a/libraries/src/Table/Language.php
+++ b/libraries/src/Table/Language.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Table/Menu.php b/libraries/src/Table/Menu.php
index c39b545067450..2a2d10702bd7f 100644
--- a/libraries/src/Table/Menu.php
+++ b/libraries/src/Table/Menu.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Table/MenuType.php b/libraries/src/Table/MenuType.php
index 92fec8f7ff2d5..341b4d35623d1 100644
--- a/libraries/src/Table/MenuType.php
+++ b/libraries/src/Table/MenuType.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Table/Module.php b/libraries/src/Table/Module.php
index 6b67775434b26..719e4544cf08a 100644
--- a/libraries/src/Table/Module.php
+++ b/libraries/src/Table/Module.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -23,6 +23,14 @@
  */
 class Module extends Table
 {
+	/**
+	 * Indicates that columns fully support the NULL value in the database
+	 *
+	 * @var    boolean
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $_supportNullValue = true;
+
 	/**
 	 * Constructor.
 	 *
@@ -137,6 +145,17 @@ public function check()
 			return false;
 		}
 
+		// Set publish_up, publish_down to null if not set
+		if (!$this->publish_up)
+		{
+			$this->publish_up = null;
+		}
+
+		if (!$this->publish_down)
+		{
+			$this->publish_down = null;
+		}
+
 		// Check the publish down date is not earlier than publish up.
 		if ((int) $this->publish_down > 0 && $this->publish_down < $this->publish_up)
 		{
@@ -187,23 +206,11 @@ public function bind($array, $ignore = '')
 	 *
 	 * @since   3.7.0
 	 */
-	public function store($updateNulls = false)
+	public function store($updateNulls = true)
 	{
-		// Set publish_up, publish_down and checked_out_time to null date if not set
-		if (!$this->publish_up)
-		{
-			$this->publish_up = $this->_db->getNullDate();
-		}
-
-		if (!$this->publish_down)
-		{
-			$this->publish_down = $this->_db->getNullDate();
-		}
-
 		if (!$this->ordering)
 		{
-			$query = $this->_db->getQuery(true);
-			$this->ordering = $this->getNextOrder($query->quoteName('position') . ' = ' . $query->quote($this->position));
+			$this->ordering = $this->getNextOrder($this->_db->quoteName('position') . ' = ' . $this->_db->quote($this->position));
 		}
 
 		return parent::store($updateNulls);
diff --git a/libraries/src/Table/Nested.php b/libraries/src/Table/Nested.php
index 8295f8d09f786..072926b27c543 100644
--- a/libraries/src/Table/Nested.php
+++ b/libraries/src/Table/Nested.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Table/Table.php b/libraries/src/Table/Table.php
index 631ed2c776d4a..20ba8f0cb5458 100644
--- a/libraries/src/Table/Table.php
+++ b/libraries/src/Table/Table.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -122,6 +122,14 @@ abstract class Table extends CMSObject implements \JTableInterface, DispatcherAw
 	 */
 	protected $_jsonEncode = array();
 
+	/**
+	 * Indicates that columns fully support the NULL value in the database
+	 *
+	 * @var    boolean
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $_supportNullValue = false;
+
 	/**
 	 * The UCM type alias. Used for tags, content versioning etc. Leave blank to effectively disable these features.
 	 *
@@ -304,7 +312,7 @@ public static function getInstance($type, $prefix = 'JTable', $config = array())
 		$db = $config['dbo'] ?? Factory::getDbo();
 
 		// Check for a possible service from the container otherwise manually instantiate the class
-		if (Factory::getContainer()->exists($tableClass))
+		if (Factory::getContainer()->has($tableClass))
 		{
 			return Factory::getContainer()->get($tableClass);
 		}
@@ -1285,11 +1293,13 @@ public function checkIn($pk = null)
 		$checkedOutField     = $this->getColumnAlias('checked_out');
 		$checkedOutTimeField = $this->getColumnAlias('checked_out_time');
 
+		$nullDate = $this->_supportNullValue ? 'NULL' : $this->_db->quote($this->_db->getNullDate());
+
 		// Check the row in by primary key.
 		$query = $this->_db->getQuery(true)
 			->update($this->_tbl)
 			->set($this->_db->quoteName($checkedOutField) . ' = 0')
-			->set($this->_db->quoteName($checkedOutTimeField) . ' = ' . $this->_db->quote($this->_db->getNullDate()));
+			->set($this->_db->quoteName($checkedOutTimeField) . ' = ' . $nullDate);
 		$this->appendPrimaryKeys($query, $pk);
 		$this->_db->setQuery($query);
 
@@ -1298,7 +1308,7 @@ public function checkIn($pk = null)
 
 		// Set table values in the object.
 		$this->$checkedOutField      = 0;
-		$this->$checkedOutTimeField = '';
+		$this->$checkedOutTimeField = $nullDate === 'NULL' ? null : '';
 
 		// Post-processing by observers
 		$event = AbstractEvent::create(
diff --git a/libraries/src/Table/TableInterface.php b/libraries/src/Table/TableInterface.php
index 7cc9bebee5e69..e6fac0cfcb7f0 100644
--- a/libraries/src/Table/TableInterface.php
+++ b/libraries/src/Table/TableInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Table/Ucm.php b/libraries/src/Table/Ucm.php
index fce1b56189886..3fef8b5902c45 100644
--- a/libraries/src/Table/Ucm.php
+++ b/libraries/src/Table/Ucm.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Table/Update.php b/libraries/src/Table/Update.php
index 53ebe2589d973..734c38f8e824f 100644
--- a/libraries/src/Table/Update.php
+++ b/libraries/src/Table/Update.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Table/UpdateSite.php b/libraries/src/Table/UpdateSite.php
index 4d22d7d98b240..df58c99b79ecc 100644
--- a/libraries/src/Table/UpdateSite.php
+++ b/libraries/src/Table/UpdateSite.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Table/User.php b/libraries/src/Table/User.php
index 335e372119bf4..18cb7be18bbe2 100644
--- a/libraries/src/Table/User.php
+++ b/libraries/src/Table/User.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,6 +13,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Mail\MailHelper;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
@@ -211,7 +212,7 @@ public function check()
 			return false;
 		}
 
-		if (($filterInput->clean($this->email, 'TRIM') == '') || !\JMailHelper::isEmailAddress($this->email))
+		if (($filterInput->clean($this->email, 'TRIM') == '') || !MailHelper::isEmailAddress($this->email))
 		{
 			$this->setError(Text::_('JLIB_DATABASE_ERROR_VALID_MAIL'));
 
diff --git a/libraries/src/Table/Usergroup.php b/libraries/src/Table/Usergroup.php
index 944be1e9f3f89..d5414246921cc 100644
--- a/libraries/src/Table/Usergroup.php
+++ b/libraries/src/Table/Usergroup.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -174,12 +174,12 @@ public function delete($oid = null)
 
 		if ($this->id == 0)
 		{
-			throw new \UnexpectedValueException('Global Category not found');
+			throw new \UnexpectedValueException('Usergroup not found');
 		}
 
 		if ($this->parent_id == 0)
 		{
-			throw new \UnexpectedValueException('Root categories cannot be deleted.');
+			throw new \UnexpectedValueException('Root usergroup cannot be deleted.');
 		}
 
 		if ($this->lft == 0 || $this->rgt == 0)
@@ -203,9 +203,6 @@ public function delete($oid = null)
 			throw new \UnexpectedValueException('Left-Right data inconsistency. Cannot delete usergroup.');
 		}
 
-		// Delete the category dependencies
-		// @todo Remove all related threads, posts and subscriptions
-
 		// Delete the usergroup and its children
 		$query->clear()
 			->delete($db->quoteName($this->_tbl))
diff --git a/libraries/src/Table/ViewLevel.php b/libraries/src/Table/ViewLevel.php
index 2e03b6a39eb31..20a28b8f2421d 100644
--- a/libraries/src/Table/ViewLevel.php
+++ b/libraries/src/Table/ViewLevel.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Toolbar/Button/AbstractGroupButton.php b/libraries/src/Toolbar/Button/AbstractGroupButton.php
index 88a5f0e499ed9..d3e393e5cf628 100644
--- a/libraries/src/Toolbar/Button/AbstractGroupButton.php
+++ b/libraries/src/Toolbar/Button/AbstractGroupButton.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Toolbar/Button/BasicButton.php b/libraries/src/Toolbar/Button/BasicButton.php
index ca96d184473c5..c1c8be56ac289 100644
--- a/libraries/src/Toolbar/Button/BasicButton.php
+++ b/libraries/src/Toolbar/Button/BasicButton.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Toolbar/Button/ConfirmButton.php b/libraries/src/Toolbar/Button/ConfirmButton.php
index e2c6eb1726494..bc1c8c47b13c3 100644
--- a/libraries/src/Toolbar/Button/ConfirmButton.php
+++ b/libraries/src/Toolbar/Button/ConfirmButton.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Toolbar/Button/CustomButton.php b/libraries/src/Toolbar/Button/CustomButton.php
index 34f62079f72cc..8d4a11d908880 100644
--- a/libraries/src/Toolbar/Button/CustomButton.php
+++ b/libraries/src/Toolbar/Button/CustomButton.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Toolbar/Button/DropdownButton.php b/libraries/src/Toolbar/Button/DropdownButton.php
index 8f103aee563fa..b76f38d887431 100644
--- a/libraries/src/Toolbar/Button/DropdownButton.php
+++ b/libraries/src/Toolbar/Button/DropdownButton.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Toolbar/Button/HelpButton.php b/libraries/src/Toolbar/Button/HelpButton.php
index 0dd417e13e135..074cf64ee1e61 100644
--- a/libraries/src/Toolbar/Button/HelpButton.php
+++ b/libraries/src/Toolbar/Button/HelpButton.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Toolbar/Button/LinkButton.php b/libraries/src/Toolbar/Button/LinkButton.php
index 90c97fa0573b9..fa7f2aff159b9 100644
--- a/libraries/src/Toolbar/Button/LinkButton.php
+++ b/libraries/src/Toolbar/Button/LinkButton.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Toolbar/Button/PopupButton.php b/libraries/src/Toolbar/Button/PopupButton.php
index 16bd9dba1f072..71fc3cf39192a 100644
--- a/libraries/src/Toolbar/Button/PopupButton.php
+++ b/libraries/src/Toolbar/Button/PopupButton.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Toolbar/Button/SeparatorButton.php b/libraries/src/Toolbar/Button/SeparatorButton.php
index 4745840014829..3b5324e5cf3df 100644
--- a/libraries/src/Toolbar/Button/SeparatorButton.php
+++ b/libraries/src/Toolbar/Button/SeparatorButton.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Toolbar/Button/SliderButton.php b/libraries/src/Toolbar/Button/SliderButton.php
deleted file mode 100644
index ea3dc6942e273..0000000000000
--- a/libraries/src/Toolbar/Button/SliderButton.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/**
- * Joomla! Content Management System
- *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\CMS\Toolbar\Button;
-
-defined('JPATH_PLATFORM') or die;
-
-use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Toolbar\ToolbarButton;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Renders a button to render an HTML element in a slider container
- *
- * @method self url(string $value)
- * @method self height(integer $value)
- * @method self width(integer $value)
- * @method self onClose(string $value)
- * @method integer getHeight()
- * @method integer getWidth
- * @method string getUrl
- * @method string getOnClose
- *
- * @since  3.0
- */
-class SliderButton extends ToolbarButton
-{
-	/**
-	 * Property layout.
-	 *
-	 * @var  string
-	 *
-	 * @since  4.0.0
-	 */
-	protected $layout = 'joomla.toolbar.slider';
-
-	/**
-	 * Prepare options for this button.
-	 *
-	 * @param   array  &$options  The options about this button.
-	 *
-	 * @return  void
-	 *
-	 * @since  4.0.0
-	 */
-	protected function prepareOptions(array &$options)
-	{
-		$options['doTask'] = 'Joomla.setcollapse(\'' . $this->_getCommand($this->getUrl()) . '\', \'' .
-			$this->getName() . '\', \'' . $this->getHeight() . '\');';
-
-		parent::prepareOptions($options);
-	}
-
-	/**
-	 * Fetch the HTML for the button
-	 *
-	 * @param   string   $type     Unused string, formerly button type.
-	 * @param   string   $name     Button name
-	 * @param   string   $text     The link text
-	 * @param   string   $url      URL for popup
-	 * @param   integer  $width    Width of popup
-	 * @param   integer  $height   Height of popup
-	 * @param   string   $onClose  JavaScript for the onClose event.
-	 *
-	 * @return  string  HTML string for the button
-	 *
-	 * @since   3.0
-	 */
-	public function fetchButton($type = 'Slider', $name = '', $text = '', $url = '', $width = 640, $height = 480, $onClose = '')
-	{
-		// @todo split the irrelevant code, this button doesn't need the showon...
-		HTMLHelper::_('script', 'system/showon.min.js', array('version' => 'auto', 'relative' => true));
-
-		$this->text(Text::_($text))
-			->name($name)
-			->buttonClass($this->fetchIconClass($name))
-			->width($width)
-			->height($height)
-			->url($url)
-			->onClose(!empty($options['onClose']) ? ' rel="{onClose: function() {' . $onClose . '}}"' : '');
-
-		return $this->renderButton($this->options);
-	}
-
-	/**
-	 * Get the button id
-	 *
-	 * @return  string	Button CSS Id
-	 *
-	 * @since   3.0
-	 */
-	public function fetchId()
-	{
-		return $this->parent->getName() . '-slider-' . $this->getName();
-	}
-
-	/**
-	 * Get the JavaScript command for the button
-	 *
-	 * @param   string  $url  URL for popup
-	 *
-	 * @return  string  JavaScript command string
-	 *
-	 * @since   3.0
-	 */
-	private function _getCommand($url)
-	{
-		if (strpos($url, 'http') !== 0)
-		{
-			$url = Uri::base() . $url;
-		}
-
-		return $url;
-	}
-
-	/**
-	 * Method to configure available option accessors.
-	 *
-	 * @return  array
-	 *
-	 * @since   4.0.0
-	 */
-	protected static function getAccessors(): array
-	{
-		return array_merge(
-			parent::getAccessors(),
-			[
-				'width',
-				'height',
-				'url',
-				'onClose',
-			]
-		);
-	}
-}
diff --git a/libraries/src/Toolbar/Button/StandardButton.php b/libraries/src/Toolbar/Button/StandardButton.php
index 26681d60a9a06..c91189f2851e8 100644
--- a/libraries/src/Toolbar/Button/StandardButton.php
+++ b/libraries/src/Toolbar/Button/StandardButton.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Toolbar/ContainerAwareToolbarFactory.php b/libraries/src/Toolbar/ContainerAwareToolbarFactory.php
index ea2b780f110b3..1d9fbfc0d86e7 100644
--- a/libraries/src/Toolbar/ContainerAwareToolbarFactory.php
+++ b/libraries/src/Toolbar/ContainerAwareToolbarFactory.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Toolbar/CoreButtonsTrait.php b/libraries/src/Toolbar/CoreButtonsTrait.php
index b645aad494e34..782365c9cd12c 100644
--- a/libraries/src/Toolbar/CoreButtonsTrait.php
+++ b/libraries/src/Toolbar/CoreButtonsTrait.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Toolbar/Toolbar.php b/libraries/src/Toolbar/Toolbar.php
index 3e51db5661d4b..678c903c67c22 100644
--- a/libraries/src/Toolbar/Toolbar.php
+++ b/libraries/src/Toolbar/Toolbar.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Toolbar/ToolbarButton.php b/libraries/src/Toolbar/ToolbarButton.php
index fb9e23c0697a6..a90775b843a4f 100644
--- a/libraries/src/Toolbar/ToolbarButton.php
+++ b/libraries/src/Toolbar/ToolbarButton.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Toolbar/ToolbarFactoryInterface.php b/libraries/src/Toolbar/ToolbarFactoryInterface.php
index 93640c9266184..3b2fdbedf0a48 100644
--- a/libraries/src/Toolbar/ToolbarFactoryInterface.php
+++ b/libraries/src/Toolbar/ToolbarFactoryInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Toolbar/ToolbarHelper.php b/libraries/src/Toolbar/ToolbarHelper.php
index baa78fd6b880b..7a855f62e398f 100644
--- a/libraries/src/Toolbar/ToolbarHelper.php
+++ b/libraries/src/Toolbar/ToolbarHelper.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Administrator
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Tree/ImmutableNodeInterface.php b/libraries/src/Tree/ImmutableNodeInterface.php
index 4a2c296a89113..e3bbd57cf028c 100644
--- a/libraries/src/Tree/ImmutableNodeInterface.php
+++ b/libraries/src/Tree/ImmutableNodeInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,7 @@
 /**
  * Interface for an immutable node class
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 interface ImmutableNodeInterface
 {
@@ -24,7 +24,7 @@ interface ImmutableNodeInterface
 	 *
 	 * @return  NodeInterface[]  The children
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function &getChildren($recursive = false);
 
@@ -33,16 +33,16 @@ public function &getChildren($recursive = false);
 	 *
 	 * @return  NodeInterface|null
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getParent();
 
 	/**
 	 * Get the root of the tree
 	 * 
-	 * @return  NodeInterface
+	 * @return  ImmutableNodeInterface
 	 * 
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getRoot();
 
@@ -51,7 +51,7 @@ public function getRoot();
 	 *
 	 * @return  boolean  True if there is a child
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function hasChildren();
 
@@ -60,7 +60,7 @@ public function hasChildren();
 	 *
 	 * @return  boolean  True if there is a parent
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function hasParent();
 
@@ -71,7 +71,7 @@ public function hasParent();
 	 *
 	 * @return  NodeInterface|null  NodeInterface object of the sibling.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getSibling($right = true);
 }
diff --git a/libraries/src/Tree/ImmutableNodeTrait.php b/libraries/src/Tree/ImmutableNodeTrait.php
new file mode 100644
index 0000000000000..3dd7caeb9ef25
--- /dev/null
+++ b/libraries/src/Tree/ImmutableNodeTrait.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Tree;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Defines the trait for an Immutable Node Class.
+ *
+ * @since  4.0.0
+ */
+trait ImmutableNodeTrait
+{
+	/**
+	 * Parent node object
+	 *
+	 * @var    NodeInterface
+	 * @since  1.6
+	 */
+	protected $_parent = null;
+
+	/**
+	 * Array of Children
+	 *
+	 * @var    NodeInterface[]
+	 * @since  1.6
+	 */
+	protected $_children = array();
+
+	/**
+	 * Node left of this one
+	 *
+	 * @var    NodeInterface
+	 * @since  1.6
+	 */
+	protected $_leftSibling = null;
+
+	/**
+	 * Node right of this one
+	 *
+	 * @var    NodeInterface
+	 * @since  1.6
+	 */
+	protected $_rightSibling = null;
+
+	/**
+	 * Get the children of this node
+	 *
+	 * @param   boolean  $recursive  False by default
+	 *
+	 * @return  NodeInterface[]  The children
+	 *
+	 * @since   4.0.0
+	 */
+	public function &getChildren($recursive = false)
+	{
+		if ($recursive)
+		{
+			$items = array();
+
+			foreach ($this->_children as $child)
+			{
+				$items[] = $child;
+				$items = array_merge($items, $child->getChildren(true));
+			}
+
+			return $items;
+		}
+
+		return $this->_children;
+	}
+
+	/**
+	 * Get the parent of this node
+	 *
+	 * @return  NodeInterface|null
+	 *
+	 * @since   4.0.0
+	 */
+	public function getParent()
+	{
+		return $this->_parent;
+	}
+
+	/**
+	 * Get the root of the tree
+	 * 
+	 * @return  ImmutableNodeInterface
+	 * 
+	 * @since   4.0.0
+	 */
+	public function getRoot()
+	{
+		$root = $this->getParent();
+
+		if (!$root)
+		{
+			return $this;
+		}
+
+		while ($root->hasParent())
+		{
+			$root = $root->getParent();
+		}
+
+		return $root;
+	}
+
+	/**
+	 * Test if this node has children
+	 *
+	 * @return  boolean  True if there is a child
+	 *
+	 * @since   4.0.0
+	 */
+	public function hasChildren()
+	{
+		return (bool) count($this->_children);
+	}
+
+	/**
+	 * Test if this node has a parent
+	 *
+	 * @return  boolean  True if there is a parent
+	 *
+	 * @since   4.0.0
+	 */
+	public function hasParent()
+	{
+		return $this->getParent() != null;
+	}
+
+	/**
+	 * Returns the right or left sibling of a node
+	 *
+	 * @param   boolean  $right  If set to false, returns the left sibling
+	 *
+	 * @return  NodeInterface|null  NodeInterface object of the sibling.
+	 *
+	 * @since   4.0.0
+	 */
+	public function getSibling($right = true)
+	{
+		if ($right)
+		{
+			return $this->_rightSibling;
+		}
+		else
+		{
+			return $this->_leftSibling;
+		}
+	}
+}
diff --git a/libraries/src/Tree/NodeInterface.php b/libraries/src/Tree/NodeInterface.php
index aa29b51385eb9..d67f5b03d573f 100644
--- a/libraries/src/Tree/NodeInterface.php
+++ b/libraries/src/Tree/NodeInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,7 @@
 /**
  * Interface for a node class
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 interface NodeInterface extends ImmutableNodeInterface
 {
@@ -26,9 +26,9 @@ interface NodeInterface extends ImmutableNodeInterface
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
-	public function setParent($parent);
+	public function setParent(NodeInterface $parent);
 
 	/**
 	 * Add child to this node
@@ -39,20 +39,20 @@ public function setParent($parent);
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
-	public function addChild($child);
+	public function addChild(NodeInterface $child);
 
 	/**
 	 * Remove a specific child
 	 *
-	 * @param   integer  $id  ID of a node
+	 * @param   NodeInterface  $child  Child to remove
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
-	public function removeChild($id);
+	public function removeChild(NodeInterface $child);
 
 	/**
 	 * Function to set the left or right sibling of a node
@@ -62,7 +62,7 @@ public function removeChild($id);
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
-	public function setSibling($sibling, $right = true);
+	public function setSibling(NodeInterface $sibling, $right = true);
 }
diff --git a/libraries/src/Tree/NodeTrait.php b/libraries/src/Tree/NodeTrait.php
new file mode 100644
index 0000000000000..8d41972fbc317
--- /dev/null
+++ b/libraries/src/Tree/NodeTrait.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Tree;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Tree\ImmutableNodeTrait;
+use Joomla\CMS\Tree\NodeInterface;
+
+/**
+ * Defines the trait for a Node Interface Trait Class.
+ *
+ * @since  4.0.0
+ */
+trait NodeTrait
+{
+	use ImmutableNodeTrait;
+
+	/**
+	 * Set the parent of this node
+	 *
+	 * If the node already has a parent, the link is unset
+	 *
+	 * @param   NodeInterface|null  $parent  NodeInterface for the parent to be set or null
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function setParent(NodeInterface $parent)
+	{
+		if (!is_null($this->_parent))
+		{
+			$key = array_search($this, $this->_parent->_children);
+			unset($this->_parent->_children[$key]);
+		}
+
+		$this->_parent = $parent;
+
+		$this->_parent->_children[] = &$this;
+
+		if (count($this->_parent->_children) > 1)
+		{
+			end($this->_parent->_children);
+			$this->_leftSibling = prev($this->_parent->_children);
+			$this->_leftSibling->_rightSibling = $this;
+		}
+	}
+
+	/**
+	 * Add child to this node
+	 *
+	 * If the child already has a parent, the link is unset
+	 *
+	 * @param   NodeInterface  $child  The child to be added.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function addChild(NodeInterface $child)
+	{
+		$child->setParent($this);
+	}
+
+	/**
+	 * Remove a specific child
+	 *
+	 * @param   NodeInterface  $child  Child to remove
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function removeChild(NodeInterface $child)
+	{
+		$key = array_search($child, $this->_children);
+		unset($this->_children[$key]);
+	}
+
+	/**
+	 * Function to set the left or right sibling of a node
+	 *
+	 * @param   NodeInterface  $sibling  NodeInterface object for the sibling
+	 * @param   boolean        $right    If set to false, the sibling is the left one
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function setSibling(NodeInterface $sibling, $right = true)
+	{
+		if ($right)
+		{
+			$this->_rightSibling = $sibling;
+		}
+		else
+		{
+			$this->_leftSibling = $sibling;
+		}
+	}
+}
diff --git a/libraries/src/UCM/UCM.php b/libraries/src/UCM/UCM.php
index b16731bd01e30..3465b526236ac 100644
--- a/libraries/src/UCM/UCM.php
+++ b/libraries/src/UCM/UCM.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/UCM/UCMBase.php b/libraries/src/UCM/UCMBase.php
index 3fcc2eea53543..27e2a0adf29c7 100644
--- a/libraries/src/UCM/UCMBase.php
+++ b/libraries/src/UCM/UCMBase.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/UCM/UCMContent.php b/libraries/src/UCM/UCMContent.php
index fae600525e77e..e36544c1f6e6d 100644
--- a/libraries/src/UCM/UCMContent.php
+++ b/libraries/src/UCM/UCMContent.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/UCM/UCMType.php b/libraries/src/UCM/UCMType.php
index 4a382241ebd74..c4949c18c0575 100644
--- a/libraries/src/UCM/UCMType.php
+++ b/libraries/src/UCM/UCMType.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Updater/Adapter/CollectionAdapter.php b/libraries/src/Updater/Adapter/CollectionAdapter.php
index 0bf33ee5148e2..4224d692f61de 100644
--- a/libraries/src/Updater/Adapter/CollectionAdapter.php
+++ b/libraries/src/Updater/Adapter/CollectionAdapter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Updater/Adapter/ExtensionAdapter.php b/libraries/src/Updater/Adapter/ExtensionAdapter.php
index 6279d4478b359..bf9ba58a1930f 100644
--- a/libraries/src/Updater/Adapter/ExtensionAdapter.php
+++ b/libraries/src/Updater/Adapter/ExtensionAdapter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Updater/DownloadSource.php b/libraries/src/Updater/DownloadSource.php
index e6d94230daf7d..d33de32e10837 100644
--- a/libraries/src/Updater/DownloadSource.php
+++ b/libraries/src/Updater/DownloadSource.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Updater/Update.php b/libraries/src/Updater/Update.php
index ff0edf7f3b452..09a7d659c855d 100644
--- a/libraries/src/Updater/Update.php
+++ b/libraries/src/Updater/Update.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Updater/UpdateAdapter.php b/libraries/src/Updater/UpdateAdapter.php
index 1d0739870c320..bd88338d7714c 100644
--- a/libraries/src/Updater/UpdateAdapter.php
+++ b/libraries/src/Updater/UpdateAdapter.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -56,7 +56,7 @@ abstract class UpdateAdapter extends \JAdapterInstance
 	 * @var    array
 	 * @since  3.0.0
 	 */
-	protected $updatecols = array('NAME', 'ELEMENT', 'TYPE', 'FOLDER', 'CLIENT', 'VERSION', 'DESCRIPTION', 'INFOURL', 'EXTRA_QUERY');
+	protected $updatecols = array('NAME', 'ELEMENT', 'TYPE', 'FOLDER', 'CLIENT', 'VERSION', 'DESCRIPTION', 'INFOURL', 'CHANGELOGURL', 'EXTRA_QUERY');
 
 	/**
 	 * Should we try appending a .xml extension to the update site's URL?
diff --git a/libraries/src/Updater/Updater.php b/libraries/src/Updater/Updater.php
index fe8516e855ab0..0b30ea24fb52a 100644
--- a/libraries/src/Updater/Updater.php
+++ b/libraries/src/Updater/Updater.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Uri/Uri.php b/libraries/src/Uri/Uri.php
index 48cbcdc7544ee..71457e5502b5f 100644
--- a/libraries/src/Uri/Uri.php
+++ b/libraries/src/Uri/Uri.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/User/User.php b/libraries/src/User/User.php
index 451c1fe0820cc..1bf960ca93bab 100644
--- a/libraries/src/User/User.php
+++ b/libraries/src/User/User.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -142,7 +142,7 @@ class User extends CMSObject
 	/**
 	 * Guest status
 	 *
-	 * @var    boolean
+	 * @var    integer
 	 * @since  1.7.0
 	 */
 	public $guest = null;
@@ -251,18 +251,24 @@ public function __construct($identifier = 0)
 	 *
 	 * @return  User  The User object.
 	 *
-	 * @since   1.7.0
+	 * @since       1.7.0
+	 * @deprecated  5.0  Load the user service from the dependency injection container or via $app->getIdentity()
 	 */
 	public static function getInstance($identifier = 0)
 	{
+		@trigger_error(
+			sprintf(
+				'%1$s() is deprecated. Load the user from the dependency injection container or via %2$s::getApplication()->getIdentity().',
+				__METHOD__,
+				__CLASS__
+			),
+			E_USER_DEPRECATED
+		);
+
 		// Find the user id
 		if (!is_numeric($identifier))
 		{
-			if (!$id = UserHelper::getUserId($identifier))
-			{
-				// If the $identifier doesn't match with any id, just return an empty User.
-				return new static;
-			}
+			return Factory::getContainer()->get(UserFactoryInterface::class)->loadUserByUsername($identifier);
 		}
 		else
 		{
@@ -273,13 +279,13 @@ public static function getInstance($identifier = 0)
 		// Note: don't cache this user because it'll have a new ID on save!
 		if ($id === 0)
 		{
-			return new static;
+			return Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($id);
 		}
 
 		// Check if the user ID is already cached.
 		if (empty(self::$instances[$id]))
 		{
-			self::$instances[$id] = new static($id);
+			self::$instances[$id] = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($id);
 		}
 
 		return self::$instances[$id];
diff --git a/libraries/src/User/UserFactory.php b/libraries/src/User/UserFactory.php
new file mode 100644
index 0000000000000..6cb9014a3d880
--- /dev/null
+++ b/libraries/src/User/UserFactory.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\User;
+
+defined('_JEXEC') or die;
+
+use Joomla\Database\DatabaseInterface;
+
+/**
+ * Default factory for creating User objects
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class UserFactory implements UserFactoryInterface
+{
+	/**
+	 * The database.
+	 *
+	 * @var  DatabaseInterface
+	 */
+	private $db;
+
+	/**
+	 * UserFactory constructor.
+	 *
+	 * @param   DatabaseInterface  $db  The database
+	 */
+	public function __construct(DatabaseInterface $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Method to get an instance of a user for the given id.
+	 *
+	 * @param   int  $id  The id
+	 *
+	 * @return  User
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function loadUserById(int $id): User
+	{
+		return new User($id);
+	}
+
+	/**
+	 * Method to get an instance of a user for the given username.
+	 *
+	 * @param   string  $username  The username
+	 *
+	 * @return  User
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function loadUserByUsername(string $username): User
+	{
+		// Initialise some variables
+		$query = $this->db->getQuery(true)
+			->select($this->db->quoteName('id'))
+			->from($this->db->quoteName('#__users'))
+			->where($this->db->quoteName('username') . ' = ' . $this->db->quote($username));
+		$query->setLimit(1, 0);
+		$this->db->setQuery($query);
+
+		return $this->loadUserById((int) $this->db->loadResult());
+	}
+}
diff --git a/libraries/src/User/UserFactoryInterface.php b/libraries/src/User/UserFactoryInterface.php
new file mode 100644
index 0000000000000..c06f1b1a8c993
--- /dev/null
+++ b/libraries/src/User/UserFactoryInterface.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\User;
+
+defined('_JEXEC') or die;
+
+/**
+ * Interface defining a factory which can create User objects
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+interface UserFactoryInterface
+{
+	/**
+	 * Method to get an instance of a user for the given id.
+	 *
+	 * @param   int  $id  The id
+	 *
+	 * @return  User
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function loadUserById(int $id): User;
+
+	/**
+	 * Method to get an instance of a user for the given username.
+	 *
+	 * @param   string  $username  The username
+	 *
+	 * @return  User
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function loadUserByUsername(string $username): User;
+}
diff --git a/libraries/src/User/UserHelper.php b/libraries/src/User/UserHelper.php
index 3a3600cc9ace3..fce85c3132088 100644
--- a/libraries/src/User/UserHelper.php
+++ b/libraries/src/User/UserHelper.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -438,6 +438,7 @@ public static function verifyPassword($password, $hash, $user_id = 0)
 			/** @var PHPassHandler $handler */
 			$handler = $container->get(PHPassHandler::class);
 		}
+		// Check for Argon2id hashes
 		elseif (strpos($hash, '$argon2id') === 0)
 		{
 			/** @var Argon2idHandler $handler */
@@ -445,6 +446,7 @@ public static function verifyPassword($password, $hash, $user_id = 0)
 
 			$passwordAlgorithm = PASSWORD_ARGON2ID;
 		}
+		// Check for Argon2i hashes
 		elseif (strpos($hash, '$argon2i') === 0)
 		{
 			/** @var Argon2iHandler $handler */
diff --git a/libraries/src/Utility/BufferStreamHandler.php b/libraries/src/Utility/BufferStreamHandler.php
index c63b3db7ab9f0..05ece5f1c24e5 100644
--- a/libraries/src/Utility/BufferStreamHandler.php
+++ b/libraries/src/Utility/BufferStreamHandler.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Utility/Utility.php b/libraries/src/Utility/Utility.php
index 419d7591723df..2d1f92a493ecf 100644
--- a/libraries/src/Utility/Utility.php
+++ b/libraries/src/Utility/Utility.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Version.php b/libraries/src/Version.php
index 8490f0ee059c2..8498850e0f782 100644
--- a/libraries/src/Version.php
+++ b/libraries/src/Version.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -60,7 +60,7 @@ final class Version
 	 * @var    string
 	 * @since  3.8.0
 	 */
-	const EXTRA_VERSION = 'alpha7-dev';
+	const EXTRA_VERSION = 'alpha8-dev';
 
 	/**
 	 * Development status.
@@ -84,7 +84,7 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '27-December-2018';
+	const RELDATE = '9-March-2019';
 
 	/**
 	 * Release time.
@@ -92,7 +92,7 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '17:58';
+	const RELTIME = '13:41';
 
 	/**
 	 * Release timezone.
@@ -108,7 +108,7 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const COPYRIGHT = 'Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.';
+	const COPYRIGHT = 'Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.';
 
 	/**
 	 * Link text.
diff --git a/libraries/src/WebAsset/Exception/UnknownAssetException.php b/libraries/src/WebAsset/Exception/UnknownAssetException.php
index 7ee31bfc7725d..9ed29b62f4dfd 100644
--- a/libraries/src/WebAsset/Exception/UnknownAssetException.php
+++ b/libraries/src/WebAsset/Exception/UnknownAssetException.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,7 @@
 /**
  * Exception class defining an Unknown Asset
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 class UnknownAssetException extends \RuntimeException implements WebAssetExceptionInterface
 {
@@ -24,7 +24,7 @@ class UnknownAssetException extends \RuntimeException implements WebAssetExcepti
 	 * @param   int         $code       The Exception code.
 	 * @param   \Throwable  $previous   The previous throwable used for the exception chaining.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public function __construct(string $assetName, int $code = 0, \Throwable $previous = null)
 	{
diff --git a/libraries/src/WebAsset/Exception/UnsatisfiedDependencyException.php b/libraries/src/WebAsset/Exception/UnsatisfiedDependencyException.php
index efd658f9d149b..1a8fe8c1c34d6 100644
--- a/libraries/src/WebAsset/Exception/UnsatisfiedDependencyException.php
+++ b/libraries/src/WebAsset/Exception/UnsatisfiedDependencyException.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,7 @@
 /**
  * Exception class defining an Unsatisfied Dependency
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 class UnsatisfiedDependencyException extends \RuntimeException implements WebAssetExceptionInterface
 {
diff --git a/libraries/src/WebAsset/Exception/WebAssetExceptionInterface.php b/libraries/src/WebAsset/Exception/WebAssetExceptionInterface.php
index 989ba1812ccb0..89c7940091fcd 100644
--- a/libraries/src/WebAsset/Exception/WebAssetExceptionInterface.php
+++ b/libraries/src/WebAsset/Exception/WebAssetExceptionInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,7 @@
 /**
  * Exception interface defining a WebAsset error
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 interface WebAssetExceptionInterface
 {
diff --git a/libraries/src/WebAsset/WebAssetItem.php b/libraries/src/WebAsset/WebAssetItem.php
index d449e2fecdd55..3bae1ca429533 100644
--- a/libraries/src/WebAsset/WebAssetItem.php
+++ b/libraries/src/WebAsset/WebAssetItem.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/WebAsset/WebAssetItemInterface.php b/libraries/src/WebAsset/WebAssetItemInterface.php
index 75d19b72e0019..1aaf497ff4472 100644
--- a/libraries/src/WebAsset/WebAssetItemInterface.php
+++ b/libraries/src/WebAsset/WebAssetItemInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,7 @@
 /**
  * Web Asset Item interface
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 interface WebAssetItemInterface
 {
@@ -22,7 +22,7 @@ interface WebAssetItemInterface
 	 *
 	 * @return  string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getName(): string;
 
@@ -31,7 +31,7 @@ public function getName(): string;
 	 *
 	 * @return  string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getVersion();
 
@@ -40,7 +40,7 @@ public function getVersion();
 	 *
 	 * @return  array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getDependencies(): array;
 
@@ -52,7 +52,7 @@ public function getDependencies(): array;
 	 *
 	 * @return  self
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function setWeight(float $weight): self;
 
@@ -61,7 +61,7 @@ public function setWeight(float $weight): self;
 	 *
 	 * @return  float
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getWeight(): float;
 
@@ -72,7 +72,7 @@ public function getWeight(): float;
 	 *
 	 * @return array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getStylesheetFiles($resolvePath = true): array;
 
@@ -83,7 +83,7 @@ public function getStylesheetFiles($resolvePath = true): array;
 	 *
 	 * @return array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getScriptFiles($resolvePath = true): array;
 
diff --git a/libraries/src/WebAsset/WebAssetManager.php b/libraries/src/WebAsset/WebAssetManager.php
index e24f6b6df9cf1..f7494111852d3 100644
--- a/libraries/src/WebAsset/WebAssetManager.php
+++ b/libraries/src/WebAsset/WebAssetManager.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -19,7 +19,7 @@
 /**
  * Web Asset Manager class
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 class WebAssetManager implements WebAssetManagerInterface, DispatcherAwareInterface
 {
@@ -30,7 +30,7 @@ class WebAssetManager implements WebAssetManagerInterface, DispatcherAwareInterf
 	 *
 	 * @var    integer
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	const ASSET_STATE_INACTIVE = 0;
 
@@ -39,7 +39,7 @@ class WebAssetManager implements WebAssetManagerInterface, DispatcherAwareInterf
 	 *
 	 * @var    integer
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	const ASSET_STATE_ACTIVE = 1;
 
@@ -48,7 +48,7 @@ class WebAssetManager implements WebAssetManagerInterface, DispatcherAwareInterf
 	 *
 	 * @var    integer
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	const ASSET_STATE_DEPENDENCY = 2;
 
@@ -57,7 +57,7 @@ class WebAssetManager implements WebAssetManagerInterface, DispatcherAwareInterf
 	 *
 	 * @var    WebAssetRegistry
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $registry;
 
@@ -67,7 +67,7 @@ class WebAssetManager implements WebAssetManagerInterface, DispatcherAwareInterf
 	 *
 	 * @var    array
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $activeAssets = [];
 
@@ -76,7 +76,7 @@ class WebAssetManager implements WebAssetManagerInterface, DispatcherAwareInterf
 	 *
 	 * @var    bool
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $useVersioning = true;
 
@@ -85,7 +85,7 @@ class WebAssetManager implements WebAssetManagerInterface, DispatcherAwareInterf
 	 *
 	 * @param   WebAssetRegistry  $registry  The WebAsset Registry instance
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function __construct(WebAssetRegistry $registry)
 	{
@@ -97,7 +97,7 @@ public function __construct(WebAssetRegistry $registry)
 	 *
 	 * @return   WebAssetRegistry
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public function getRegistry(): WebAssetRegistry
 	{
@@ -111,7 +111,7 @@ public function getRegistry(): WebAssetRegistry
 	 *
 	 * @return self
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public function enableAsset(string $name): WebAssetManagerInterface
 	{
@@ -140,7 +140,7 @@ public function enableAsset(string $name): WebAssetManagerInterface
 	 *
 	 * @return self
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public function disableAsset(string $name): WebAssetManagerInterface
 	{
@@ -159,7 +159,7 @@ public function disableAsset(string $name): WebAssetManagerInterface
 	 *
 	 * @return  int
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public function getAssetState(string $name): int
 	{
@@ -181,7 +181,7 @@ public function getAssetState(string $name): int
 	 *
 	 * @return  bool
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public function isAssetActive(string $name): bool
 	{
@@ -195,7 +195,7 @@ public function isAssetActive(string $name): bool
 	 *
 	 * @return  WebAssetItem[]
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public function getAssets(bool $sort = false): array
 	{
@@ -221,7 +221,7 @@ public function getAssets(bool $sort = false): array
 	 *
 	 * @return  self
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected function enableDependencies(WebAssetItem $asset = null): self
 	{
@@ -265,7 +265,7 @@ function ($state){
 	 *
 	 * @return  self
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public function attachActiveAssetsToDocument(Document $doc): WebAssetManagerInterface
 	{
@@ -321,7 +321,7 @@ public function attachActiveAssetsToDocument(Document $doc): WebAssetManagerInte
 	 *
 	 * @return  WebAssetItem[]
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected function calculateOrderOfActiveAssets(): array
 	{
@@ -448,7 +448,7 @@ function ($el){
 	 *
 	 * @return  array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	protected function getConnectionsGraph (array $assets): array
 	{
@@ -488,7 +488,7 @@ protected function getConnectionsGraph (array $assets): array
 	 *
 	 * @throws  UnsatisfiedDependencyException When Dependency cannot be found
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	protected function getDependenciesForAsset(WebAssetItem $asset, $recursively = false, WebAssetItem $recursionRoot = null): array
 	{
@@ -531,7 +531,7 @@ protected function getDependenciesForAsset(WebAssetItem $asset, $recursively = f
 	 *
 	 * @return  self
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function useVersioning(bool $useVersioning): self
 	{
@@ -545,7 +545,7 @@ public function useVersioning(bool $useVersioning): self
 	 *
 	 * @return  array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function debugAssets(): array
 	{
diff --git a/libraries/src/WebAsset/WebAssetManagerInterface.php b/libraries/src/WebAsset/WebAssetManagerInterface.php
index 18e39a016d543..fc8ac2ceac98c 100644
--- a/libraries/src/WebAsset/WebAssetManagerInterface.php
+++ b/libraries/src/WebAsset/WebAssetManagerInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,7 @@
 /**
  * Web Asset Manager Interface
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 interface WebAssetManagerInterface
 {
@@ -26,7 +26,7 @@ interface WebAssetManagerInterface
 	 *
 	 * @return self
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public function enableAsset(string $name): self;
 
@@ -37,7 +37,7 @@ public function enableAsset(string $name): self;
 	 *
 	 * @return self
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public function disableAsset(string $name): self;
 
@@ -48,7 +48,7 @@ public function disableAsset(string $name): self;
 	 *
 	 * @return  bool
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public function isAssetActive(string $name): bool;
 
@@ -59,7 +59,7 @@ public function isAssetActive(string $name): bool;
 	 *
 	 * @return  WebAssetItemInterface[]
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public function getAssets(bool $sort = false): array;
 
@@ -70,7 +70,7 @@ public function getAssets(bool $sort = false): array;
 	 *
 	 * @return  self
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public function attachActiveAssetsToDocument(Document $doc): self;
 
diff --git a/libraries/src/WebAsset/WebAssetRegistry.php b/libraries/src/WebAsset/WebAssetRegistry.php
index 2f04c74979252..2bde3462085a3 100644
--- a/libraries/src/WebAsset/WebAssetRegistry.php
+++ b/libraries/src/WebAsset/WebAssetRegistry.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -149,7 +149,7 @@ public function remove(string $name): WebAssetRegistryInterface
 	 *
 	 * @return  bool
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function exists(string $name): bool
 	{
diff --git a/libraries/src/WebAsset/WebAssetRegistryInterface.php b/libraries/src/WebAsset/WebAssetRegistryInterface.php
index f97d15c371ef4..25c3538fcd0f5 100644
--- a/libraries/src/WebAsset/WebAssetRegistryInterface.php
+++ b/libraries/src/WebAsset/WebAssetRegistryInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,7 @@
 /**
  * Web Asset Registry interface
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 interface WebAssetRegistryInterface
 {
@@ -28,7 +28,7 @@ interface WebAssetRegistryInterface
 	 *
 	 * @throws  UnknownAssetException  When Asset cannot be found
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function get(string $name): WebAssetItemInterface;
 
@@ -39,7 +39,7 @@ public function get(string $name): WebAssetItemInterface;
 	 *
 	 * @return  self
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function add(WebAssetItemInterface $asset): self;
 
@@ -50,7 +50,7 @@ public function add(WebAssetItemInterface $asset): self;
 	 *
 	 * @return  self
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function remove(string $name): self;
 
@@ -61,7 +61,7 @@ public function remove(string $name): self;
 	 *
 	 * @return  bool
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function exists(string $name): bool;
 
diff --git a/libraries/src/Workflow/Workflow.php b/libraries/src/Workflow/Workflow.php
index 4009334da76c0..2e0fb2af2ec14 100644
--- a/libraries/src/Workflow/Workflow.php
+++ b/libraries/src/Workflow/Workflow.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Workflow/WorkflowServiceInterface.php b/libraries/src/Workflow/WorkflowServiceInterface.php
index 398b05a0cbd50..acfe5d90a3082 100644
--- a/libraries/src/Workflow/WorkflowServiceInterface.php
+++ b/libraries/src/Workflow/WorkflowServiceInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/src/Workflow/WorkflowServiceTrait.php b/libraries/src/Workflow/WorkflowServiceTrait.php
index 566ef1cea9357..d5e9c09b77471 100644
--- a/libraries/src/Workflow/WorkflowServiceTrait.php
+++ b/libraries/src/Workflow/WorkflowServiceTrait.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/modules/mod_articles_archive/Helper/ArticlesArchiveHelper.php b/modules/mod_articles_archive/Helper/ArticlesArchiveHelper.php
index 6bdbde659f727..62c4a2aabd0de 100644
--- a/modules/mod_articles_archive/Helper/ArticlesArchiveHelper.php
+++ b/modules/mod_articles_archive/Helper/ArticlesArchiveHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_archive
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_archive/mod_articles_archive.php b/modules/mod_articles_archive/mod_articles_archive.php
index e66a2b1b8d00e..fd1091c42b06c 100644
--- a/modules/mod_articles_archive/mod_articles_archive.php
+++ b/modules/mod_articles_archive/mod_articles_archive.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_archive
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_archive/mod_articles_archive.xml b/modules/mod_articles_archive/mod_articles_archive.xml
index a1f1a1bffa238..eaa1fd7a84571 100644
--- a/modules/mod_articles_archive/mod_articles_archive.xml
+++ b/modules/mod_articles_archive/mod_articles_archive.xml
@@ -3,7 +3,7 @@
 	<name>mod_articles_archive</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_articles_archive/tmpl/default.php b/modules/mod_articles_archive/tmpl/default.php
index de5d199d90a8c..68148ad1f829b 100644
--- a/modules/mod_articles_archive/tmpl/default.php
+++ b/modules/mod_articles_archive/tmpl/default.php
@@ -3,14 +3,14 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_archive
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 ?>
 <?php if (!empty($list)) : ?>
-	<ul class="mod-articlesarchive archive-module">
+	<ul class="mod-articlesarchive archive-module mod-list">
 	<?php foreach ($list as $item) : ?>
 	<li>
 		<a href="<?php echo $item->link; ?>">
diff --git a/modules/mod_articles_categories/Helper/ArticlesCategoriesHelper.php b/modules/mod_articles_categories/Helper/ArticlesCategoriesHelper.php
index 6db99ce6a2f7e..265040dcf30e8 100644
--- a/modules/mod_articles_categories/Helper/ArticlesCategoriesHelper.php
+++ b/modules/mod_articles_categories/Helper/ArticlesCategoriesHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_categories/mod_articles_categories.php b/modules/mod_articles_categories/mod_articles_categories.php
index 2463b4e6b5852..d46f3613c904f 100644
--- a/modules/mod_articles_categories/mod_articles_categories.php
+++ b/modules/mod_articles_categories/mod_articles_categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_categories/mod_articles_categories.xml b/modules/mod_articles_categories/mod_articles_categories.xml
index 2d5be96fa89f7..42d422787cdce 100644
--- a/modules/mod_articles_categories/mod_articles_categories.xml
+++ b/modules/mod_articles_categories/mod_articles_categories.xml
@@ -3,7 +3,7 @@
 	<name>mod_articles_categories</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2010</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_articles_categories/tmpl/default.php b/modules/mod_articles_categories/tmpl/default.php
index 1fbc022f6bdc7..74a4cc1615808 100644
--- a/modules/mod_articles_categories/tmpl/default.php
+++ b/modules/mod_articles_categories/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,6 +12,6 @@
 use Joomla\CMS\Helper\ModuleHelper;
 
 ?>
-<ul class="mod-articlescategories categories-module">
+<ul class="mod-articlescategories categories-module mod-list">
 <?php require ModuleHelper::getLayoutPath('mod_articles_categories', $params->get('layout', 'default') . '_items'); ?>
 </ul>
diff --git a/modules/mod_articles_categories/tmpl/default_items.php b/modules/mod_articles_categories/tmpl/default_items.php
index d0455cc32aea3..d74b9dc329a53 100644
--- a/modules/mod_articles_categories/tmpl/default_items.php
+++ b/modules/mod_articles_categories/tmpl/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_category/Helper/ArticlesCategoryHelper.php b/modules/mod_articles_category/Helper/ArticlesCategoryHelper.php
index 5aa6b9a2c53d9..1951cc86f2cdc 100644
--- a/modules/mod_articles_category/Helper/ArticlesCategoryHelper.php
+++ b/modules/mod_articles_category/Helper/ArticlesCategoryHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_category
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -55,9 +55,7 @@ public static function getList(&$params)
 		$articles->setState('list.start', 0);
 		$articles->setState('list.limit', (int) $params->get('count', 0));
 		$articles->setState('filter.published', 1);
-
-		// This module does not use tags data
-		$articles->setState('load_tags', $params->get('filter_tag', '') !== '' ? true : false);
+		$articles->setState('load_tags', $params->get('show_tags', 0) || $params->get('article_grouping', 'none') === 'tags');
 
 		// Access filter
 		$access     = !ComponentHelper::getParams('com_content')->get('show_noauth');
@@ -443,12 +441,13 @@ public static function groupBy($list, $fieldName, $article_grouping_direction, $
 	 * @param   string  $article_grouping_direction  ordering direction
 	 * @param   string  $type                        type of grouping
 	 * @param   string  $month_year_format           date format to use
+	 * @param   string  $field                       date field to group by
 	 *
 	 * @return  array
 	 *
 	 * @since   1.6
 	 */
-	public static function groupByDate($list, $article_grouping_direction, $type = 'year', $month_year_format = 'F Y')
+	public static function groupByDate($list, $article_grouping_direction = 'ksort', $type = 'year', $month_year_format = 'F Y', $field = 'created')
 	{
 		$grouped = array();
 
@@ -467,7 +466,7 @@ public static function groupByDate($list, $article_grouping_direction, $type = '
 			switch ($type)
 			{
 				case 'month_year' :
-					$month_year = StringHelper::substr($item->created, 0, 7);
+					$month_year = StringHelper::substr($item->$field, 0, 7);
 
 					if (!isset($grouped[$month_year]))
 					{
@@ -479,7 +478,7 @@ public static function groupByDate($list, $article_grouping_direction, $type = '
 
 				case 'year' :
 				default:
-					$year = StringHelper::substr($item->created, 0, 4);
+					$year = StringHelper::substr($item->$field, 0, 4);
 
 					if (!isset($grouped[$year]))
 					{
@@ -509,4 +508,49 @@ public static function groupByDate($list, $article_grouping_direction, $type = '
 
 		return $grouped;
 	}
+
+	/**
+	 * Groups items by tags
+	 *
+	 * @param   array   $list       list of items
+	 * @param   string  $direction  ordering direction
+	 *
+	 * @return  array
+	 *
+	 * @since   3.9.0
+	 */
+	public static function groupByTags($list, $direction = 'ksort')
+	{
+		$grouped  = array();
+		$untagged = array();
+
+		if (!$list)
+		{
+			return $grouped;
+		}
+
+		foreach ($list as $item)
+		{
+			if ($item->tags->itemTags)
+			{
+				foreach ($item->tags->itemTags as $tag)
+				{
+					$grouped[$tag->title][] = $item;
+				}
+			}
+			else
+			{
+				$untagged[] = $item;
+			}
+		}
+
+		$direction($grouped);
+
+		if ($untagged)
+		{
+			$grouped['MOD_ARTICLES_CATEGORY_UNTAGGED'] = $untagged;
+		}
+
+		return $grouped;
+	}
 }
diff --git a/modules/mod_articles_category/mod_articles_category.php b/modules/mod_articles_category/mod_articles_category.php
index 28e30003301a1..711bc9b90599c 100644
--- a/modules/mod_articles_category/mod_articles_category.php
+++ b/modules/mod_articles_category/mod_articles_category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_category
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -66,7 +66,6 @@
 	$grouped                    = false;
 	$article_grouping           = $params->get('article_grouping', 'none');
 	$article_grouping_direction = $params->get('article_grouping_direction', 'ksort');
-	$item_heading               = $params->get('item_heading');
 
 	if ($article_grouping !== 'none')
 	{
@@ -76,12 +75,21 @@
 		{
 			case 'year' :
 			case 'month_year' :
-				$list = ArticlesCategoryHelper::groupByDate($list, $article_grouping_direction, $article_grouping, $params->get('month_year_format', 'F Y'));
+				$list = ArticlesCategoryHelper::groupByDate(
+					$list,
+					$article_grouping_direction,
+					$article_grouping,
+					$params->get('month_year_format', 'F Y'),
+					$params->get('date_grouping_field', 'created')
+				);
 				break;
 			case 'author' :
 			case 'category_title' :
 				$list = ArticlesCategoryHelper::groupBy($list, $article_grouping, $article_grouping_direction);
 				break;
+			case 'tags' :
+				$list = ModArticlesCategoryHelper::groupByTags($list, $article_grouping_direction);
+				break;
 			default:
 				break;
 		}
diff --git a/modules/mod_articles_category/mod_articles_category.xml b/modules/mod_articles_category/mod_articles_category.xml
index b09b03e976877..7b809ac28683c 100644
--- a/modules/mod_articles_category/mod_articles_category.xml
+++ b/modules/mod_articles_category/mod_articles_category.xml
@@ -3,7 +3,7 @@
 	<name>mod_articles_category</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2010</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
@@ -33,12 +33,6 @@
 					<option value="normal">MOD_ARTICLES_CATEGORY_OPTION_NORMAL_VALUE</option>
 					<option value="dynamic">MOD_ARTICLES_CATEGORY_OPTION_DYNAMIC_VALUE</option>
 				</field>
-			</fieldset>
-
-			<fieldset
-				name="dynamic"
-				label="MOD_ARTICLES_CATEGORY_FIELD_GROUP_DYNAMIC_LABEL"
-			>
 
 				<field
 					name="show_on_article_page"
@@ -48,6 +42,7 @@
 					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWONARTICLEPAGE_DESC"
 					default="1"
 					filter="integer"
+					showon="mode:dynamic"
 					>
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
@@ -125,6 +120,7 @@
 					label="MOD_ARTICLES_CATEGORY_FIELD_CATDEPTH_LABEL"
 					default="1"
 					filter="integer"
+					showon="show_child_category_articles:1"
 				/>
 
 				<field
@@ -236,6 +232,7 @@
 					type="list"
 					label="MOD_ARTICLES_CATEGORY_FIELD_DATERANGEFIELD_LABEL"
 					default="a.created"
+					showon="date_filtering!:off"
 					>
 					<option value="a.created">MOD_ARTICLES_CATEGORY_OPTION_CREATED_VALUE</option>
 					<option value="a.modified">MOD_ARTICLES_CATEGORY_OPTION_MODIFIED_VALUE</option>
@@ -250,6 +247,7 @@
 					showtime="true"
 					size="22"
 					filter="user_utc"
+					showon="date_filtering:range"
 				/>
 
 				<field
@@ -260,6 +258,7 @@
 					showtime="true"
 					size="22"
 					filter="user_utc"
+					showon="date_filtering:range"
 				/>
 
 				<field
@@ -268,6 +267,7 @@
 					label="MOD_ARTICLES_CATEGORY_FIELD_RELATIVEDATE_LABEL"
 					default="30"
 					filter="integer"
+					showon="date_filtering:relative"
 				/>
 
 			</fieldset>
@@ -325,16 +325,20 @@
 					<option value="month_year">MOD_ARTICLES_CATEGORY_OPTION_MONTHYEAR_VALUE</option>
 					<option value="author">JAUTHOR</option>
 					<option value="category_title">JCATEGORY</option>
+					<option value="tags">JTAG</option>
 				</field>
 
 				<field
-					name="article_grouping_direction"
+					name="date_grouping_field"
 					type="list"
-					label="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPINGDIR_LABEL"
-					default="ksort"
+					label="MOD_ARTICLES_CATEGORY_FIELD_DATEGROUPINGFIELD_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_DATEGROUPINGFIELD_DESC"
+					default="created"
+					showon="article_grouping:year,month_year"
 					>
-					<option value="krsort">MOD_ARTICLES_CATEGORY_OPTION_DESCENDING_VALUE</option>
-					<option value="ksort">MOD_ARTICLES_CATEGORY_OPTION_ASCENDING_VALUE</option>
+					<option value="created">MOD_ARTICLES_CATEGORY_OPTION_CREATED_VALUE</option>
+					<option value="modified">MOD_ARTICLES_CATEGORY_OPTION_MODIFIED_VALUE</option>
+					<option value="publish_up">MOD_ARTICLES_CATEGORY_OPTION_STARTPUBLISHING_VALUE</option>
 				</field>
 
 				<field
@@ -343,7 +347,20 @@
 					label="MOD_ARTICLES_CATEGORY_FIELD_MONTHYEARFORMAT_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_MONTHYEARFORMAT_DESC"
 					default="F Y"
+					showon="article_grouping:year,month_year"
 				/>
+
+				<field
+					name="article_grouping_direction"
+					type="list"
+					label="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPINGDIR_LABEL"
+					default="ksort"
+					showon="article_grouping!:none"
+					>
+					<option value="krsort">MOD_ARTICLES_CATEGORY_OPTION_DESCENDING_VALUE</option>
+					<option value="ksort">MOD_ARTICLES_CATEGORY_OPTION_ASCENDING_VALUE</option>
+				</field>
+
 			</fieldset>
 
 			<fieldset
@@ -380,6 +397,7 @@
 					type="list"
 					label="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELD_LABEL"
 					default="created"
+					showon="show_date:1"
 					>
 					<option value="created">MOD_ARTICLES_CATEGORY_OPTION_CREATED_VALUE</option>
 					<option value="modified">MOD_ARTICLES_CATEGORY_OPTION_MODIFIED_VALUE</option>
@@ -392,6 +410,7 @@
 					label="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELDFORMAT_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELDFORMAT_DESC"
 					default="Y-m-d H:i:s"
+					showon="show_date:1"
 				/>
 
 				<field
@@ -430,6 +449,19 @@
 					<option value="1">JSHOW</option>
 				</field>
 
+				<field
+					name="show_tags"
+					type="radio"
+					label="JTAG"
+					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWTAGS_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
 				<field
 					name="show_introtext"
 					type="radio"
@@ -448,6 +480,7 @@
 					label="MOD_ARTICLES_CATEGORY_FIELD_INTROTEXTLIMIT_LABEL"
 					default="100"
 					filter="integer"
+					showon="show_introtext:1"
 				/>
 
 				<field
@@ -469,6 +502,7 @@
 					label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
 					default="1"
 					filter="integer"
+					showon="show_readmore:1"
 					>
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
@@ -480,6 +514,7 @@
 					label="JGLOBAL_SHOW_READMORE_LIMIT_LABEL"
 					default="15"
 					filter="integer"
+					showon="show_readmore:1[AND]show_readmore_title:1"
 				/>
 
 			</fieldset>
diff --git a/modules/mod_articles_category/tmpl/default.php b/modules/mod_articles_category/tmpl/default.php
index 5312761f92df2..c16881a0ddae7 100644
--- a/modules/mod_articles_category/tmpl/default.php
+++ b/modules/mod_articles_category/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_category
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,11 +13,11 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<ul class="mod-articlescategory category-module">
+<ul class="mod-articlescategory category-module mod-list">
 	<?php if ($grouped) : ?>
 		<?php foreach ($list as $group_name => $group) : ?>
 		<li>
-			<div class="mod-articles-category-group"><?php echo $group_name; ?></div>
+			<div class="mod-articles-category-group"><?php echo JText::_($group_name); ?></div>
 			<ul>
 				<?php foreach ($group as $item) : ?>
 					<li>
@@ -51,6 +51,12 @@
 							<span class="mod-articles-category-date"><?php echo $item->displayDate; ?></span>
 						<?php endif; ?>
 
+						<?php if ($params->get('show_tags', 0) && $item->tags->itemTags) : ?>
+							<div class="mod-articles-category-tags">
+								<?php echo JLayoutHelper::render('joomla.content.tags', $item->tags->itemTags); ?>
+							</div>
+						<?php endif; ?>
+
 						<?php if ($params->get('show_introtext')) : ?>
 							<p class="mod-articles-category-introtext">
 								<?php echo $item->displayIntrotext; ?>
@@ -115,6 +121,12 @@
 					</span>
 				<?php endif; ?>
 
+				<?php if ($params->get('show_tags', 0) && $item->tags->itemTags) : ?>
+					<div class="mod-articles-category-tags">
+						<?php echo JLayoutHelper::render('joomla.content.tags', $item->tags->itemTags); ?>
+					</div>
+				<?php endif; ?>
+
 				<?php if ($params->get('show_introtext')) : ?>
 					<p class="mod-articles-category-introtext">
 						<?php echo $item->displayIntrotext; ?>
diff --git a/modules/mod_articles_latest/Helper/ArticlesLatestHelper.php b/modules/mod_articles_latest/Helper/ArticlesLatestHelper.php
index 6ad51449ebac7..a8855f1e7a1c1 100644
--- a/modules/mod_articles_latest/Helper/ArticlesLatestHelper.php
+++ b/modules/mod_articles_latest/Helper/ArticlesLatestHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_latest
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -78,6 +78,10 @@ public static function getList(Registry $params, ArticlesModel $model)
 				$model->setState('filter.author_id.include', false);
 				break;
 
+			case 'created_by' :
+				$model->setState('filter.author_id', $params->get('author', array()));
+				break;
+
 			case '0' :
 				break;
 
@@ -89,18 +93,20 @@ public static function getList(Registry $params, ArticlesModel $model)
 		// Filter by language
 		$model->setState('filter.language', $app->getLanguageFilter());
 
-		//  Featured switch
-		switch ($params->get('show_featured'))
+		// Featured switch
+		$featured = $params->get('show_featured', '');
+
+		if ($featured === '')
 		{
-			case 1 :
-				$model->setState('filter.featured', 'only');
-				break;
-			case 0 :
-				$model->setState('filter.featured', 'hide');
-				break;
-			default :
-				$model->setState('filter.featured', 'show');
-				break;
+			$model->setState('filter.featured', 'show');
+		}
+		elseif ($featured)
+		{
+			$model->setState('filter.featured', 'only');
+		}
+		else
+		{
+			$model->setState('filter.featured', 'hide');
 		}
 
 		// Set ordering
diff --git a/modules/mod_articles_latest/mod_articles_latest.php b/modules/mod_articles_latest/mod_articles_latest.php
index 4a5919c7b7960..76c54c1cde29d 100644
--- a/modules/mod_articles_latest/mod_articles_latest.php
+++ b/modules/mod_articles_latest/mod_articles_latest.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_latest
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_latest/mod_articles_latest.xml b/modules/mod_articles_latest/mod_articles_latest.xml
index 1922ec10314f0..fa80b0e650348 100644
--- a/modules/mod_articles_latest/mod_articles_latest.xml
+++ b/modules/mod_articles_latest/mod_articles_latest.xml
@@ -3,7 +3,7 @@
 	<name>mod_articles_latest</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
@@ -56,7 +56,7 @@
 					name="ordering"
 					type="list"
 					label="MOD_LATEST_NEWS_FIELD_ORDERING_LABEL"
-					default="published"
+					default="p_dsc"
 					>
 					<option value="c_dsc">MOD_LATEST_NEWS_VALUE_RECENT_ADDED</option>
 					<option value="m_dsc">MOD_LATEST_NEWS_VALUE_RECENT_MODIFIED</option>
@@ -74,7 +74,17 @@
 					<option value="0">MOD_LATEST_NEWS_VALUE_ANYONE</option>
 					<option value="by_me">MOD_LATEST_NEWS_VALUE_ADDED_BY_ME</option>
 					<option value="not_me">MOD_LATEST_NEWS_VALUE_NOTADDED_BY_ME</option>
+					<option value="created_by">MOD_LATEST_NEWS_VALUE_CREATED_BY</option>
 				</field>
+
+				<field
+					name="author"
+					type="author"
+					label="MOD_LATEST_NEWS_FIELD_AUTHOR_LABEL"
+					description="MOD_LATEST_NEWS_FIELD_AUTHOR_DESC"
+					multiple="true"
+					showon="user_id:created_by"
+				/>
 			</fieldset>
 
 			<fieldset name="advanced">
diff --git a/modules/mod_articles_latest/tmpl/default.php b/modules/mod_articles_latest/tmpl/default.php
index ec82df5dbb0ca..bdf849f289a3a 100644
--- a/modules/mod_articles_latest/tmpl/default.php
+++ b/modules/mod_articles_latest/tmpl/default.php
@@ -3,13 +3,13 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_latest
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 ?>
-<ul class="mod-articleslatest latestnews">
+<ul class="mod-articleslatest latestnews mod-list">
 <?php foreach ($list as $item) : ?>
 	<li itemscope itemtype="https://schema.org/Article">
 		<a href="<?php echo $item->link; ?>" itemprop="url">
diff --git a/modules/mod_articles_news/Helper/ArticlesNewsHelper.php b/modules/mod_articles_news/Helper/ArticlesNewsHelper.php
index af62a1d98d4b1..7ee4de119fa0e 100644
--- a/modules/mod_articles_news/Helper/ArticlesNewsHelper.php
+++ b/modules/mod_articles_news/Helper/ArticlesNewsHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_news
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -71,18 +71,20 @@ public static function getList(&$params)
 		// Filer by tag
 		$model->setState('filter.tag', $params->get('tag', array()));
 
-		//  Featured switch
-		switch ($params->get('show_featured'))
+		// Featured switch
+		$featured = $params->get('show_featured', '');
+
+		if ($featured === '')
+		{
+			$model->setState('filter.featured', 'show');
+		}
+		elseif ($featured)
 		{
-			case 1 :
-				$model->setState('filter.featured', 'only');
-				break;
-			case 0 :
-				$model->setState('filter.featured', 'hide');
-				break;
-			default :
-				$model->setState('filter.featured', 'show');
-				break;
+			$model->setState('filter.featured', 'only');
+		}
+		else
+		{
+			$model->setState('filter.featured', 'hide');
 		}
 
 		// Set ordering
@@ -126,11 +128,42 @@ public static function getList(&$params)
 
 			$item->introtext = HTMLHelper::_('content.prepare', $item->introtext, '', 'mod_articles_news.content');
 
+			// Remove any images belongs to the text
 			if (!$params->get('image'))
 			{
 				$item->introtext = preg_replace('/<img[^>]*>/', '', $item->introtext);
 			}
 
+			// Show the Intro/Full image field of the article
+			if ($params->get('img_intro_full') !== 'none')
+			{
+				$images = json_decode($item->images);
+				$item->imageSrc = '';
+				$item->imageAlt = '';
+				$item->imageCaption = '';
+
+				if ($params->get('img_intro_full') === 'intro' && !empty($images->image_intro))
+				{
+					$item->imageSrc = htmlspecialchars($images->image_intro, ENT_COMPAT, 'UTF-8');
+					$item->imageAlt = htmlspecialchars($images->image_intro_alt, ENT_COMPAT, 'UTF-8');
+
+					if ($images->image_intro_caption) 
+					{
+						$item->imageCaption = htmlspecialchars($images->image_intro_caption, ENT_COMPAT, 'UTF-8');
+					}
+				}
+				elseif ($params->get('img_intro_full') === 'full' && !empty($images->image_fulltext))
+				{
+					$item->imageSrc = htmlspecialchars($images->image_fulltext, ENT_COMPAT, 'UTF-8');
+					$item->imageAlt = htmlspecialchars($images->image_fulltext_alt, ENT_COMPAT, 'UTF-8');
+
+					if ($images->image_intro_caption) 
+					{
+						$item->imageCaption = htmlspecialchars($images->image_fulltext_caption, ENT_COMPAT, 'UTF-8');
+					}
+				}
+			}
+
 			if ($triggerEvents)
 			{
 				$item->text = '';
diff --git a/modules/mod_articles_news/mod_articles_news.php b/modules/mod_articles_news/mod_articles_news.php
index 44049ddf06b18..4eeff02edf02e 100644
--- a/modules/mod_articles_news/mod_articles_news.php
+++ b/modules/mod_articles_news/mod_articles_news.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_news
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_news/mod_articles_news.xml b/modules/mod_articles_news/mod_articles_news.xml
index 29a840433e2c1..1b42298a42965 100644
--- a/modules/mod_articles_news/mod_articles_news.xml
+++ b/modules/mod_articles_news/mod_articles_news.xml
@@ -3,7 +3,7 @@
 	<name>mod_articles_news</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
@@ -37,7 +37,6 @@
 					name="tag"
 					type="tag"
 					label="JTAG"
-					description="JTAG_DESC"
 					mode="nested"
 					multiple="true"
 					filter="int_array"
@@ -49,6 +48,7 @@
 					type="radio"
 					class="switcher"
 					label="MOD_ARTICLES_NEWS_FIELD_IMAGES_LABEL"
+					description="MOD_ARTICLES_NEWS_FIELD_IMAGES_DESC"
 					default="0"
 					filter="integer"
 					>
@@ -56,6 +56,17 @@
 					<option value="1">JSHOW</option>
 				</field>
 
+				<field
+					name="img_intro_full"
+					type="list"
+					label="MOD_ARTICLES_NEWS_FIELD_IMAGES_ARTICLE_LABEL"
+					default="none"
+					>
+					<option value="intro">MOD_ARTICLES_NEWS_OPTION_INTROIMAGE</option> 
+					<option value="full">MOD_ARTICLES_NEWS_OPTION_FULLIMAGE</option>
+					<option value="none">JNO</option>
+				</field>
+
 				<field
 					name="item_title"
 					type="radio"
diff --git a/modules/mod_articles_news/tmpl/_item.php b/modules/mod_articles_news/tmpl/_item.php
index a72fafb37d876..0c5f76ff75958 100644
--- a/modules/mod_articles_news/tmpl/_item.php
+++ b/modules/mod_articles_news/tmpl/_item.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_news
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -23,6 +23,17 @@
 	</<?php echo $item_heading; ?>>
 <?php endif; ?>
 
+<?php if ($params->get('img_intro_full') !== 'none' && !empty($item->imageSrc)) : ?>	
+	<figure class="newsflash-image">
+		<img src="<?php echo $item->imageSrc; ?>" alt="<?php echo $item->imageAlt; ?>">
+		<?php if (!empty($item->imageCaption)) : ?>
+			<figcaption>
+				<?php echo $item->imageCaption; ?>
+			</figcaption>
+		<?php endif; ?>
+	</figure>
+<?php endif; ?>
+
 <?php if (!$params->get('intro_only')) : ?>
 	<?php echo $item->afterDisplayTitle; ?>
 <?php endif; ?>
diff --git a/modules/mod_articles_news/tmpl/default.php b/modules/mod_articles_news/tmpl/default.php
index e65e27dd4bb6d..932f3df5b86ec 100644
--- a/modules/mod_articles_news/tmpl/default.php
+++ b/modules/mod_articles_news/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_news
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_news/tmpl/horizontal.php b/modules/mod_articles_news/tmpl/horizontal.php
index aaeb984fbce9d..6b5cd2a3a7160 100644
--- a/modules/mod_articles_news/tmpl/horizontal.php
+++ b/modules/mod_articles_news/tmpl/horizontal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_news
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,7 +12,7 @@
 use Joomla\CMS\Helper\ModuleHelper;
 
 ?>
-<ul class="mod-articlesnews-horizontal newsflash-horiz">
+<ul class="mod-articlesnews-horizontal newsflash-horiz mod-list">
 	<?php for ($i = 0, $n = count($list); $i < $n; $i ++) : ?>
 		<?php $item = $list[$i]; ?>
 		<li>
diff --git a/modules/mod_articles_news/tmpl/vertical.php b/modules/mod_articles_news/tmpl/vertical.php
index 52f6bab465174..62d66813d7f06 100644
--- a/modules/mod_articles_news/tmpl/vertical.php
+++ b/modules/mod_articles_news/tmpl/vertical.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_news
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,7 +12,7 @@
 use Joomla\CMS\Helper\ModuleHelper;
 
 ?>
-<ul class="mod-articlesnews-vertical newsflash-vert">
+<ul class="mod-articlesnews-vertical newsflash-vert mod-list">
 	<?php for ($i = 0, $n = count($list); $i < $n; $i ++) : ?>
 		<?php $item = $list[$i]; ?>
 		<li class="newsflash-item">
diff --git a/modules/mod_articles_popular/Helper/ArticlesPopularHelper.php b/modules/mod_articles_popular/Helper/ArticlesPopularHelper.php
index 49c4f04c16dfb..2db9f1efd2ea6 100644
--- a/modules/mod_articles_popular/Helper/ArticlesPopularHelper.php
+++ b/modules/mod_articles_popular/Helper/ArticlesPopularHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_popular
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_popular/mod_articles_popular.php b/modules/mod_articles_popular/mod_articles_popular.php
index e81bf1884ead3..4ff6569148193 100644
--- a/modules/mod_articles_popular/mod_articles_popular.php
+++ b/modules/mod_articles_popular/mod_articles_popular.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_popular
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_popular/mod_articles_popular.xml b/modules/mod_articles_popular/mod_articles_popular.xml
index 0a9fcd266dd17..935c0c2bfc66d 100644
--- a/modules/mod_articles_popular/mod_articles_popular.xml
+++ b/modules/mod_articles_popular/mod_articles_popular.xml
@@ -3,7 +3,7 @@
 	<name>mod_articles_popular</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_articles_popular/tmpl/default.php b/modules/mod_articles_popular/tmpl/default.php
index f9c89afbc0fdf..35f0d21fce3ff 100644
--- a/modules/mod_articles_popular/tmpl/default.php
+++ b/modules/mod_articles_popular/tmpl/default.php
@@ -3,13 +3,13 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_popular
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 ?>
-<ul class="mostread">
+<ul class="mostread mod-list">
 <?php foreach ($list as $item) : ?>
 	<li itemscope itemtype="https://schema.org/Article">
 		<a href="<?php echo $item->link; ?>" itemprop="url">
diff --git a/modules/mod_banners/Helper/ModBannersHelper.php b/modules/mod_banners/Helper/ModBannersHelper.php
index 71675dae38357..370a9013e8747 100644
--- a/modules/mod_banners/Helper/ModBannersHelper.php
+++ b/modules/mod_banners/Helper/ModBannersHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_banners/mod_banners.php b/modules/mod_banners/mod_banners.php
index f3183db4e8875..9fac7db2be5c5 100644
--- a/modules/mod_banners/mod_banners.php
+++ b/modules/mod_banners/mod_banners.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_banners/mod_banners.xml b/modules/mod_banners/mod_banners.xml
index 4d9041fd86465..94351135bd202 100644
--- a/modules/mod_banners/mod_banners.xml
+++ b/modules/mod_banners/mod_banners.xml
@@ -3,7 +3,7 @@
 	<name>mod_banners</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_banners/tmpl/default.php b/modules/mod_banners/tmpl/default.php
index ec0f8f3e6c219..c215123cf0d54 100644
--- a/modules/mod_banners/tmpl/default.php
+++ b/modules/mod_banners/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_banners
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_breadcrumbs/Helper/BreadcrumbsHelper.php b/modules/mod_breadcrumbs/Helper/BreadcrumbsHelper.php
index e7279eb2fe4c8..1a46219af3cf9 100644
--- a/modules/mod_breadcrumbs/Helper/BreadcrumbsHelper.php
+++ b/modules/mod_breadcrumbs/Helper/BreadcrumbsHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_breadcrumbs
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_breadcrumbs/mod_breadcrumbs.php b/modules/mod_breadcrumbs/mod_breadcrumbs.php
index 642ac57b8ba1d..f45b62c4150b4 100644
--- a/modules/mod_breadcrumbs/mod_breadcrumbs.php
+++ b/modules/mod_breadcrumbs/mod_breadcrumbs.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_breadcrumbs
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_breadcrumbs/mod_breadcrumbs.xml b/modules/mod_breadcrumbs/mod_breadcrumbs.xml
index 3034f8780a30f..1f9df7bcda812 100644
--- a/modules/mod_breadcrumbs/mod_breadcrumbs.xml
+++ b/modules/mod_breadcrumbs/mod_breadcrumbs.xml
@@ -3,7 +3,7 @@
 	<name>mod_breadcrumbs</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index 0d38204073685..85f0c899c5e22 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_breadcrumbs
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,55 +12,56 @@
 use Joomla\CMS\Language\Text;
 
 ?>
+<nav role="navigation" aria-label="<?php echo $module->name; ?>">
+	<ol itemscope itemtype="https://schema.org/BreadcrumbList" class="mod-breadcrumbs breadcrumb">
+		<?php if ($params->get('showHere', 1)) : ?>
+			<li class="mod-breadcrumbs__here float-left">
+				<?php echo Text::_('MOD_BREADCRUMBS_HERE'); ?>&#160;
+			</li>
+		<?php else : ?>
+			<li class="mod-breadcrumbs__divider float-left">
+				<span class="divider fa fa-location" aria-hidden="true"></span>
+			</li>
+		<?php endif; ?>
 
-<ol itemscope itemtype="https://schema.org/BreadcrumbList" class="mod-breadcrumbs breadcrumb">
-	<?php if ($params->get('showHere', 1)) : ?>
-		<li class="mod-breadcrumbs__here float-left">
-			<?php echo Text::_('MOD_BREADCRUMBS_HERE'); ?>&#160;
-		</li>
-	<?php else : ?>
-		<li class="mod-breadcrumbs__divider float-left">
-			<span class="divider fa fa-location" aria-hidden="true"></span>
-		</li>
-	<?php endif; ?>
-
-	<?php
-	// Get rid of duplicated entries on trail including home page when using multilanguage
-	for ($i = 0; $i < $count; $i++)
-	{
-		if ($i === 1 && !empty($list[$i]->link) && !empty($list[$i - 1]->link) && $list[$i]->link === $list[$i - 1]->link)
+		<?php
+		// Get rid of duplicated entries on trail including home page when using multilanguage
+		for ($i = 0; $i < $count; $i++)
 		{
-			unset($list[$i]);
+			if ($i === 1 && !empty($list[$i]->link) && !empty($list[$i - 1]->link) && $list[$i]->link === $list[$i - 1]->link)
+			{
+				unset($list[$i]);
+			}
 		}
-	}
 
-	// Find last and penultimate items in breadcrumbs list
-	end($list);
-	$last_item_key   = key($list);
-	prev($list);
-	$penult_item_key = key($list);
+		// Find last and penultimate items in breadcrumbs list
+		end($list);
+		$last_item_key   = key($list);
+		prev($list);
+		$penult_item_key = key($list);
 
-	// Make a link if not the last item in the breadcrumbs
-	$show_last = $params->get('showLast', 1);
+		// Make a link if not the last item in the breadcrumbs
+		$show_last = $params->get('showLast', 1);
 
-	// Generate the trail
-	foreach ($list as $key => $item) :
-		if ($key !== $last_item_key) :
-			if (!empty($item->link)) :
-				$breadcrumbItem = '<a itemprop="item" href="' . $item->link . '" class="pathway"><span itemprop="name">' . $item->name . '</span></a>';
-			else :
+		// Generate the trail
+		foreach ($list as $key => $item) :
+			if ($key !== $last_item_key) :
+				if (!empty($item->link)) :
+					$breadcrumbItem = '<a itemprop="item" href="' . $item->link . '" class="pathway"><span itemprop="name">' . $item->name . '</span></a>';
+				else :
+					$breadcrumbItem = '<span itemprop="name">' . $item->name . '</span>';
+				endif;
+				// Render all but last item - along with separator ?>
+				<li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem" class="mod-breadcrumbs__item breadcrumb-item"><?php echo $breadcrumbItem; ?>
+					<meta itemprop="position" content="<?php echo $key + 1; ?>">
+				</li>
+			<?php elseif ($show_last) :
 				$breadcrumbItem = '<span itemprop="name">' . $item->name . '</span>';
-			endif;
-			// Render all but last item - along with separator ?>
-			<li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem" class="mod-breadcrumbs__item breadcrumb-item"><?php echo $breadcrumbItem; ?>
-				<meta itemprop="position" content="<?php echo $key + 1; ?>">
-			</li>
-		<?php elseif ($show_last) :
-			$breadcrumbItem = '<span itemprop="name">' . $item->name . '</span>';
-			// Render last item if reqd. ?>
-			<li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem" class="mod-breadcrumbs__item breadcrumb-item active"><?php echo $breadcrumbItem; ?>
-				<meta itemprop="position" content="<?php echo $key + 1; ?>">
-			</li>
-		<?php endif;
-	endforeach; ?>
-</ol>
+				// Render last item if reqd. ?>
+				<li aria-current="page" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem" class="mod-breadcrumbs__item breadcrumb-item active"><?php echo $breadcrumbItem; ?>
+					<meta itemprop="position" content="<?php echo $key + 1; ?>">
+				</li>
+			<?php endif;
+		endforeach; ?>
+	</ol>
+</nav>
diff --git a/modules/mod_custom/mod_custom.php b/modules/mod_custom/mod_custom.php
index 55fbfd87dde89..fcd2ff4da491a 100644
--- a/modules/mod_custom/mod_custom.php
+++ b/modules/mod_custom/mod_custom.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_custom
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_custom/mod_custom.xml b/modules/mod_custom/mod_custom.xml
index 195eb12a0344c..6c2cdea944245 100644
--- a/modules/mod_custom/mod_custom.xml
+++ b/modules/mod_custom/mod_custom.xml
@@ -3,7 +3,7 @@
 	<name>mod_custom</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_custom/tmpl/default.php b/modules/mod_custom/tmpl/default.php
index ce849420d97cd..64f746eea1c58 100644
--- a/modules/mod_custom/tmpl/default.php
+++ b/modules/mod_custom/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_custom
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_feed/Helper/FeedHelper.php b/modules/mod_feed/Helper/FeedHelper.php
index ae13a6dfd1d91..cfa0ab909279f 100644
--- a/modules/mod_feed/Helper/FeedHelper.php
+++ b/modules/mod_feed/Helper/FeedHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_feed
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_feed/mod_feed.php b/modules/mod_feed/mod_feed.php
index 0f7fbe2cd75f6..a0bcda884192d 100644
--- a/modules/mod_feed/mod_feed.php
+++ b/modules/mod_feed/mod_feed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_feed
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_feed/mod_feed.xml b/modules/mod_feed/mod_feed.xml
index a16ef75aa92a0..1b9760cb29fd2 100644
--- a/modules/mod_feed/mod_feed.xml
+++ b/modules/mod_feed/mod_feed.xml
@@ -3,7 +3,7 @@
 	<name>mod_feed</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
@@ -69,6 +69,17 @@
 					<option value="1">JSHOW</option>
 				</field>
 
+				<field
+					name="rssdate"
+					type="radio"
+					label="MOD_FEED_FIELD_DATE_LABEL"
+					class="switcher"
+					default="0"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
 				<field
 					name="rssimage"
 					type="radio"
@@ -101,6 +112,18 @@
 					<option value="1">JSHOW</option>
 				</field>
 
+				<field
+					name="rssitemdate"
+					type="radio"
+					label="MOD_FEED_FIELD_ITEMDATE_LABEL"
+					class="switcher"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
 				<field
 					name="word_count"
 					type="text"
diff --git a/modules/mod_feed/tmpl/default.php b/modules/mod_feed/tmpl/default.php
index d3fabf71d8ac7..46a026fca958d 100644
--- a/modules/mod_feed/tmpl/default.php
+++ b/modules/mod_feed/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_feed
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -81,6 +81,12 @@
 				</h2>
 			<?php
 		}
+		// Feed date
+		if ($params->get('rssdate', 1)) : ?>
+			<h3>
+			<?php echo HtmlHelper::_('date', $feed->publishedDate, Text::_('DATE_FORMAT_LC3')); ?>
+			</h3>
+		<?php endif;
 		// Feed description
 		if ($params->get('rssdesc', 1))
 		{
@@ -114,6 +120,12 @@
 						<span class="feed-link"><?php echo trim($feed[$i]->title); ?></span>
 					<?php endif; ?>
 
+					<?php if ($params->get('rssitemdate', 0)) : ?>
+						<div class="feed-item-date">
+							<?php echo HtmlHelper::_('date', $feed[$i]->publishedDate, Text::_('DATE_FORMAT_LC3')); ?>
+						</div>
+					<?php endif; ?>
+
 					<?php if ($params->get('rssitemdesc', 1) && $text !== '') : ?>
 						<div class="feed-item-description">
 						<?php
diff --git a/modules/mod_finder/Helper/FinderHelper.php b/modules/mod_finder/Helper/FinderHelper.php
index af1d90b0df1dc..0cbbcc970daa9 100644
--- a/modules/mod_finder/Helper/FinderHelper.php
+++ b/modules/mod_finder/Helper/FinderHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_finder/mod_finder.php b/modules/mod_finder/mod_finder.php
index 5c719a8c95859..e47e2520f5dcb 100644
--- a/modules/mod_finder/mod_finder.php
+++ b/modules/mod_finder/mod_finder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_finder/mod_finder.xml b/modules/mod_finder/mod_finder.xml
index 9372ab3e83198..72749ec5e1730 100644
--- a/modules/mod_finder/mod_finder.xml
+++ b/modules/mod_finder/mod_finder.xml
@@ -3,7 +3,7 @@
 	<name>mod_finder</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2011</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_finder/tmpl/default.php b/modules/mod_finder/tmpl/default.php
index f7fda7f026d78..a1969014ccc48 100644
--- a/modules/mod_finder/tmpl/default.php
+++ b/modules/mod_finder/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -19,7 +19,7 @@
 $lang = Factory::getLanguage();
 $lang->load('com_finder', JPATH_SITE);
 
-$input = '<input type="text" name="q" class="js-finder-search-query form-control" value="' . htmlspecialchars(Factory::getApplication()->input->get('q', '', 'string'), ENT_COMPAT, 'UTF-8') . '"'
+$input = '<input type="text" name="q" id="mod-finder-searchword' . $module->id . '" class="js-finder-search-query form-control" value="' . htmlspecialchars(Factory::getApplication()->input->get('q', '', 'string'), ENT_COMPAT, 'UTF-8') . '"'
 	. ' placeholder="' . Text::_('MOD_FINDER_SEARCH_VALUE') . '">';
 
 $showLabel  = $params->get('show_label', 1);
@@ -34,7 +34,7 @@
 	$output .= '<div class="mod-finder__search input-group">';
 	$output .= $input;
 	$output .= '<span class="input-group-append">';
-	$output .= '<button class="btn btn-primary hasTooltip" type="submit" title="' . Text::_('MOD_FINDER_SEARCH_BUTTON') . '"><span class="fa fa-search icon-white" aria-hidden="true"></span> ' . Text::_('JSEARCH_FILTER_SUBMIT') . '</button>';
+	$output .= '<button class="btn btn-primary hasTooltip" type="submit"><span class="fa fa-search icon-white" aria-hidden="true"></span> ' . Text::_('JSEARCH_FILTER_SUBMIT') . '</button>';
 	$output .= '</span>';
 	$output .= '</div>';
 }
@@ -58,7 +58,7 @@
 }
 ?>
 
-<form class="mod-finder js-finder-searchform form-search" action="<?php echo Route::_($route); ?>" method="get">
+<form class="mod-finder js-finder-searchform form-search" action="<?php echo Route::_($route); ?>" method="get" role="search">
 	<?php echo $output; ?>
 
 	<?php $show_advanced = $params->get('show_advanced', 0); ?>
diff --git a/modules/mod_footer/mod_footer.php b/modules/mod_footer/mod_footer.php
index a56f86b29a16b..76bd222698c46 100644
--- a/modules/mod_footer/mod_footer.php
+++ b/modules/mod_footer/mod_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_footer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_footer/mod_footer.xml b/modules/mod_footer/mod_footer.xml
index edec6072eccca..de22edc291b04 100644
--- a/modules/mod_footer/mod_footer.xml
+++ b/modules/mod_footer/mod_footer.xml
@@ -3,7 +3,7 @@
 	<name>mod_footer</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_footer/tmpl/default.php b/modules/mod_footer/tmpl/default.php
index 0b363ac775294..6056814b65213 100644
--- a/modules/mod_footer/tmpl/default.php
+++ b/modules/mod_footer/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_footer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_languages/Helper/LanguagesHelper.php b/modules/mod_languages/Helper/LanguagesHelper.php
index b8b5af2bde3da..2eb4bd39e6b6c 100644
--- a/modules/mod_languages/Helper/LanguagesHelper.php
+++ b/modules/mod_languages/Helper/LanguagesHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -67,7 +67,8 @@ public static function getList(&$params)
 				$associations = MenusHelper::getAssociations($active->id);
 			}
 
-			$component = $app->bootComponent($app->input->get('option'));
+			$option = $app->input->get('option');
+			$component = $app->bootComponent($option);
 
 			if ($component instanceof AssociationServiceInterface)
 			{
@@ -76,8 +77,8 @@ public static function getList(&$params)
 			else
 			{
 				// Load component associations
-				$class = str_replace('com_', '', $app->input->get('option')) . 'HelperAssociation';
-				\JLoader::register($class, JPATH_COMPONENT_SITE . '/helpers/association.php');
+				$class = str_replace('com_', '', $option) . 'HelperAssociation';
+				\JLoader::register($class, JPATH_SITE . '/components/' . $option . '/helpers/association.php');
 
 				if (class_exists($class) && is_callable(array($class, 'getAssociations')))
 				{
diff --git a/modules/mod_languages/mod_languages.php b/modules/mod_languages/mod_languages.php
index 2c32a57cd52e4..451cc55fc0d82 100644
--- a/modules/mod_languages/mod_languages.php
+++ b/modules/mod_languages/mod_languages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_languages/mod_languages.xml b/modules/mod_languages/mod_languages.xml
index 0a725ee4b5793..bf488e890bf44 100644
--- a/modules/mod_languages/mod_languages.xml
+++ b/modules/mod_languages/mod_languages.xml
@@ -3,7 +3,7 @@
 	<name>mod_languages</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2010</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_languages/tmpl/default.php b/modules/mod_languages/tmpl/default.php
index 13c837caadf80..2f3afa0a222d7 100644
--- a/modules/mod_languages/tmpl/default.php
+++ b/modules/mod_languages/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_languages
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -22,10 +22,10 @@
 <?php endif; ?>
 
 <?php if ($params->get('dropdown', 0) && !$params->get('dropdownimage', 1)) : ?>
-	<form name="lang" method="post" action="<?php echo htmlspecialchars(Uri::current(), ENT_COMPAT, 'UTF-8'); ?>">
+	<form name="lang" method="post" action="<?php echo htmlspecialchars_decode(htmlspecialchars(Uri::current(), ENT_COMPAT, 'UTF-8'), ENT_NOQUOTES); ?>">
 	<select class="inputbox advancedSelect" onchange="document.location.replace(this.value);" >
 	<?php foreach ($list as $language) : ?>
-		<option dir=<?php echo $language->rtl ? '"rtl"' : '"ltr"'; ?> value="<?php echo htmlspecialchars($language->link, ENT_QUOTES, 'UTF-8'); ?>" <?php echo $language->active ? 'selected="selected"' : ''; ?>>
+		<option dir=<?php echo $language->rtl ? '"rtl"' : '"ltr"'; ?> value="<?php echo htmlspecialchars_decode(htmlspecialchars($language->link, ENT_QUOTES, 'UTF-8'), ENT_NOQUOTES); ?>" <?php echo $language->active ? 'selected="selected"' : ''; ?>>
 		<?php echo $params->get('full_name', 1) ? $language->title_native : strtoupper($language->sef); ?></option>
 	<?php endforeach; ?>
 	</select>
@@ -45,9 +45,19 @@
 		<?php endforeach; ?>
 		<ul class="<?php echo $params->get('lineheight', 0) ? 'lang-block' : 'lang-inline'; ?> dropdown-menu" dir="<?php echo Factory::getLanguage()->isRtl() ? 'rtl' : 'ltr'; ?>">
 		<?php foreach ($list as $language) : ?>
-			<?php if (!$language->active || $params->get('show_active', 1)) : ?>
-				<li<?php echo $language->active ? ' class="lang-active"' : ''; ?>>
-				<a href="<?php echo htmlspecialchars($language->link, ENT_QUOTES, 'UTF-8'); ?>">
+			<?php if (!$language->active) : ?>
+				<li>
+				<a href="<?php echo htmlspecialchars_decode(htmlspecialchars($language->link, ENT_QUOTES, 'UTF-8'), ENT_NOQUOTES); ?>">
+					<?php if ($language->image) : ?>
+						<?php echo HTMLHelper::_('image', 'mod_languages/' . $language->image . '.gif', '', null, true); ?>
+					<?php endif; ?>
+					<?php echo $params->get('full_name', 1) ? $language->title_native : strtoupper($language->sef); ?>
+				</a>
+				</li>
+			<?php elseif ($params->get('show_active', 1)) : ?>
+			<?php $base = Uri::getInstance(); ?>
+				<li class="lang-active">
+				<a href="<?php echo htmlspecialchars_decode(htmlspecialchars($base, ENT_QUOTES, 'UTF-8'), ENT_NOQUOTES); ?>">
 					<?php if ($language->image) : ?>
 						<?php echo HTMLHelper::_('image', 'mod_languages/' . $language->image . '.gif', '', null, true); ?>
 					<?php endif; ?>
@@ -59,11 +69,27 @@
 		</ul>
 	</div>
 <?php else : ?>
-	<ul class="mod-languages__list <?php echo $params->get('inline', 1) ? 'lang-inline' : 'lang-block'; ?>">
+	<ul class="mod-languages__list <?php echo $params->get('inline', 1) ? 'lang-inline' : 'lang-block'; ?>"  dir="<?php echo Factory::getLanguage()->isRtl() ? 'rtl' : 'ltr'; ?>">
 	<?php foreach ($list as $language) : ?>
-		<?php if (!$language->active || $params->get('show_active', 1)) : ?>
-			<li<?php echo $language->active ? ' class="lang-active"' : ''; ?> dir="<?php echo $language->rtl ? 'rtl' : 'ltr'; ?>">
-			<a href="<?php echo htmlspecialchars($language->link, ENT_QUOTES, 'UTF-8'); ?>">
+		<?php if (!$language->active) : ?>
+			<li>
+				<a href="<?php echo htmlspecialchars_decode(htmlspecialchars($language->link, ENT_QUOTES, 'UTF-8'), ENT_NOQUOTES); ?>">
+					<?php if ($params->get('image', 1)) : ?>
+						<?php if ($language->image) : ?>
+							<?php echo HTMLHelper::_('image', 'mod_languages/' . $language->image . '.gif', $language->title_native, array('title' => $language->title_native), true); ?>
+						<?php else : ?>
+							<span class="label"><?php echo strtoupper($language->sef); ?></span>
+						<?php endif; ?>
+					<?php else : ?>
+						<?php echo $params->get('full_name', 1) ? $language->title_native : strtoupper($language->sef); ?>
+					<?php endif; ?>
+				</a>
+			</li>
+		<?php elseif ($params->get('show_active', 1)) : ?>
+			<?php $base = Uri::getInstance(); ?>
+			<li class="lang-active">
+			<a href="<?php echo htmlspecialchars_decode(htmlspecialchars($base, ENT_QUOTES, 'UTF-8'), ENT_NOQUOTES); ?>">
+
 			<?php if ($params->get('image', 1)) : ?>
 				<?php if ($language->image) : ?>
 					<?php echo HTMLHelper::_('image', 'mod_languages/' . $language->image . '.gif', $language->title_native, array('title' => $language->title_native), true); ?>
diff --git a/modules/mod_login/Helper/LoginHelper.php b/modules/mod_login/Helper/LoginHelper.php
index 2f631866574c4..5b14060e82db6 100644
--- a/modules/mod_login/Helper/LoginHelper.php
+++ b/modules/mod_login/Helper/LoginHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_login
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_login/mod_login.php b/modules/mod_login/mod_login.php
index 52ea9f84638ed..eb0ff1d9beaf8 100644
--- a/modules/mod_login/mod_login.php
+++ b/modules/mod_login/mod_login.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_login
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_login/mod_login.xml b/modules/mod_login/mod_login.xml
index 1b35b1ae3ffad..7638b0c1c00ff 100644
--- a/modules/mod_login/mod_login.xml
+++ b/modules/mod_login/mod_login.xml
@@ -3,7 +3,7 @@
 	<name>mod_login</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_login/tmpl/default.php b/modules/mod_login/tmpl/default.php
index aba9432da5174..c2e7d661ef095 100644
--- a/modules/mod_login/tmpl/default.php
+++ b/modules/mod_login/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_login
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_login/tmpl/default_logout.php b/modules/mod_login/tmpl/default_logout.php
index 53768444fafa8..5f7433fa76c3b 100644
--- a/modules/mod_login/tmpl/default_logout.php
+++ b/modules/mod_login/tmpl/default_logout.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_login
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_menu/Helper/MenuHelper.php b/modules/mod_menu/Helper/MenuHelper.php
index 3a301a3e784b7..3c35c2272737a 100644
--- a/modules/mod_menu/Helper/MenuHelper.php
+++ b/modules/mod_menu/Helper/MenuHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -123,6 +123,18 @@ public static function getList(&$params)
 
 						case 'alias':
 							$item->flink = 'index.php?Itemid=' . $item->params->get('aliasoptions');
+
+							// Get the language of the target menu item when site is multilingual
+							if (Multilanguage::isEnabled())
+							{
+								$newItem = Factory::getApplication()->getMenu()->getItem((int) $item->params->get('aliasoptions'));
+
+								// Use language code if not set to ALL
+								if ($newItem != null && $newItem->language && $newItem->language !== '*')
+								{
+									$item->flink .= '&lang=' . $newItem->language;
+								}
+							}
 							break;
 
 						default:
diff --git a/modules/mod_menu/mod_menu.php b/modules/mod_menu/mod_menu.php
index 8e6aa72621c85..70c1196703256 100644
--- a/modules/mod_menu/mod_menu.php
+++ b/modules/mod_menu/mod_menu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_menu/mod_menu.xml b/modules/mod_menu/mod_menu.xml
index 3ba9a3d74d4e0..bc719166f25d1 100644
--- a/modules/mod_menu/mod_menu.xml
+++ b/modules/mod_menu/mod_menu.xml
@@ -3,7 +3,7 @@
 	<name>mod_menu</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_menu/tmpl/default.php b/modules/mod_menu/tmpl/default.php
index 5a59326c8e807..f7c9d14908a5e 100644
--- a/modules/mod_menu/tmpl/default.php
+++ b/modules/mod_menu/tmpl/default.php
@@ -3,14 +3,17 @@
  * @package     Joomla.Site
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Helper\ModuleHelper;
 
+HTMLHelper::_('script', 'mod_menu/menu.min.js', array('version' => 'auto', 'relative' => true));
+
 $id = '';
 
 if ($tagId = $params->get('tag_id', ''))
@@ -20,7 +23,7 @@
 
 // The menu class is deprecated. Use mod-menu instead
 ?>
-<ul<?php echo $id; ?> class="mod-menu nav<?php echo $class_sfx; ?>">
+<ul<?php echo $id; ?> class="mod-menu nav<?php echo $class_sfx; ?> mod-list">
 <?php foreach ($list as $i => &$item)
 {
 	$class = 'nav-item';
diff --git a/modules/mod_menu/tmpl/default_component.php b/modules/mod_menu/tmpl/default_component.php
index 6c49f8882ba9b..6844fe0312dda 100644
--- a/modules/mod_menu/tmpl/default_component.php
+++ b/modules/mod_menu/tmpl/default_component.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_menu/tmpl/default_heading.php b/modules/mod_menu/tmpl/default_heading.php
index 6357780ddc4c4..5ecaffae82f54 100644
--- a/modules/mod_menu/tmpl/default_heading.php
+++ b/modules/mod_menu/tmpl/default_heading.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_menu/tmpl/default_separator.php b/modules/mod_menu/tmpl/default_separator.php
index 1fb6aea056e9b..272789a69c21d 100644
--- a/modules/mod_menu/tmpl/default_separator.php
+++ b/modules/mod_menu/tmpl/default_separator.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_menu/tmpl/default_url.php b/modules/mod_menu/tmpl/default_url.php
index bedea997905d7..3b0f4055c4f4a 100644
--- a/modules/mod_menu/tmpl/default_url.php
+++ b/modules/mod_menu/tmpl/default_url.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_random_image/Helper/RandomImageHelper.php b/modules/mod_random_image/Helper/RandomImageHelper.php
index c91304c34f174..899dab5d46bf9 100644
--- a/modules/mod_random_image/Helper/RandomImageHelper.php
+++ b/modules/mod_random_image/Helper/RandomImageHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_random_image
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_random_image/mod_random_image.php b/modules/mod_random_image/mod_random_image.php
index 3892f451bcd44..4e2457c2b1238 100644
--- a/modules/mod_random_image/mod_random_image.php
+++ b/modules/mod_random_image/mod_random_image.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_random_image
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_random_image/mod_random_image.xml b/modules/mod_random_image/mod_random_image.xml
index 09cc290e79c10..061c53dfeb4cb 100644
--- a/modules/mod_random_image/mod_random_image.xml
+++ b/modules/mod_random_image/mod_random_image.xml
@@ -3,7 +3,7 @@
 	<name>mod_random_image</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_random_image/tmpl/default.php b/modules/mod_random_image/tmpl/default.php
index 0c68b097fff65..56ded3e46edbf 100644
--- a/modules/mod_random_image/tmpl/default.php
+++ b/modules/mod_random_image/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_random_image
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_related_items/Helper/RelatedItemsHelper.php b/modules/mod_related_items/Helper/RelatedItemsHelper.php
index 28979e70cfcec..488fa0e144c01 100644
--- a/modules/mod_related_items/Helper/RelatedItemsHelper.php
+++ b/modules/mod_related_items/Helper/RelatedItemsHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_related_items
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_related_items/mod_related_items.php b/modules/mod_related_items/mod_related_items.php
index 3e8ea08f96f0b..9aaa374116dae 100644
--- a/modules/mod_related_items/mod_related_items.php
+++ b/modules/mod_related_items/mod_related_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_related_items
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_related_items/mod_related_items.xml b/modules/mod_related_items/mod_related_items.xml
index 14d237df8ddde..0ada485ae7a98 100644
--- a/modules/mod_related_items/mod_related_items.xml
+++ b/modules/mod_related_items/mod_related_items.xml
@@ -3,7 +3,7 @@
 	<name>mod_related_items</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_related_items/tmpl/default.php b/modules/mod_related_items/tmpl/default.php
index 2c6b23fe7ef1f..c4dafcc534e04 100644
--- a/modules/mod_related_items/tmpl/default.php
+++ b/modules/mod_related_items/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_related_items
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,7 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<ul class="mod-relateditems relateditems<?php echo $moduleclass_sfx; ?>">
+<ul class="mod-relateditems relateditems<?php echo $moduleclass_sfx; ?> mod-list">
 <?php foreach ($list as $item) : ?>
 <li>
 	<a href="<?php echo $item->route; ?>">
diff --git a/modules/mod_search/Helper/SearchHelper.php b/modules/mod_search/Helper/SearchHelper.php
index d12915c25fc93..bba5bafe04242 100644
--- a/modules/mod_search/Helper/SearchHelper.php
+++ b/modules/mod_search/Helper/SearchHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_search/mod_search.php b/modules/mod_search/mod_search.php
index 1edd8c0026803..603c6c9175086 100644
--- a/modules/mod_search/mod_search.php
+++ b/modules/mod_search/mod_search.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,11 +15,16 @@
 use Joomla\CMS\Uri\Uri;
 use Joomla\Module\Search\Site\Helper\SearchHelper;
 
+$set_Itemid = (int) $params->get('set_itemid', 0);
+$mitemid    = $set_Itemid > 0 ? $set_Itemid : $app->input->getInt('Itemid');
+
 if ($params->get('opensearch', 1))
 {
 	$ostitle = $params->get('opensearch_title', Text::_('MOD_SEARCH_SEARCHBUTTON_TEXT') . ' ' . $app->get('sitename'));
 	$app->getDocument()->addHeadLink(
-		Uri::getInstance()->toString(array('scheme', 'host', 'port')) . Route::_('&option=com_search&format=opensearch'), 'search', 'rel',
+		Uri::getInstance()->toString(array('scheme', 'host', 'port')) . Route::_('&option=com_search&format=opensearch&Itemid=' . $mitemid),
+		'search',
+		'rel',
 		[
 			'title' => htmlspecialchars($ostitle, ENT_COMPAT, 'UTF-8'),
 			'type' => 'application/opensearchdescription+xml'
@@ -34,12 +39,10 @@
 $maxlength   = $upper_limit;
 $text        = htmlspecialchars($params->get('text', Text::_('MOD_SEARCH_SEARCHBOX_TEXT')), ENT_COMPAT, 'UTF-8');
 $label       = htmlspecialchars($params->get('label', Text::_('MOD_SEARCH_LABEL_TEXT')), ENT_COMPAT, 'UTF-8');
-$set_Itemid  = (int) $params->get('set_itemid', 0);
 
 if ($imagebutton)
 {
 	$img = SearchHelper::getSearchImage($button_text);
 }
 
-$mitemid = $set_Itemid > 0 ? $set_Itemid : $app->input->getInt('Itemid');
 require ModuleHelper::getLayoutPath('mod_search', $params->get('layout', 'default'));
diff --git a/modules/mod_search/mod_search.xml b/modules/mod_search/mod_search.xml
index f190799195dbc..8f54ebbf9f779 100644
--- a/modules/mod_search/mod_search.xml
+++ b/modules/mod_search/mod_search.xml
@@ -3,7 +3,7 @@
 	<name>mod_search</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_search/tmpl/default.php b/modules/mod_search/tmpl/default.php
index ac088fd7ecdaa..11ffc34b732fb 100644
--- a/modules/mod_search/tmpl/default.php
+++ b/modules/mod_search/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_search
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,7 @@
 
 ?>
 <div class="mod-search search">
-	<form action="<?php echo Route::_('index.php'); ?>" method="post">
+	<form action="<?php echo Route::_('index.php'); ?>" method="post" role="search">
 		<?php
 			$input  = '<input name="searchword" id="mod-search-searchword' . $module->id . '" class="form-control" type="search" placeholder="' . $text . '">';
 			$output = '';
diff --git a/modules/mod_stats/Helper/StatsHelper.php b/modules/mod_stats/Helper/StatsHelper.php
index e274b17da7b5a..89a243e832c65 100644
--- a/modules/mod_stats/Helper/StatsHelper.php
+++ b/modules/mod_stats/Helper/StatsHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_stats
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_stats/mod_stats.php b/modules/mod_stats/mod_stats.php
index 30c6f69fcf141..97f30824aa7a7 100644
--- a/modules/mod_stats/mod_stats.php
+++ b/modules/mod_stats/mod_stats.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_stats
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_stats/mod_stats.xml b/modules/mod_stats/mod_stats.xml
index c403fd718d4fd..04ba066cb6679 100644
--- a/modules/mod_stats/mod_stats.xml
+++ b/modules/mod_stats/mod_stats.xml
@@ -3,7 +3,7 @@
 	<name>mod_stats</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_stats/tmpl/default.php b/modules/mod_stats/tmpl/default.php
index 0b78a3da6e402..be156ec9b3a21 100644
--- a/modules/mod_stats/tmpl/default.php
+++ b/modules/mod_stats/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_stats
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_syndicate/Helper/SyndicateHelper.php b/modules/mod_syndicate/Helper/SyndicateHelper.php
index 04393f61b3d28..b8a4d421d46bc 100644
--- a/modules/mod_syndicate/Helper/SyndicateHelper.php
+++ b/modules/mod_syndicate/Helper/SyndicateHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_syndicate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_syndicate/mod_syndicate.php b/modules/mod_syndicate/mod_syndicate.php
index 31ce19431e3ad..2487bc9331ec8 100644
--- a/modules/mod_syndicate/mod_syndicate.php
+++ b/modules/mod_syndicate/mod_syndicate.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_syndicate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_syndicate/mod_syndicate.xml b/modules/mod_syndicate/mod_syndicate.xml
index 1b5db8dd80385..f2865bc08ddeb 100644
--- a/modules/mod_syndicate/mod_syndicate.xml
+++ b/modules/mod_syndicate/mod_syndicate.xml
@@ -3,7 +3,7 @@
 	<name>mod_syndicate</name>
 	<author>Joomla! Project</author>
 	<creationDate>May 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_syndicate/tmpl/default.php b/modules/mod_syndicate/tmpl/default.php
index 26f6b75f06584..9ac318643730f 100644
--- a/modules/mod_syndicate/tmpl/default.php
+++ b/modules/mod_syndicate/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_syndicate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_tags_popular/Helper/TagsPopularHelper.php b/modules/mod_tags_popular/Helper/TagsPopularHelper.php
index d21ad4b32abf5..11a7ada31bd0f 100644
--- a/modules/mod_tags_popular/Helper/TagsPopularHelper.php
+++ b/modules/mod_tags_popular/Helper/TagsPopularHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_tags_popular
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -82,7 +82,7 @@ public static function getList(&$params)
 
 		if ($timeframe !== 'alltime')
 		{
-			$query->where($db->quoteName('tag_date') . ' > ' . $query->dateAdd($nowDate, '-1', strtoupper($timeframe)));
+			$query->where($db->quoteName('tag_date') . ' > ' . $query->dateAdd($db->quote($nowDate), '-1', strtoupper($timeframe)));
 		}
 
 		$query->join('INNER', $db->quoteName('#__tags', 't') . ' ON ' . $db->quoteName('tag_id') . ' = t.id')
diff --git a/modules/mod_tags_popular/mod_tags_popular.php b/modules/mod_tags_popular/mod_tags_popular.php
index fddba67cad854..8655446292bc5 100644
--- a/modules/mod_tags_popular/mod_tags_popular.php
+++ b/modules/mod_tags_popular/mod_tags_popular.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_tags_popular
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_tags_popular/mod_tags_popular.xml b/modules/mod_tags_popular/mod_tags_popular.xml
index b9f3eede7d598..4a07fa9eee168 100644
--- a/modules/mod_tags_popular/mod_tags_popular.xml
+++ b/modules/mod_tags_popular/mod_tags_popular.xml
@@ -3,7 +3,7 @@
 	<name>mod_tags_popular</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2013</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_tags_popular/tmpl/cloud.php b/modules/mod_tags_popular/tmpl/cloud.php
index f32cfa35d6583..26bcd5f037654 100644
--- a/modules/mod_tags_popular/tmpl/cloud.php
+++ b/modules/mod_tags_popular/tmpl/cloud.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_tags_popular
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_tags_popular/tmpl/default.php b/modules/mod_tags_popular/tmpl/default.php
index 0ae1edc190a2d..4014d43ae88bb 100644
--- a/modules/mod_tags_popular/tmpl/default.php
+++ b/modules/mod_tags_popular/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_tags_popular
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_tags_similar/Helper/TagsSimilarHelper.php b/modules/mod_tags_similar/Helper/TagsSimilarHelper.php
index ee827982c4e86..4f7c229a74a55 100644
--- a/modules/mod_tags_similar/Helper/TagsSimilarHelper.php
+++ b/modules/mod_tags_similar/Helper/TagsSimilarHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_tags_similar
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_tags_similar/mod_tags_similar.php b/modules/mod_tags_similar/mod_tags_similar.php
index 34048e9c17df2..10731c2979ace 100644
--- a/modules/mod_tags_similar/mod_tags_similar.php
+++ b/modules/mod_tags_similar/mod_tags_similar.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_tags_similar
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_tags_similar/mod_tags_similar.xml b/modules/mod_tags_similar/mod_tags_similar.xml
index 39526e51edf4b..c02445a0fdffd 100644
--- a/modules/mod_tags_similar/mod_tags_similar.xml
+++ b/modules/mod_tags_similar/mod_tags_similar.xml
@@ -3,7 +3,7 @@
 	<name>mod_tags_similar</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2013</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_tags_similar/tmpl/default.php b/modules/mod_tags_similar/tmpl/default.php
index fcb16c6bfae07..4ddd4d603bd0a 100644
--- a/modules/mod_tags_similar/tmpl/default.php
+++ b/modules/mod_tags_similar/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_tags_similar
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_users_latest/Helper/UsersLatestHelper.php b/modules/mod_users_latest/Helper/UsersLatestHelper.php
index 0ff048573b3fc..2f8c60ee71507 100644
--- a/modules/mod_users_latest/Helper/UsersLatestHelper.php
+++ b/modules/mod_users_latest/Helper/UsersLatestHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_users_latest
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_users_latest/mod_users_latest.php b/modules/mod_users_latest/mod_users_latest.php
index af77ec8a18177..d2526442f83cd 100644
--- a/modules/mod_users_latest/mod_users_latest.php
+++ b/modules/mod_users_latest/mod_users_latest.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_users_latest
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_users_latest/mod_users_latest.xml b/modules/mod_users_latest/mod_users_latest.xml
index cf56c3ebea9bc..69992de9f6f8e 100644
--- a/modules/mod_users_latest/mod_users_latest.xml
+++ b/modules/mod_users_latest/mod_users_latest.xml
@@ -3,7 +3,7 @@
 	<name>mod_users_latest</name>
 	<author>Joomla! Project</author>
 	<creationDate>December 2009</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_users_latest/tmpl/default.php b/modules/mod_users_latest/tmpl/default.php
index d88ec70b0864a..cf9f9ccc92cf4 100644
--- a/modules/mod_users_latest/tmpl/default.php
+++ b/modules/mod_users_latest/tmpl/default.php
@@ -3,14 +3,14 @@
  * @package     Joomla.Site
  * @subpackage  mod_users_latest
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 ?>
 <?php if (!empty($names)) : ?>
-	<ul class="mod-userslatest latestusers" >
+	<ul class="mod-userslatest latestusers mod-list">
 	<?php foreach ($names as $name) : ?>
 		<li>
 			<?php echo $name->username; ?>
diff --git a/modules/mod_whosonline/Helper/WhosonlineHelper.php b/modules/mod_whosonline/Helper/WhosonlineHelper.php
index f391943eeca0c..1a93e206e9495 100644
--- a/modules/mod_whosonline/Helper/WhosonlineHelper.php
+++ b/modules/mod_whosonline/Helper/WhosonlineHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_whosonline
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -50,7 +50,6 @@ public static function getOnlineCount()
 		}
 		catch (\RuntimeException $e)
 		{
-			// Don't worry be happy
 			$sessions = [];
 		}
 
diff --git a/modules/mod_whosonline/mod_whosonline.php b/modules/mod_whosonline/mod_whosonline.php
index 5ef5c0a1c125e..b0255243b28b2 100644
--- a/modules/mod_whosonline/mod_whosonline.php
+++ b/modules/mod_whosonline/mod_whosonline.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_whosonline
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_whosonline/mod_whosonline.xml b/modules/mod_whosonline/mod_whosonline.xml
index 46e8bacb85050..ba0ecf8d6da32 100644
--- a/modules/mod_whosonline/mod_whosonline.xml
+++ b/modules/mod_whosonline/mod_whosonline.xml
@@ -3,7 +3,7 @@
 	<name>mod_whosonline</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_whosonline/tmpl/default.php b/modules/mod_whosonline/tmpl/default.php
index 0e22712b73e55..2f097852a2202 100644
--- a/modules/mod_whosonline/tmpl/default.php
+++ b/modules/mod_whosonline/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_whosonline
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_whosonline/tmpl/disabled.php b/modules/mod_whosonline/tmpl/disabled.php
index 9618be9d8d923..4c991cf91fcee 100644
--- a/modules/mod_whosonline/tmpl/disabled.php
+++ b/modules/mod_whosonline/tmpl/disabled.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_whosonline
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_wrapper/Helper/WrapperHelper.php b/modules/mod_wrapper/Helper/WrapperHelper.php
index 6d95ca2a10cc8..315cdac299e76 100644
--- a/modules/mod_wrapper/Helper/WrapperHelper.php
+++ b/modules/mod_wrapper/Helper/WrapperHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_wrapper
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_wrapper/mod_wrapper.php b/modules/mod_wrapper/mod_wrapper.php
index 4e49271d6ca4b..2c0e772cbbb5f 100644
--- a/modules/mod_wrapper/mod_wrapper.php
+++ b/modules/mod_wrapper/mod_wrapper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_wrapper
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_wrapper/mod_wrapper.xml b/modules/mod_wrapper/mod_wrapper.xml
index 19c69a2260067..56448cef67f1f 100644
--- a/modules/mod_wrapper/mod_wrapper.xml
+++ b/modules/mod_wrapper/mod_wrapper.xml
@@ -3,7 +3,7 @@
 	<name>mod_wrapper</name>
 	<author>Joomla! Project</author>
 	<creationDate>October 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_wrapper/tmpl/default.php b/modules/mod_wrapper/tmpl/default.php
index ea59479402900..8a214fd8d7fce 100644
--- a/modules/mod_wrapper/tmpl/default.php
+++ b/modules/mod_wrapper/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_wrapper
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/package-lock.json b/package-lock.json
index 9bf5acf2851fb..fb9158b5d86c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,32 +13,113 @@
       }
     },
     "@babel/core": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.1.6.tgz",
-      "integrity": "sha512-Hz6PJT6e44iUNpAn8AoyAs6B3bl60g7MJQaI0rZEar6ECzh6+srYO1xlIdssio34mPaUtAb1y+XlkkSJzok3yw==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.0.tgz",
+      "integrity": "sha512-Dzl7U0/T69DFOTwqz/FJdnOSWS57NpjNfCwMKHABr589Lg8uX1RrlBIJ7L5Dubt/xkLsx0xH5EBFzlBVes1ayA==",
+      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.1.6",
-        "@babel/helpers": "^7.1.5",
-        "@babel/parser": "^7.1.6",
-        "@babel/template": "^7.1.2",
-        "@babel/traverse": "^7.1.6",
-        "@babel/types": "^7.1.6",
+        "@babel/generator": "^7.4.0",
+        "@babel/helpers": "^7.4.0",
+        "@babel/parser": "^7.4.0",
+        "@babel/template": "^7.4.0",
+        "@babel/traverse": "^7.4.0",
+        "@babel/types": "^7.4.0",
         "convert-source-map": "^1.1.0",
         "debug": "^4.1.0",
         "json5": "^2.1.0",
-        "lodash": "^4.17.10",
+        "lodash": "^4.17.11",
         "resolve": "^1.3.2",
         "semver": "^5.4.1",
         "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "@babel/generator": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.0.tgz",
+          "integrity": "sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.4.0",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.11",
+            "source-map": "^0.5.0",
+            "trim-right": "^1.0.1"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz",
+          "integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.4.0"
+          }
+        },
+        "@babel/helpers": {
+          "version": "7.4.2",
+          "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.2.tgz",
+          "integrity": "sha512-gQR1eQeroDzFBikhrCccm5Gs2xBjZ57DNjGbqTaHo911IpmSxflOQWMAHPw/TXk8L3isv7s9lYzUkexOeTQUYg==",
+          "dev": true,
+          "requires": {
+            "@babel/template": "^7.4.0",
+            "@babel/traverse": "^7.4.0",
+            "@babel/types": "^7.4.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.4.2",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.2.tgz",
+          "integrity": "sha512-9fJTDipQFvlfSVdD/JBtkiY0br9BtfvW2R8wo6CX/Ej2eMuV0gWPk1M67Mt3eggQvBqYW1FCEk8BN7WvGm/g5g==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.0.tgz",
+          "integrity": "sha512-SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "@babel/parser": "^7.4.0",
+            "@babel/types": "^7.4.0"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.0.tgz",
+          "integrity": "sha512-/DtIHKfyg2bBKnIN+BItaIlEg5pjAnzHOIQe5w+rHAw/rg9g0V7T4rqPX8BJPfW11kt3koyjAnTNwCzb28Y1PA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "@babel/generator": "^7.4.0",
+            "@babel/helper-function-name": "^7.1.0",
+            "@babel/helper-split-export-declaration": "^7.4.0",
+            "@babel/parser": "^7.4.0",
+            "@babel/types": "^7.4.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.11"
+          }
+        },
+        "@babel/types": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz",
+          "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.11",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
       }
     },
     "@babel/generator": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.6.tgz",
-      "integrity": "sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.3.0.tgz",
+      "integrity": "sha512-dZTwMvTgWfhmibq4V9X+LMf6Bgl7zAodRn9PvcPdhlzFMbvUutx74dbEv7Atz3ToeEpevYEJtAwfxq/bDCzHWg==",
       "requires": {
-        "@babel/types": "^7.1.6",
+        "@babel/types": "^7.3.0",
         "jsesc": "^2.5.1",
         "lodash": "^4.17.10",
         "source-map": "^0.5.0",
@@ -65,25 +146,96 @@
       }
     },
     "@babel/helper-call-delegate": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz",
-      "integrity": "sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.0.tgz",
+      "integrity": "sha512-SdqDfbVdNQCBp3WhK2mNdDvHd3BD6qbmIc43CAyjnsfCmgHMeqgDcM3BzY2lchi7HBJGJ2CVdynLWbezaE4mmQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.0.0",
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/helper-hoist-variables": "^7.4.0",
+        "@babel/traverse": "^7.4.0",
+        "@babel/types": "^7.4.0"
+      },
+      "dependencies": {
+        "@babel/generator": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.0.tgz",
+          "integrity": "sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.4.0",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.11",
+            "source-map": "^0.5.0",
+            "trim-right": "^1.0.1"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz",
+          "integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.4.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.4.2",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.2.tgz",
+          "integrity": "sha512-9fJTDipQFvlfSVdD/JBtkiY0br9BtfvW2R8wo6CX/Ej2eMuV0gWPk1M67Mt3eggQvBqYW1FCEk8BN7WvGm/g5g==",
+          "dev": true
+        },
+        "@babel/traverse": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.0.tgz",
+          "integrity": "sha512-/DtIHKfyg2bBKnIN+BItaIlEg5pjAnzHOIQe5w+rHAw/rg9g0V7T4rqPX8BJPfW11kt3koyjAnTNwCzb28Y1PA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "@babel/generator": "^7.4.0",
+            "@babel/helper-function-name": "^7.1.0",
+            "@babel/helper-split-export-declaration": "^7.4.0",
+            "@babel/parser": "^7.4.0",
+            "@babel/types": "^7.4.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.11"
+          }
+        },
+        "@babel/types": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz",
+          "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.11",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
       }
     },
     "@babel/helper-define-map": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz",
-      "integrity": "sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.4.0.tgz",
+      "integrity": "sha512-wAhQ9HdnLIywERVcSvX40CEJwKdAa1ID4neI9NXQPDOHwwA+57DqwLiPEVy2AIyWzAk0CQ8qx4awO0VUURwLtA==",
       "dev": true,
       "requires": {
         "@babel/helper-function-name": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "lodash": "^4.17.10"
+        "@babel/types": "^7.4.0",
+        "lodash": "^4.17.11"
+      },
+      "dependencies": {
+        "@babel/types": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz",
+          "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.11",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
       }
     },
     "@babel/helper-explode-assignable-expression": {
@@ -115,12 +267,25 @@
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz",
-      "integrity": "sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.0.tgz",
+      "integrity": "sha512-/NErCuoe/et17IlAQFKWM24qtyYYie7sFIrW/tIQXpck6vAu2hhtYYsKLBWQV+BQZMbcIYPU/QMYuTufrY4aQw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.4.0"
+      },
+      "dependencies": {
+        "@babel/types": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz",
+          "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.11",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
       }
     },
     "@babel/helper-member-expression-to-functions": {
@@ -142,16 +307,16 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.1.0.tgz",
-      "integrity": "sha512-0JZRd2yhawo79Rcm4w0LwSMILFmFXjugG3yqf+P/UsKsRS1mJCmMwwlHDlMg7Avr9LrvSpp4ZSULO9r8jpCzcw==",
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz",
+      "integrity": "sha512-YRD7I6Wsv+IHuTPkAmAS4HhY0dkPobgLftHp0cRGZSdrRvmZY8rFvae/GVu3bD00qscuvK3WPHB3YdNpBXUqrA==",
       "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
         "@babel/helper-simple-access": "^7.1.0",
         "@babel/helper-split-export-declaration": "^7.0.0",
-        "@babel/template": "^7.1.0",
-        "@babel/types": "^7.0.0",
+        "@babel/template": "^7.2.2",
+        "@babel/types": "^7.2.2",
         "lodash": "^4.17.10"
       }
     },
@@ -193,15 +358,73 @@
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.1.0.tgz",
-      "integrity": "sha512-BvcDWYZRWVuDeXTYZWxekQNO5D4kO55aArwZOTFXw6rlLQA8ZaDicJR1sO47h+HrnCiDFiww0fSPV0d713KBGQ==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.4.0.tgz",
+      "integrity": "sha512-PVwCVnWWAgnal+kJ+ZSAphzyl58XrFeSKSAJRiqg5QToTsjL+Xu1f9+RJ+d+Q0aPhPfBGaYfkox66k86thxNSg==",
       "dev": true,
       "requires": {
         "@babel/helper-member-expression-to-functions": "^7.0.0",
         "@babel/helper-optimise-call-expression": "^7.0.0",
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/traverse": "^7.4.0",
+        "@babel/types": "^7.4.0"
+      },
+      "dependencies": {
+        "@babel/generator": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.0.tgz",
+          "integrity": "sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.4.0",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.11",
+            "source-map": "^0.5.0",
+            "trim-right": "^1.0.1"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz",
+          "integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.4.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.4.2",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.2.tgz",
+          "integrity": "sha512-9fJTDipQFvlfSVdD/JBtkiY0br9BtfvW2R8wo6CX/Ej2eMuV0gWPk1M67Mt3eggQvBqYW1FCEk8BN7WvGm/g5g==",
+          "dev": true
+        },
+        "@babel/traverse": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.0.tgz",
+          "integrity": "sha512-/DtIHKfyg2bBKnIN+BItaIlEg5pjAnzHOIQe5w+rHAw/rg9g0V7T4rqPX8BJPfW11kt3koyjAnTNwCzb28Y1PA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "@babel/generator": "^7.4.0",
+            "@babel/helper-function-name": "^7.1.0",
+            "@babel/helper-split-export-declaration": "^7.4.0",
+            "@babel/parser": "^7.4.0",
+            "@babel/types": "^7.4.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.11"
+          }
+        },
+        "@babel/types": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz",
+          "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.11",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
       }
     },
     "@babel/helper-simple-access": {
@@ -223,25 +446,25 @@
       }
     },
     "@babel/helper-wrap-function": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.1.0.tgz",
-      "integrity": "sha512-R6HU3dete+rwsdAfrOzTlE9Mcpk4RjU3aX3gi9grtmugQY0u79X7eogUvfXA5sI81Mfq1cn6AgxihfN33STjJA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz",
+      "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==",
       "dev": true,
       "requires": {
         "@babel/helper-function-name": "^7.1.0",
         "@babel/template": "^7.1.0",
         "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.2.0"
       }
     },
     "@babel/helpers": {
-      "version": "7.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.1.5.tgz",
-      "integrity": "sha512-2jkcdL02ywNBry1YNFAH/fViq4fXG0vdckHqeJk+75fpQ2OH+Az6076tX/M0835zA45E0Cqa6pV5Kiv9YOqjEg==",
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.3.1.tgz",
+      "integrity": "sha512-Q82R3jKsVpUV99mgX50gOPCWwco9Ec5Iln/8Vyu4osNIOQgSrd9RFrQeUvmvddFNoLwMyOUWU+5ckioEKpDoGA==",
       "requires": {
         "@babel/template": "^7.1.2",
         "@babel/traverse": "^7.1.5",
-        "@babel/types": "^7.1.5"
+        "@babel/types": "^7.3.0"
       }
     },
     "@babel/highlight": {
@@ -255,148 +478,111 @@
       }
     },
     "@babel/parser": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.1.6.tgz",
-      "integrity": "sha512-dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ=="
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.3.1.tgz",
+      "integrity": "sha512-ATz6yX/L8LEnC3dtLQnIx4ydcPxhLcoy9Vl6re00zb2w5lG6itY6Vhnr1KFRPq/FHNsgl/gh2mjNN20f9iJTTA=="
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.1.0.tgz",
-      "integrity": "sha512-Fq803F3Jcxo20MXUSDdmZZXrPe6BWyGcWBPPNB/M7WaUYESKDeKMOGIxEzQOjGSmW/NWb6UaPZrtTB2ekhB/ew==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz",
+      "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/helper-remap-async-to-generator": "^7.1.0",
-        "@babel/plugin-syntax-async-generators": "^7.0.0"
+        "@babel/plugin-syntax-async-generators": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-json-strings": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.0.0.tgz",
-      "integrity": "sha512-kfVdUkIAGJIVmHmtS/40i/fg/AGnw/rsZBCaapY5yjeO5RA9m165Xbw9KMOu2nqXP5dTFjEjHdfNdoVcHv133Q==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",
+      "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-json-strings": "^7.0.0"
+        "@babel/plugin-syntax-json-strings": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0.tgz",
-      "integrity": "sha512-14fhfoPcNu7itSen7Py1iGN0gEm87hX/B+8nZPqkdmANyyYWYMY2pjA3r8WXbWVKMzfnSNS0xY8GVS0IjXi/iw==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.0.tgz",
+      "integrity": "sha512-uTNi8pPYyUH2eWHyYWWSYJKwKg34hhgl4/dbejEjL+64OhbHjTX7wEVWMQl82tEmdDsGeu77+s8HHLS627h6OQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.0.0"
+        "@babel/plugin-syntax-object-rest-spread": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0.tgz",
-      "integrity": "sha512-JPqAvLG1s13B/AuoBjdBYvn38RqW6n1TzrQO839/sIpqLpbnXKacsAgpZHzLD83Sm8SDXMkkrAvEnJ25+0yIpw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz",
+      "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.0.0"
+        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0.tgz",
-      "integrity": "sha512-tM3icA6GhC3ch2SkmSxv7J/hCWKISzwycub6eGsDrFDgukD4dZ/I+x81XgW0YslS6mzNuQ1Cbzh5osjIMgepPQ==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.0.tgz",
+      "integrity": "sha512-h/KjEZ3nK9wv1P1FSNb9G079jXrNYR0Ko+7XkOx85+gM24iZbPn0rh4vCftk+5QKY7y1uByFataBTmX7irEF1w==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/helper-regex": "^7.0.0",
-        "regexpu-core": "^4.2.0"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
-        },
-        "regexpu-core": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.2.0.tgz",
-          "integrity": "sha512-Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw==",
-          "dev": true,
-          "requires": {
-            "regenerate": "^1.4.0",
-            "regenerate-unicode-properties": "^7.0.0",
-            "regjsgen": "^0.4.0",
-            "regjsparser": "^0.3.0",
-            "unicode-match-property-ecmascript": "^1.0.4",
-            "unicode-match-property-value-ecmascript": "^1.0.2"
-          }
-        },
-        "regjsgen": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.4.0.tgz",
-          "integrity": "sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA==",
-          "dev": true
-        },
-        "regjsparser": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.3.0.tgz",
-          "integrity": "sha512-zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA==",
-          "dev": true,
-          "requires": {
-            "jsesc": "~0.5.0"
-          }
-        }
+        "regexpu-core": "^4.5.4"
       }
     },
     "@babel/plugin-syntax-async-generators": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0.tgz",
-      "integrity": "sha512-im7ged00ddGKAjcZgewXmp1vxSZQQywuQXe2B1A7kajjZmDeY/ekMPmWr9zJgveSaQH0k7BcGrojQhcK06l0zA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz",
+      "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-json-strings": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.0.0.tgz",
-      "integrity": "sha512-UlSfNydC+XLj4bw7ijpldc1uZ/HB84vw+U6BTuqMdIEmz/LDe63w/GHtpQMdXWdqQZFeAI9PjnHe/vDhwirhKA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz",
+      "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0.tgz",
-      "integrity": "sha512-5A0n4p6bIiVe5OvQPxBnesezsgFJdHhSs3uFSvaPdMqtsovajLZ+G2vZyvNe10EzJBWWo3AcHGKhAFUxqwp2dw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz",
+      "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0.tgz",
-      "integrity": "sha512-Wc+HVvwjcq5qBg1w5RG9o9RVzmCaAg/Vp0erHCKpAYV8La6I94o4GQAmFYNmkzoMO6gzoOSulpKeSSz6mPEoZw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz",
+      "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0.tgz",
-      "integrity": "sha512-2EZDBl1WIO/q4DIkIp4s86sdp4ZifL51MoIviLY/gG/mLSuOIEg7J8o6mhbxOTvUJkaN50n+8u41FVsr5KLy/w==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz",
+      "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.1.0.tgz",
-      "integrity": "sha512-rNmcmoQ78IrvNCIt/R9U+cixUHeYAzgusTFgIAv+wQb9HJU4szhpDD6e5GCACmj/JP5KxuCwM96bX3L9v4ZN/g==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.0.tgz",
+      "integrity": "sha512-EeaFdCeUULM+GPFEsf7pFcNSxM7hYjoj5fiYbyuiXobW4JhFnjAv9OWzNwHyHcKoPNpAfeRDuW6VyaXEDUBa7g==",
       "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
@@ -405,119 +591,104 @@
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0.tgz",
-      "integrity": "sha512-AOBiyUp7vYTqz2Jibe1UaAWL0Hl9JUXEgjFvvvcSc9MVDItv46ViXFw2F7SVt1B5k+KWjl44eeXOAk3UDEaJjQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz",
+      "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.1.5.tgz",
-      "integrity": "sha512-jlYcDrz+5ayWC7mxgpn1Wj8zj0mmjCT2w0mPIMSwO926eXBRxpEgoN/uQVRBfjtr8ayjcmS+xk2G1jaP8JjMJQ==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.0.tgz",
+      "integrity": "sha512-AWyt3k+fBXQqt2qb9r97tn3iBwFpiv9xdAiG+Gr2HpAZpuayvbL55yWrsV3MyHvXk/4vmSiedhDRl1YI2Iy5nQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "lodash": "^4.17.10"
+        "lodash": "^4.17.11"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.1.0.tgz",
-      "integrity": "sha512-rNaqoD+4OCBZjM7VaskladgqnZ1LO6o2UxuWSDzljzW21pN1KXkB7BstAVweZdxQkHAujps5QMNOTWesBciKFg==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.0.tgz",
+      "integrity": "sha512-XGg1Mhbw4LDmrO9rSTNe+uI79tQPdGs0YASlxgweYRLZqo/EQktjaOV4tchL/UZbM0F+/94uOipmdNGoaGOEYg==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-define-map": "^7.1.0",
+        "@babel/helper-define-map": "^7.4.0",
         "@babel/helper-function-name": "^7.1.0",
         "@babel/helper-optimise-call-expression": "^7.0.0",
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.4.0",
+        "@babel/helper-split-export-declaration": "^7.4.0",
         "globals": "^11.1.0"
+      },
+      "dependencies": {
+        "@babel/helper-split-export-declaration": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz",
+          "integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.4.0"
+          }
+        },
+        "@babel/types": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz",
+          "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.11",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0.tgz",
-      "integrity": "sha512-ubouZdChNAv4AAWAgU7QKbB93NU5sHwInEWfp+/OzJKA02E6Woh9RVoX4sZrbRwtybky/d7baTUqwFx+HgbvMA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz",
+      "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.1.3.tgz",
-      "integrity": "sha512-Mb9M4DGIOspH1ExHOUnn2UUXFOyVTiX84fXCd+6B5iWrQg/QMeeRmSwpZ9lnjYLSXtZwiw80ytVMr3zue0ucYw==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.0.tgz",
+      "integrity": "sha512-HySkoatyYTY3ZwLI8GGvkRWCFrjAGXUHur5sMecmCIdIharnlcWWivOqDJI76vvmVZfzwb6G08NREsrY96RhGQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0.tgz",
-      "integrity": "sha512-00THs8eJxOJUFVx1w8i1MBF4XH4PsAjKjQ1eqN/uCH3YKwP21GCKfrn6YZFZswbOk9+0cw1zGQPHVc1KBlSxig==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.2.0.tgz",
+      "integrity": "sha512-sKxnyHfizweTgKZf7XsXu/CNupKhzijptfTM+bozonIuyVrLWVUvYjE2bhuSBML8VQeMxq4Mm63Q9qvcvUcciQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/helper-regex": "^7.0.0",
         "regexpu-core": "^4.1.3"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
-        },
-        "regexpu-core": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.2.0.tgz",
-          "integrity": "sha512-Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw==",
-          "dev": true,
-          "requires": {
-            "regenerate": "^1.4.0",
-            "regenerate-unicode-properties": "^7.0.0",
-            "regjsgen": "^0.4.0",
-            "regjsparser": "^0.3.0",
-            "unicode-match-property-ecmascript": "^1.0.4",
-            "unicode-match-property-value-ecmascript": "^1.0.2"
-          }
-        },
-        "regjsgen": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.4.0.tgz",
-          "integrity": "sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA==",
-          "dev": true
-        },
-        "regjsparser": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.3.0.tgz",
-          "integrity": "sha512-zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA==",
-          "dev": true,
-          "requires": {
-            "jsesc": "~0.5.0"
-          }
-        }
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0.tgz",
-      "integrity": "sha512-w2vfPkMqRkdxx+C71ATLJG30PpwtTpW7DDdLqYt2acXU7YjztzeWW2Jk1T6hKqCLYCcEA5UQM/+xTAm+QCSnuQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz",
+      "integrity": "sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.1.0.tgz",
-      "integrity": "sha512-uZt9kD1Pp/JubkukOGQml9tqAeI8NkE98oZnHZ2qHRElmeKCodbTZgOEUtujSCSLhHSBWbzNiFSDIMC4/RBTLQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz",
+      "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==",
       "dev": true,
       "requires": {
         "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0",
@@ -525,18 +696,18 @@
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0.tgz",
-      "integrity": "sha512-TlxKecN20X2tt2UEr2LNE6aqA0oPeMT1Y3cgz8k4Dn1j5ObT8M3nl9aA37LLklx0PBZKETC9ZAf9n/6SujTuXA==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.0.tgz",
+      "integrity": "sha512-vWdfCEYLlYSxbsKj5lGtzA49K3KANtb8qCPQ1em07txJzsBwY+cKJzBHizj5fl3CCx7vt+WPdgDLTHmydkbQSQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.1.0.tgz",
-      "integrity": "sha512-VxOa1TMlFMtqPW2IDYZQaHsFrq/dDoIjgN098NowhexhZcz3UGlvPgZXuE1jEvNygyWyxRacqDpCZt+par1FNg==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.2.0.tgz",
+      "integrity": "sha512-kWgksow9lHdvBC2Z4mxTsvc7YdY7w/V6B2vy9cTIPtLEE9NhwoWivaxdNM/S37elu5bqlLP/qOY906LukO9lkQ==",
       "dev": true,
       "requires": {
         "@babel/helper-function-name": "^7.1.0",
@@ -544,18 +715,18 @@
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0.tgz",
-      "integrity": "sha512-1NTDBWkeNXgpUcyoVFxbr9hS57EpZYXpje92zv0SUzjdu3enaRwF/l3cmyRnXLtIdyJASyiS6PtybK+CgKf7jA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz",
+      "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.1.0.tgz",
-      "integrity": "sha512-wt8P+xQ85rrnGNr2x1iV3DW32W8zrB6ctuBkYBbf5/ZzJY99Ob4MFgsZDFgczNU76iy9PWsy4EuxOliDjdKw6A==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz",
+      "integrity": "sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==",
       "dev": true,
       "requires": {
         "@babel/helper-module-transforms": "^7.1.0",
@@ -563,9 +734,9 @@
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.1.0.tgz",
-      "integrity": "sha512-wtNwtMjn1XGwM0AXPspQgvmE6msSJP15CX2RVfpTSTNPLhKhaOjaIfBaVfj4iUZ/VrFSodcFedwtPg/NxwQlPA==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.0.tgz",
+      "integrity": "sha512-iWKAooAkipG7g1IY0eah7SumzfnIT3WNhT4uYB2kIsvHnNSB6MDYVa5qyICSwaTBDBY2c4SnJ3JtEa6ltJd6Jw==",
       "dev": true,
       "requires": {
         "@babel/helper-module-transforms": "^7.1.0",
@@ -574,38 +745,47 @@
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.1.3.tgz",
-      "integrity": "sha512-PvTxgjxQAq4pvVUZF3mD5gEtVDuId8NtWkJsZLEJZMZAW3TvgQl1pmydLLN1bM8huHFVVU43lf0uvjQj9FRkKw==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.0.tgz",
+      "integrity": "sha512-gjPdHmqiNhVoBqus5qK60mWPp1CmYWp/tkh11mvb0rrys01HycEGD7NvvSoKXlWEfSM9TcL36CpsK8ElsADptQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.0.0",
+        "@babel/helper-hoist-variables": "^7.4.0",
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.1.0.tgz",
-      "integrity": "sha512-enrRtn5TfRhMmbRwm7F8qOj0qEYByqUvTttPEGimcBH4CJHphjyK1Vg7sdU7JjeEmgSpM890IT/efS2nMHwYig==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz",
+      "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==",
       "dev": true,
       "requires": {
         "@babel/helper-module-transforms": "^7.1.0",
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
+    "@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.2.tgz",
+      "integrity": "sha512-NsAuliSwkL3WO2dzWTOL1oZJHm0TM8ZY8ZSxk2ANyKkt5SQlToGA4pzctmq1BEjoacurdwZ3xp2dCQWJkME0gQ==",
+      "dev": true,
+      "requires": {
+        "regexp-tree": "^0.1.0"
+      }
+    },
     "@babel/plugin-transform-new-target": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz",
-      "integrity": "sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.0.tgz",
+      "integrity": "sha512-6ZKNgMQmQmrEX/ncuCwnnw1yVGoaOW5KpxNhoWI7pCQdA0uZ0HqHGqenCUIENAnxRjy2WwNQ30gfGdIgqJXXqw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.1.0.tgz",
-      "integrity": "sha512-/O02Je1CRTSk2SSJaq0xjwQ8hG4zhZGNjE8psTsSNPXyLRCODv7/PBozqT5AmQMzp7MI3ndvMhGdqp9c96tTEw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.2.0.tgz",
+      "integrity": "sha512-VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -613,58 +793,47 @@
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.1.0.tgz",
-      "integrity": "sha512-vHV7oxkEJ8IHxTfRr3hNGzV446GAb+0hgbA7o/0Jd76s+YzccdWuTU296FOCOl/xweU4t/Ya4g41yWz80RFCRw==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.0.tgz",
+      "integrity": "sha512-Xqv6d1X+doyiuCGDoVJFtlZx0onAX0tnc3dY8w71pv/O0dODAbusVv2Ale3cGOwfiyi895ivOBhYa9DhAM8dUA==",
       "dev": true,
       "requires": {
-        "@babel/helper-call-delegate": "^7.1.0",
+        "@babel/helper-call-delegate": "^7.4.0",
         "@babel/helper-get-function-arity": "^7.0.0",
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz",
-      "integrity": "sha512-sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.0.tgz",
+      "integrity": "sha512-SZ+CgL4F0wm4npojPU6swo/cK4FcbLgxLd4cWpHaNXY/NJ2dpahODCqBbAwb2rDmVszVb3SSjnk9/vik3AYdBw==",
       "dev": true,
       "requires": {
-        "regenerator-transform": "^0.13.3"
-      },
-      "dependencies": {
-        "regenerator-transform": {
-          "version": "0.13.3",
-          "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.3.tgz",
-          "integrity": "sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==",
-          "dev": true,
-          "requires": {
-            "private": "^0.1.6"
-          }
-        }
+        "regenerator-transform": "^0.13.4"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0.tgz",
-      "integrity": "sha512-g/99LI4vm5iOf5r1Gdxq5Xmu91zvjhEG5+yZDJW268AZELAu4J1EiFLnkSG3yuUsZyOipVOVUKoGPYwfsTymhw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz",
+      "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0.tgz",
-      "integrity": "sha512-L702YFy2EvirrR4shTj0g2xQp7aNwZoWNCkNu2mcoU0uyzMl0XRwDSwzB/xp6DSUFiBmEXuyAyEN16LsgVqGGQ==",
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz",
+      "integrity": "sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0.tgz",
-      "integrity": "sha512-LFUToxiyS/WD+XEWpkx/XJBrUXKewSZpzX68s+yEOtIbdnsRjpryDw9U06gYc6klYEij/+KQVRnD3nz3AoKmjw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz",
+      "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -672,9 +841,9 @@
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0.tgz",
-      "integrity": "sha512-vA6rkTCabRZu7Nbl9DfLZE1imj4tzdWcg5vtdQGvj+OH9itNNB6hxuRMHuIY8SGnEt1T9g5foqs9LnrHzsqEFg==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.2.0.tgz",
+      "integrity": "sha512-FkPix00J9A/XWXv4VoKJBMeSkyY9x/TqIh76wzcdfl57RJJcf8CehQ08uwfhCDNtRQYtHQKBTwKZDEyjE13Lwg==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.0.0",
@@ -682,141 +851,121 @@
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0.tgz",
-      "integrity": "sha512-1r1X5DO78WnaAIvs5uC48t41LLckxsYklJrZjNKcevyz83sF2l4RHbw29qrCPr/6ksFsdfRpT/ZgxNWHXRnffg==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz",
+      "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0.tgz",
-      "integrity": "sha512-uJBrJhBOEa3D033P95nPHu3nbFwFE9ZgXsfEitzoIXIwqAZWk7uXcg06yFKXz9FSxBH5ucgU/cYdX0IV8ldHKw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz",
+      "integrity": "sha512-m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/helper-regex": "^7.0.0",
         "regexpu-core": "^4.1.3"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
-        },
-        "regexpu-core": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.2.0.tgz",
-          "integrity": "sha512-Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw==",
-          "dev": true,
-          "requires": {
-            "regenerate": "^1.4.0",
-            "regenerate-unicode-properties": "^7.0.0",
-            "regjsgen": "^0.4.0",
-            "regjsparser": "^0.3.0",
-            "unicode-match-property-ecmascript": "^1.0.4",
-            "unicode-match-property-value-ecmascript": "^1.0.2"
-          }
-        },
-        "regjsgen": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.4.0.tgz",
-          "integrity": "sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA==",
-          "dev": true
-        },
-        "regjsparser": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.3.0.tgz",
-          "integrity": "sha512-zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA==",
-          "dev": true,
-          "requires": {
-            "jsesc": "~0.5.0"
-          }
-        }
       }
     },
     "@babel/preset-env": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.1.6.tgz",
-      "integrity": "sha512-YIBfpJNQMBkb6MCkjz/A9J76SNCSuGVamOVBgoUkLzpJD/z8ghHi9I42LQ4pulVX68N/MmImz6ZTixt7Azgexw==",
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.2.tgz",
+      "integrity": "sha512-OEz6VOZaI9LW08CWVS3d9g/0jZA6YCn1gsKIy/fut7yZCJti5Lm1/Hi+uo/U+ODm7g4I6gULrCP+/+laT8xAsA==",
       "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-async-generator-functions": "^7.1.0",
-        "@babel/plugin-proposal-json-strings": "^7.0.0",
-        "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.0.0",
-        "@babel/plugin-syntax-async-generators": "^7.0.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.0.0",
-        "@babel/plugin-transform-arrow-functions": "^7.0.0",
-        "@babel/plugin-transform-async-to-generator": "^7.1.0",
-        "@babel/plugin-transform-block-scoped-functions": "^7.0.0",
-        "@babel/plugin-transform-block-scoping": "^7.1.5",
-        "@babel/plugin-transform-classes": "^7.1.0",
-        "@babel/plugin-transform-computed-properties": "^7.0.0",
-        "@babel/plugin-transform-destructuring": "^7.0.0",
-        "@babel/plugin-transform-dotall-regex": "^7.0.0",
-        "@babel/plugin-transform-duplicate-keys": "^7.0.0",
-        "@babel/plugin-transform-exponentiation-operator": "^7.1.0",
-        "@babel/plugin-transform-for-of": "^7.0.0",
-        "@babel/plugin-transform-function-name": "^7.1.0",
-        "@babel/plugin-transform-literals": "^7.0.0",
-        "@babel/plugin-transform-modules-amd": "^7.1.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.1.0",
-        "@babel/plugin-transform-modules-systemjs": "^7.0.0",
-        "@babel/plugin-transform-modules-umd": "^7.1.0",
-        "@babel/plugin-transform-new-target": "^7.0.0",
-        "@babel/plugin-transform-object-super": "^7.1.0",
-        "@babel/plugin-transform-parameters": "^7.1.0",
-        "@babel/plugin-transform-regenerator": "^7.0.0",
-        "@babel/plugin-transform-shorthand-properties": "^7.0.0",
-        "@babel/plugin-transform-spread": "^7.0.0",
-        "@babel/plugin-transform-sticky-regex": "^7.0.0",
-        "@babel/plugin-transform-template-literals": "^7.0.0",
-        "@babel/plugin-transform-typeof-symbol": "^7.0.0",
-        "@babel/plugin-transform-unicode-regex": "^7.0.0",
-        "browserslist": "^4.1.0",
+        "@babel/plugin-proposal-async-generator-functions": "^7.2.0",
+        "@babel/plugin-proposal-json-strings": "^7.2.0",
+        "@babel/plugin-proposal-object-rest-spread": "^7.4.0",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.0",
+        "@babel/plugin-syntax-async-generators": "^7.2.0",
+        "@babel/plugin-syntax-json-strings": "^7.2.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0",
+        "@babel/plugin-transform-arrow-functions": "^7.2.0",
+        "@babel/plugin-transform-async-to-generator": "^7.4.0",
+        "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
+        "@babel/plugin-transform-block-scoping": "^7.4.0",
+        "@babel/plugin-transform-classes": "^7.4.0",
+        "@babel/plugin-transform-computed-properties": "^7.2.0",
+        "@babel/plugin-transform-destructuring": "^7.4.0",
+        "@babel/plugin-transform-dotall-regex": "^7.2.0",
+        "@babel/plugin-transform-duplicate-keys": "^7.2.0",
+        "@babel/plugin-transform-exponentiation-operator": "^7.2.0",
+        "@babel/plugin-transform-for-of": "^7.4.0",
+        "@babel/plugin-transform-function-name": "^7.2.0",
+        "@babel/plugin-transform-literals": "^7.2.0",
+        "@babel/plugin-transform-modules-amd": "^7.2.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.4.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.4.0",
+        "@babel/plugin-transform-modules-umd": "^7.2.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.2",
+        "@babel/plugin-transform-new-target": "^7.4.0",
+        "@babel/plugin-transform-object-super": "^7.2.0",
+        "@babel/plugin-transform-parameters": "^7.4.0",
+        "@babel/plugin-transform-regenerator": "^7.4.0",
+        "@babel/plugin-transform-shorthand-properties": "^7.2.0",
+        "@babel/plugin-transform-spread": "^7.2.0",
+        "@babel/plugin-transform-sticky-regex": "^7.2.0",
+        "@babel/plugin-transform-template-literals": "^7.2.0",
+        "@babel/plugin-transform-typeof-symbol": "^7.2.0",
+        "@babel/plugin-transform-unicode-regex": "^7.2.0",
+        "@babel/types": "^7.4.0",
+        "browserslist": "^4.4.2",
+        "core-js-compat": "^3.0.0",
         "invariant": "^2.2.2",
         "js-levenshtein": "^1.1.3",
         "semver": "^5.3.0"
+      },
+      "dependencies": {
+        "@babel/types": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz",
+          "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.11",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
       }
     },
     "@babel/template": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.1.2.tgz",
-      "integrity": "sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==",
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz",
+      "integrity": "sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==",
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.1.2",
-        "@babel/types": "^7.1.2"
+        "@babel/parser": "^7.2.2",
+        "@babel/types": "^7.2.2"
       }
     },
     "@babel/traverse": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.6.tgz",
-      "integrity": "sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz",
+      "integrity": "sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==",
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.1.6",
+        "@babel/generator": "^7.2.2",
         "@babel/helper-function-name": "^7.1.0",
         "@babel/helper-split-export-declaration": "^7.0.0",
-        "@babel/parser": "^7.1.6",
-        "@babel/types": "^7.1.6",
+        "@babel/parser": "^7.2.3",
+        "@babel/types": "^7.2.2",
         "debug": "^4.1.0",
         "globals": "^11.1.0",
         "lodash": "^4.17.10"
       }
     },
     "@babel/types": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
-      "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.3.0.tgz",
+      "integrity": "sha512-QkFPw68QqWU1/RVPyBe8SO7lXbPfjtqAxRYQKpFpaB8yMq7X2qAqfwK5LKoQufEkSmO5NQ70O6Kc3Afk03RwXw==",
       "requires": {
         "esutils": "^2.0.2",
         "lodash": "^4.17.10",
@@ -831,47 +980,45 @@
         "jquery": ">= 1.7.x"
       }
     },
-    "@webcomponents/webcomponentsjs": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.1.2.tgz",
-      "integrity": "sha512-Ul2F4nDOXm97jiulLvGVo5Z4dqWzqwxqDU8j7c7UBZbvKFOEM5xMsXwzYWvoama4pwecK+MCSx1PoIDvEyCrnQ=="
-    },
-    "JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+    "@gfx/zopfli": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@gfx/zopfli/-/zopfli-1.0.11.tgz",
+      "integrity": "sha512-wW+hi+bqdYCpBIvL8g7RYub9YXf5crhZK9SNk/VZmbF177Em1VwFv488qyh8iBpCo6GptcP1Zam0bJfY3VmMbg==",
       "dev": true,
       "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
+        "base64-js": "^1.3.0"
       }
     },
+    "@types/q": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
+      "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==",
+      "dev": true
+    },
+    "@webcomponents/webcomponentsjs": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.1.2.tgz",
+      "integrity": "sha512-Ul2F4nDOXm97jiulLvGVo5Z4dqWzqwxqDU8j7c7UBZbvKFOEM5xMsXwzYWvoama4pwecK+MCSx1PoIDvEyCrnQ=="
+    },
     "abbrev": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-      "dev": true
+      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU="
     },
     "accepts": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
-      "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
+      "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
       "dev": true,
       "requires": {
-        "mime-types": "~2.1.11",
+        "mime-types": "~2.1.18",
         "negotiator": "0.6.1"
       }
     },
     "acorn": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.4.tgz",
-      "integrity": "sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==",
-      "dev": true
-    },
-    "acorn-dynamic-import": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz",
-      "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
+      "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
       "dev": true
     },
     "acorn-jsx": {
@@ -880,24 +1027,6 @@
       "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==",
       "dev": true
     },
-    "acorn-node": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.6.2.tgz",
-      "integrity": "sha512-rIhNEZuNI8ibQcL7ANm/mGyPukIaZsRNX9psFNQURyJW0nu6k8wjSDld20z6v2mDBWqX13pIEnk9gGZJHIlEXg==",
-      "dev": true,
-      "requires": {
-        "acorn": "^6.0.2",
-        "acorn-dynamic-import": "^4.0.0",
-        "acorn-walk": "^6.1.0",
-        "xtend": "^4.0.1"
-      }
-    },
-    "acorn-walk": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz",
-      "integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==",
-      "dev": true
-    },
     "after": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
@@ -905,9 +1034,9 @@
       "dev": true
     },
     "ajv": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz",
-      "integrity": "sha512-7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz",
+      "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==",
       "dev": true,
       "requires": {
         "fast-deep-equal": "^2.0.1",
@@ -916,6 +1045,16 @@
         "uri-js": "^4.2.2"
       }
     },
+    "align-text": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+      "requires": {
+        "kind-of": "^3.0.2",
+        "longest": "^1.0.1",
+        "repeat-string": "^1.5.2"
+      }
+    },
     "alphanum-sort": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
@@ -925,19 +1064,18 @@
     "amdefine": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
     },
     "ansi-escapes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
-      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
       "dev": true
     },
     "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
       "dev": true
     },
     "ansi-styles": {
@@ -949,13 +1087,24 @@
       }
     },
     "anymatch": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
       "requires": {
-        "micromatch": "^2.1.5",
-        "normalize-path": "^2.0.0"
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      },
+      "dependencies": {
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "dev": true,
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        }
       }
     },
     "aproba": {
@@ -964,6 +1113,38 @@
       "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
       "dev": true
     },
+    "archiver": {
+      "version": "0.4.10",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.4.10.tgz",
+      "integrity": "sha1-3w/qyPHRKV5ezrOiBVWQctIfR0c=",
+      "requires": {
+        "iconv-lite": "~0.2.11",
+        "readable-stream": "~1.0.2"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.2.11",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz",
+          "integrity": "sha1-HOYKOleGSiktEyH/RgnKS7llrcg="
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        }
+      }
+    },
     "are-we-there-yet": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
@@ -984,13 +1165,10 @@
       }
     },
     "arr-diff": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "^1.0.1"
-      }
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
     },
     "arr-flatten": {
       "version": "1.1.0",
@@ -1004,79 +1182,22 @@
       "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
       "dev": true
     },
-    "array-differ": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-      "dev": true
-    },
-    "array-filter": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
-      "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw=",
-      "dev": true
-    },
     "array-find-index": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
       "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
       "dev": true
     },
-    "array-map": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
-      "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=",
-      "dev": true
-    },
-    "array-reduce": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
-      "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=",
-      "dev": true
-    },
-    "array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-      "dev": true
-    },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "^1.0.1"
-      }
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
-    },
     "array-unique": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
       "dev": true
     },
     "arraybuffer.slice": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz",
-      "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=",
-      "dev": true
-    },
-    "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true
-    },
-    "asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
+      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
       "dev": true
     },
     "asn1": {
@@ -1088,43 +1209,6 @@
         "safer-buffer": "~2.1.0"
       }
     },
-    "asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "assert": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
-      "dev": true,
-      "requires": {
-        "util": "0.10.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
-        },
-        "util": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.1"
-          }
-        }
-      }
-    },
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
@@ -1137,6 +1221,12 @@
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": true
     },
+    "astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+      "dev": true
+    },
     "async": {
       "version": "1.5.2",
       "resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz",
@@ -1144,9 +1234,9 @@
       "dev": true
     },
     "async-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.2.tgz",
+      "integrity": "sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==",
       "dev": true
     },
     "async-foreach": {
@@ -1179,21 +1269,21 @@
       "dev": true
     },
     "autoprefixer": {
-      "version": "9.3.1",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.3.1.tgz",
-      "integrity": "sha512-DY9gOh8z3tnCbJ13JIWaeQsoYncTGdsrgCceBaQSIL4nvdrLxgbRSBPevg2XbX7u4QCSfLheSJEEIUUSlkbx6Q==",
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.5.0.tgz",
+      "integrity": "sha512-hMKcyHsZn5+qL6AUeP3c8OyuteZ4VaUlg+fWbyl8z7PqsKHF/Bf8/px3K6AT8aMzDkBo8Bc11245MM+itDBOxQ==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.3.3",
-        "caniuse-lite": "^1.0.30000898",
+        "browserslist": "^4.4.2",
+        "caniuse-lite": "^1.0.30000947",
         "normalize-range": "^0.1.2",
         "num2fraction": "^1.2.2",
-        "postcss": "^7.0.5",
+        "postcss": "^7.0.14",
         "postcss-value-parser": "^3.3.1"
       }
     },
     "awesomplete": {
-      "version": "github:LeaVerou/awesomplete#d6df8a5bef1f6384544927fe1885acb9f8401ec4",
+      "version": "github:LeaVerou/awesomplete#f8bee8dabbb2be47e3fcef9dafabbdaaff9b20aa",
       "from": "github:LeaVerou/awesomplete"
     },
     "aws-sign2": {
@@ -1208,50 +1298,6 @@
       "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
       "dev": true
     },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "js-tokens": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
     "babel-helper-evaluate-path": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.4.3.tgz",
@@ -1294,15 +1340,6 @@
       "integrity": "sha1-W1GLESf0ezA4dzOGoVYaK0jmMrY=",
       "dev": true
     },
-    "babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
     "babel-plugin-add-header-comment": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-add-header-comment/-/babel-plugin-add-header-comment-1.0.3.tgz",
@@ -1404,17 +1441,6 @@
         "babel-helper-is-void-0": "^0.4.3"
       }
     },
-    "babel-plugin-static-fs": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-static-fs/-/babel-plugin-static-fs-1.1.0.tgz",
-      "integrity": "sha1-gSrtwGKX6QvquO0C8qaazcyiPAU=",
-      "dev": true,
-      "requires": {
-        "babel-template": "^6.3.13",
-        "babel-types": "^6.4.1",
-        "events": "^1.1.0"
-      }
-    },
     "babel-plugin-transform-inline-consecutive-adds": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.4.3.tgz",
@@ -1518,101 +1544,12 @@
         "lodash.isplainobject": "^4.0.6"
       }
     },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      }
-    },
-    "babel-template": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-traverse": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "globals": {
-          "version": "9.18.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-          "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "babel-types": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
-      },
-      "dependencies": {
-        "to-fast-properties": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-          "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-          "dev": true
-        }
-      }
-    },
     "babelify": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/babelify/-/babelify-10.0.0.tgz",
       "integrity": "sha512-X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg==",
       "dev": true
     },
-    "babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true
-    },
     "backo2": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
@@ -1622,8 +1559,7 @@
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
     "base": {
       "version": "0.11.2",
@@ -1678,12 +1614,6 @@
             "kind-of": "^6.0.2"
           }
         },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
         "kind-of": {
           "version": "6.0.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
@@ -1710,12 +1640,6 @@
       "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
       "dev": true
     },
-    "batch": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz",
-      "integrity": "sha1-PzQU84AyF0O/wQQvmoP/HVgk1GQ=",
-      "dev": true
-    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -1735,15 +1659,15 @@
       }
     },
     "binary-extensions": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz",
-      "integrity": "sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.0.tgz",
+      "integrity": "sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw==",
       "dev": true
     },
     "blob": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
-      "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=",
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
+      "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
       "dev": true
     },
     "block-stream": {
@@ -1761,12 +1685,6 @@
       "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==",
       "dev": true
     },
-    "bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
-      "dev": true
-    },
     "body-parser": {
       "version": "1.18.3",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
@@ -1818,238 +1736,56 @@
       "dev": true
     },
     "bootstrap": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.1.3.tgz",
-      "integrity": "sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w=="
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz",
+      "integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag=="
     },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
     "braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
       "requires": {
-        "expand-range": "^1.8.1",
-        "preserve": "^0.2.0",
-        "repeat-element": "^1.1.2"
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
       }
     },
-    "brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
-    "browser-pack": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz",
-      "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==",
+    "browserslist": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.2.tgz",
+      "integrity": "sha512-zmJVLiKLrzko0iszd/V4SsjTaomFeoVzQGYYOYgRgsbh7WNh95RgDB0CmBdFWYs/3MyFSt69NypjL/h3iaddKQ==",
       "dev": true,
       "requires": {
-        "JSONStream": "^1.0.3",
-        "combine-source-map": "~0.8.0",
-        "defined": "^1.0.0",
-        "safe-buffer": "^5.1.1",
-        "through2": "^2.0.0",
-        "umd": "^3.0.0"
+        "caniuse-lite": "^1.0.30000951",
+        "electron-to-chromium": "^1.3.116",
+        "node-releases": "^1.1.11"
       }
     },
-    "browser-resolve": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
-      "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
+    "buffer-alloc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
       "dev": true,
       "requires": {
-        "resolve": "1.1.7"
-      },
-      "dependencies": {
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-          "dev": true
-        }
-      }
-    },
-    "browserify": {
-      "version": "16.2.3",
-      "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.2.3.tgz",
-      "integrity": "sha512-zQt/Gd1+W+IY+h/xX2NYMW4orQWhqSwyV+xsblycTtpOuB27h1fZhhNQuipJ4t79ohw4P4mMem0jp/ZkISQtjQ==",
-      "dev": true,
-      "requires": {
-        "JSONStream": "^1.0.3",
-        "assert": "^1.4.0",
-        "browser-pack": "^6.0.1",
-        "browser-resolve": "^1.11.0",
-        "browserify-zlib": "~0.2.0",
-        "buffer": "^5.0.2",
-        "cached-path-relative": "^1.0.0",
-        "concat-stream": "^1.6.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "~1.0.0",
-        "crypto-browserify": "^3.0.0",
-        "defined": "^1.0.0",
-        "deps-sort": "^2.0.0",
-        "domain-browser": "^1.2.0",
-        "duplexer2": "~0.1.2",
-        "events": "^2.0.0",
-        "glob": "^7.1.0",
-        "has": "^1.0.0",
-        "htmlescape": "^1.1.0",
-        "https-browserify": "^1.0.0",
-        "inherits": "~2.0.1",
-        "insert-module-globals": "^7.0.0",
-        "labeled-stream-splicer": "^2.0.0",
-        "mkdirp": "^0.5.0",
-        "module-deps": "^6.0.0",
-        "os-browserify": "~0.3.0",
-        "parents": "^1.0.1",
-        "path-browserify": "~0.0.0",
-        "process": "~0.11.0",
-        "punycode": "^1.3.2",
-        "querystring-es3": "~0.2.0",
-        "read-only-stream": "^2.0.0",
-        "readable-stream": "^2.0.2",
-        "resolve": "^1.1.4",
-        "shasum": "^1.0.0",
-        "shell-quote": "^1.6.1",
-        "stream-browserify": "^2.0.0",
-        "stream-http": "^2.0.0",
-        "string_decoder": "^1.1.1",
-        "subarg": "^1.0.0",
-        "syntax-error": "^1.1.1",
-        "through2": "^2.0.0",
-        "timers-browserify": "^1.0.1",
-        "tty-browserify": "0.0.1",
-        "url": "~0.11.0",
-        "util": "~0.10.1",
-        "vm-browserify": "^1.0.0",
-        "xtend": "^4.0.0"
-      },
-      "dependencies": {
-        "events": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/events/-/events-2.1.0.tgz",
-          "integrity": "sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg==",
-          "dev": true
-        },
-        "process": {
-          "version": "0.11.10",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-          "dev": true
-        }
-      }
-    },
-    "browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "browserify-sign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
-      }
-    },
-    "browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "requires": {
-        "pako": "~1.0.5"
-      }
-    },
-    "browserslist": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.3.4.tgz",
-      "integrity": "sha512-u5iz+ijIMUlmV8blX82VGFrB9ecnUg5qEt55CMZ/YJEhha+d8qpBfOFuutJ6F/VKRXjZoD33b6uvarpPxcl3RA==",
-      "dev": true,
-      "requires": {
-        "caniuse-lite": "^1.0.30000899",
-        "electron-to-chromium": "^1.3.82",
-        "node-releases": "^1.0.1"
-      }
-    },
-    "buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
-      "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
-      "dev": true,
-      "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4"
-      }
-    },
-    "buffer-alloc": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
-      "dev": true,
-      "requires": {
-        "buffer-alloc-unsafe": "^1.1.0",
-        "buffer-fill": "^1.0.0"
+        "buffer-alloc-unsafe": "^1.1.0",
+        "buffer-fill": "^1.0.0"
       }
     },
     "buffer-alloc-unsafe": {
@@ -2064,30 +1800,12 @@
       "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
       "dev": true
     },
-    "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
-    },
-    "buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
-    },
     "builtin-modules": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
       "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
       "dev": true
     },
-    "builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
     "bytes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
@@ -2109,22 +1827,8 @@
         "to-object-path": "^0.3.0",
         "union-value": "^1.0.0",
         "unset-value": "^1.0.0"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
       }
     },
-    "cached-path-relative": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.2.tgz",
-      "integrity": "sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg==",
-      "dev": true
-    },
     "caller-callsite": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
@@ -2132,23 +1836,15 @@
       "dev": true,
       "requires": {
         "callsites": "^2.0.0"
-      },
-      "dependencies": {
-        "callsites": {
-          "version": "2.0.0",
-          "resolved": "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-          "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
-          "dev": true
-        }
       }
     },
     "caller-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
       "dev": true,
       "requires": {
-        "callsites": "^0.2.0"
+        "caller-callsite": "^2.0.0"
       }
     },
     "callsite": {
@@ -2158,16 +1854,15 @@
       "dev": true
     },
     "callsites": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
       "dev": true
     },
     "camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-      "dev": true
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+      "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
     },
     "camelcase-keys": {
       "version": "2.1.0",
@@ -2177,6 +1872,14 @@
       "requires": {
         "camelcase": "^2.0.0",
         "map-obj": "^1.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+          "dev": true
+        }
       }
     },
     "caniuse-api": {
@@ -2189,20 +1892,12 @@
         "caniuse-lite": "^1.0.0",
         "lodash.memoize": "^4.1.2",
         "lodash.uniq": "^4.5.0"
-      },
-      "dependencies": {
-        "lodash.memoize": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-          "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-          "dev": true
-        }
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30000910",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000910.tgz",
-      "integrity": "sha512-u/nxtHGAzCGZzIxt3dA/tpSPOcirBZFWKwz1EPz4aaupnBI2XR0Rbr74g0zc6Hzy41OEM4uMoZ38k56TpYAWjQ==",
+      "version": "1.0.30000951",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000951.tgz",
+      "integrity": "sha512-eRhP+nQ6YUkIcNQ6hnvdhMkdc7n3zadog0KXNRxAZTT2kHjUb1yGn71OrPhSn8MOvlX97g5CR97kGVj8fMsXWg==",
       "dev": true
     },
     "caseless": {
@@ -2211,10 +1906,19 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
       "dev": true
     },
+    "center-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+      "requires": {
+        "align-text": "^0.1.3",
+        "lazy-cache": "^1.0.3"
+      }
+    },
     "chalk": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "requires": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -2239,20 +1943,23 @@
       }
     },
     "chokidar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.2.tgz",
+      "integrity": "sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==",
       "dev": true,
       "requires": {
-        "anymatch": "^1.3.0",
-        "async-each": "^1.0.0",
-        "fsevents": "^1.0.0",
-        "glob-parent": "^2.0.0",
-        "inherits": "^2.0.1",
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
         "is-binary-path": "^1.0.0",
-        "is-glob": "^2.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
         "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.0.0"
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.0"
       }
     },
     "chosen-js": {
@@ -2263,22 +1970,6 @@
         "jquery": ">=1.4.4"
       }
     },
-    "cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "circular-json": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-      "dev": true
-    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -2289,23 +1980,6 @@
         "define-property": "^0.2.5",
         "isobject": "^3.0.0",
         "static-extend": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
       }
     },
     "classnames": {
@@ -2313,6 +1987,14 @@
       "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
       "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
     },
+    "cli": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/cli/-/cli-0.4.5.tgz",
+      "integrity": "sha1-ePlIXNFhtWbppsctcXDEJw6B22E=",
+      "requires": {
+        "glob": ">= 3.1.4"
+      }
+    },
     "cli-cursor": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
@@ -2329,44 +2011,30 @@
       "dev": true
     },
     "cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "dev": true,
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
       "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
+        "center-align": "^0.1.1",
+        "right-align": "^0.1.1",
+        "wordwrap": "0.0.2"
       },
       "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
         }
       }
     },
     "coa": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.1.tgz",
-      "integrity": "sha512-5wfTTO8E2/ja4jFSxePXlG5nRu5bBtL/r1HCIpJW/lzT6yDtKl0u0Z4o/Vpz32IpKmBn7HerheEZQgA9N2DarQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
       "dev": true,
       "requires": {
+        "@types/q": "^1.5.1",
+        "chalk": "^2.4.1",
         "q": "^1.1.2"
       }
     },
@@ -2377,9 +2045,14 @@
       "dev": true
     },
     "codemirror": {
-      "version": "5.38.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.38.0.tgz",
-      "integrity": "sha512-PEPnDg8U3DTGFB/Dn2T/INiRNC9CB5k2vLAQJidYCsHvAgtXbklqnuidEwx7yGrMrdGhl0L0P3iNKW9I07J6tQ=="
+      "version": "5.40.0",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.40.0.tgz",
+      "integrity": "sha512-plTYonQ8SwbtS4m9n88mPDR+G7JwFrAL6774VjvoNH8wQJNSJOx5JdWmgRe3pCyuDI4s+vvi4CIuQnoduUTVug=="
+    },
+    "coffee-script": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz",
+      "integrity": "sha1-FQ1rTLUiiUNp7+1qIQHCC8f0pPQ="
     },
     "collection-visit": {
       "version": "1.0.0",
@@ -2425,40 +2098,11 @@
       }
     },
     "colors": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.2.tgz",
-      "integrity": "sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
+      "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
       "dev": true
     },
-    "combine-lists": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
-      "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.5.0"
-      }
-    },
-    "combine-source-map": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz",
-      "integrity": "sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos=",
-      "dev": true,
-      "requires": {
-        "convert-source-map": "~1.1.0",
-        "inline-source-map": "~0.6.0",
-        "lodash.memoize": "~3.0.3",
-        "source-map": "~0.5.3"
-      },
-      "dependencies": {
-        "convert-source-map": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
-          "integrity": "sha1-SCnId+n+SbMWHzvzZziI4gRpmGA=",
-          "dev": true
-        }
-      }
-    },
     "combined-stream": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
@@ -2495,20 +2139,7 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "connect": {
       "version": "3.6.6",
@@ -2540,13 +2171,9 @@
       }
     },
     "console-browserify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-      "dev": true,
-      "requires": {
-        "date-now": "^0.1.4"
-      }
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-0.1.6.tgz",
+      "integrity": "sha1-0SijwLuINQ61YmxufHGm8P1ImDw="
     },
     "console-control-strings": {
       "version": "1.1.0",
@@ -2554,12 +2181,6 @@
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
       "dev": true
     },
-    "constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-      "dev": true
-    },
     "contains-path": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
@@ -2611,76 +2232,45 @@
       }
     },
     "core-js": {
-      "version": "2.5.7",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
-      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.0.0.tgz",
+      "integrity": "sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ==",
+      "dev": true
+    },
+    "core-js-compat": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.0.0.tgz",
+      "integrity": "sha512-W/Ppz34uUme3LmXWjMgFlYyGnbo1hd9JvA0LNQ4EmieqVjg2GPYbj3H6tcdP2QGPGWdRKUqZVbVKLNIFVs/HiA==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.5.1",
+        "core-js": "3.0.0",
+        "core-js-pure": "3.0.0",
+        "semver": "^5.6.0"
+      }
+    },
+    "core-js-pure": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.0.0.tgz",
+      "integrity": "sha512-yPiS3fQd842RZDgo/TAKGgS0f3p2nxssF1H65DIZvZv0Od5CygP8puHXn3IQiM/39VAvgCbdaMQpresrbGgt9g==",
       "dev": true
     },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.7.tgz",
-      "integrity": "sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.1.0.tgz",
+      "integrity": "sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q==",
       "dev": true,
       "requires": {
         "import-fresh": "^2.0.0",
         "is-directory": "^0.3.1",
         "js-yaml": "^3.9.0",
+        "lodash.get": "^4.4.2",
         "parse-json": "^4.0.0"
-      },
-      "dependencies": {
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
-          }
-        }
-      }
-    },
-    "create-ecdh": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
-      }
-    },
-    "create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
       }
     },
     "cropperjs": {
@@ -2709,25 +2299,6 @@
         "custom-event": "1.0.0"
       }
     },
-    "crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      }
-    },
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "http://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
@@ -2785,14 +2356,14 @@
       "dev": true
     },
     "css-vars-ponyfill": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/css-vars-ponyfill/-/css-vars-ponyfill-1.15.1.tgz",
-      "integrity": "sha512-HsMz0zu4pm0PCcFPCTedUBEn1WcMZodUjV8v0Cz5YffifE+p4ys3L2zJTP9f4eKKfnOPW4ADdMpdPwkRQjhDmg=="
+      "version": "1.17.2",
+      "resolved": "https://registry.npmjs.org/css-vars-ponyfill/-/css-vars-ponyfill-1.17.2.tgz",
+      "integrity": "sha512-hhdJTdUd9UM0wewdO8+301kba6F5GdfPwIj/lFd13il3xn0yfEuRhrDmLPMfg6R9nPLgbcU0wAp0DRUO/ucE3Q=="
     },
     "css-what": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.2.tgz",
-      "integrity": "sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
       "dev": true
     },
     "cssesc": {
@@ -2802,52 +2373,52 @@
       "dev": true
     },
     "cssnano": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.7.tgz",
-      "integrity": "sha512-AiXL90l+MDuQmRNyypG2P7ux7K4XklxYzNNUd5HXZCNcH8/N9bHPcpN97v8tXgRVeFL/Ed8iP8mVmAAu0ZpT7A==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
+      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
       "dev": true,
       "requires": {
         "cosmiconfig": "^5.0.0",
-        "cssnano-preset-default": "^4.0.5",
+        "cssnano-preset-default": "^4.0.7",
         "is-resolvable": "^1.0.0",
         "postcss": "^7.0.0"
       }
     },
     "cssnano-preset-default": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.5.tgz",
-      "integrity": "sha512-f1uhya0ZAjPYtDD58QkBB0R+uYdzHPei7cDxJyQQIHt5acdhyGXaSXl2nDLzWHLwGFbZcHxQtkJS8mmNwnxTvw==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
+      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
       "dev": true,
       "requires": {
         "css-declaration-sorter": "^4.0.1",
         "cssnano-util-raw-cache": "^4.0.1",
         "postcss": "^7.0.0",
-        "postcss-calc": "^7.0.0",
-        "postcss-colormin": "^4.0.2",
+        "postcss-calc": "^7.0.1",
+        "postcss-colormin": "^4.0.3",
         "postcss-convert-values": "^4.0.1",
-        "postcss-discard-comments": "^4.0.1",
+        "postcss-discard-comments": "^4.0.2",
         "postcss-discard-duplicates": "^4.0.2",
         "postcss-discard-empty": "^4.0.1",
         "postcss-discard-overridden": "^4.0.1",
-        "postcss-merge-longhand": "^4.0.9",
-        "postcss-merge-rules": "^4.0.2",
+        "postcss-merge-longhand": "^4.0.11",
+        "postcss-merge-rules": "^4.0.3",
         "postcss-minify-font-values": "^4.0.2",
-        "postcss-minify-gradients": "^4.0.1",
-        "postcss-minify-params": "^4.0.1",
-        "postcss-minify-selectors": "^4.0.1",
+        "postcss-minify-gradients": "^4.0.2",
+        "postcss-minify-params": "^4.0.2",
+        "postcss-minify-selectors": "^4.0.2",
         "postcss-normalize-charset": "^4.0.1",
-        "postcss-normalize-display-values": "^4.0.1",
-        "postcss-normalize-positions": "^4.0.1",
-        "postcss-normalize-repeat-style": "^4.0.1",
-        "postcss-normalize-string": "^4.0.1",
-        "postcss-normalize-timing-functions": "^4.0.1",
+        "postcss-normalize-display-values": "^4.0.2",
+        "postcss-normalize-positions": "^4.0.2",
+        "postcss-normalize-repeat-style": "^4.0.2",
+        "postcss-normalize-string": "^4.0.2",
+        "postcss-normalize-timing-functions": "^4.0.2",
         "postcss-normalize-unicode": "^4.0.1",
         "postcss-normalize-url": "^4.0.1",
-        "postcss-normalize-whitespace": "^4.0.1",
-        "postcss-ordered-values": "^4.1.1",
-        "postcss-reduce-initial": "^4.0.2",
-        "postcss-reduce-transforms": "^4.0.1",
-        "postcss-svgo": "^4.0.1",
+        "postcss-normalize-whitespace": "^4.0.2",
+        "postcss-ordered-values": "^4.1.2",
+        "postcss-reduce-initial": "^4.0.3",
+        "postcss-reduce-transforms": "^4.0.2",
+        "postcss-svgo": "^4.0.2",
         "postcss-unique-selectors": "^4.0.1"
       }
     },
@@ -2923,15 +2494,9 @@
       }
     },
     "date-format": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz",
-      "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=",
-      "dev": true
-    },
-    "date-now": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz",
+      "integrity": "sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==",
       "dev": true
     },
     "dateformat": {
@@ -2945,9 +2510,9 @@
       }
     },
     "debug": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
-      "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
       "requires": {
         "ms": "^2.1.1"
       }
@@ -2955,8 +2520,7 @@
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
     "decode-uri-component": {
       "version": "0.2.0",
@@ -2980,77 +2544,12 @@
       }
     },
     "define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
       "dev": true,
       "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        }
-      }
-    },
-    "defined": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
-      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
-      "dev": true
-    },
-    "del": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-      "dev": true,
-      "requires": {
-        "globby": "^5.0.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "rimraf": "^2.2.8"
+        "is-descriptor": "^0.1.0"
       }
     },
     "delayed-stream": {
@@ -3071,39 +2570,6 @@
       "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
       "dev": true
     },
-    "deps-sort": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz",
-      "integrity": "sha1-CRckkC6EZYJg65EHSMzNGvbiH7U=",
-      "dev": true,
-      "requires": {
-        "JSONStream": "^1.0.3",
-        "shasum": "^1.0.0",
-        "subarg": "^1.0.0",
-        "through2": "^2.0.0"
-      }
-    },
-    "des.js": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "detective": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz",
-      "integrity": "sha512-TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ==",
-      "dev": true,
-      "requires": {
-        "acorn-node": "^1.3.0",
-        "defined": "^1.0.0",
-        "minimist": "^1.1.1"
-      }
-    },
     "di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -3115,21 +2581,10 @@
       "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz",
       "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA=="
     },
-    "diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
     "doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
       "requires": {
         "esutils": "^2.0.2"
@@ -3148,21 +2603,13 @@
       }
     },
     "dom-serializer": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
       "dev": true,
       "requires": {
-        "domelementtype": "~1.1.1",
-        "entities": "~1.1.1"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
-          "dev": true
-        }
+        "domelementtype": "^1.3.0",
+        "entities": "^1.1.1"
       }
     },
     "dom-walk": {
@@ -3170,16 +2617,10 @@
       "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz",
       "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg="
     },
-    "domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "dev": true
-    },
     "domelementtype": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.2.1.tgz",
-      "integrity": "sha512-SQVCLFS2E7G5CRCMdn6K9bIhRj1bS6QBWZfF0TUPh4V/BbqrQ619IdSS3/izn0FZ+9l+uODzaZjb08fjOfablA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
       "dev": true
     },
     "domutils": {
@@ -3210,15 +2651,6 @@
         "crossvent": "1.5.4"
       }
     },
-    "duplexer2": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.2"
-      }
-    },
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -3236,30 +2668,15 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.84",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.84.tgz",
-      "integrity": "sha512-IYhbzJYOopiTaNWMBp7RjbecUBsbnbDneOP86f3qvS0G0xfzwNSvMJpTrvi5/Y1gU7tg2NAgeg8a8rCYvW9Whw==",
+      "version": "1.3.119",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.119.tgz",
+      "integrity": "sha512-3mtqcAWa4HgG+Djh/oNXlPH0cOH6MmtwxN1nHSaReb9P0Vn51qYPqYwLeoSuAX9loU1wrOBhFbiX3CkeIxPfgg==",
       "dev": true
     },
-    "elliptic": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
-      "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
-      }
-    },
-    "emitter-mixin": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/emitter-mixin/-/emitter-mixin-0.0.3.tgz",
-      "integrity": "sha1-WUjLKG8uSO3DslGnz8H3iDOW1lw=",
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
       "dev": true
     },
     "encodeurl": {
@@ -3269,85 +2686,83 @@
       "dev": true
     },
     "engine.io": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.5.tgz",
-      "integrity": "sha512-j1DWIcktw4hRwrv6nWx++5nFH2X64x16MAG2P0Lmi5Dvdfi3I+Jhc7JKJIdAmDJa+5aZ/imHV7dWRPy2Cqjh3A==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
+      "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
       "dev": true,
       "requires": {
-        "accepts": "1.3.3",
+        "accepts": "~1.3.4",
         "base64id": "1.0.0",
         "cookie": "0.3.1",
-        "debug": "2.3.3",
-        "engine.io-parser": "1.3.2",
-        "ws": "~1.1.5"
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.0",
+        "ws": "~3.3.1"
       },
       "dependencies": {
         "debug": {
-          "version": "2.3.3",
-          "resolved": "http://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
-            "ms": "0.7.2"
+            "ms": "2.0.0"
           }
         },
         "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         }
       }
     },
     "engine.io-client": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.5.tgz",
-      "integrity": "sha512-AYTgHyeVUPitsseqjoedjhYJapNVoSPShbZ+tEUX9/73jgZ/Z3sUlJf9oYgdEBBdVhupUpUqSxH0kBCXlQnmZg==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+      "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
       "dev": true,
       "requires": {
         "component-emitter": "1.2.1",
         "component-inherit": "0.0.3",
-        "debug": "2.3.3",
-        "engine.io-parser": "1.3.2",
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.1",
         "has-cors": "1.1.0",
         "indexof": "0.0.1",
-        "parsejson": "0.0.3",
         "parseqs": "0.0.5",
         "parseuri": "0.0.5",
-        "ws": "~1.1.5",
-        "xmlhttprequest-ssl": "1.5.3",
+        "ws": "~3.3.1",
+        "xmlhttprequest-ssl": "~1.5.4",
         "yeast": "0.1.2"
       },
       "dependencies": {
         "debug": {
-          "version": "2.3.3",
-          "resolved": "http://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
-            "ms": "0.7.2"
+            "ms": "2.0.0"
           }
         },
         "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         }
       }
     },
     "engine.io-parser": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz",
-      "integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
+      "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==",
       "dev": true,
       "requires": {
         "after": "0.8.2",
-        "arraybuffer.slice": "0.0.6",
+        "arraybuffer.slice": "~0.0.7",
         "base64-arraybuffer": "0.1.5",
-        "blob": "0.0.4",
-        "has-binary": "0.1.7",
-        "wtf-8": "1.0.0"
+        "blob": "0.0.5",
+        "has-binary2": "~1.0.2"
       }
     },
     "ent": {
@@ -3362,15 +2777,6 @@
       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
       "dev": true
     },
-    "errno": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-      "dev": true,
-      "requires": {
-        "prr": "~1.0.1"
-      }
-    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -3381,16 +2787,17 @@
       }
     },
     "es-abstract": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
-      "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
+      "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
       "dev": true,
       "requires": {
-        "es-to-primitive": "^1.1.1",
+        "es-to-primitive": "^1.2.0",
         "function-bind": "^1.1.1",
-        "has": "^1.0.1",
-        "is-callable": "^1.1.3",
-        "is-regex": "^1.0.4"
+        "has": "^1.0.3",
+        "is-callable": "^1.1.4",
+        "is-regex": "^1.0.4",
+        "object-keys": "^1.0.12"
       }
     },
     "es-to-primitive": {
@@ -3453,65 +2860,76 @@
       }
     },
     "eslint": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.9.0.tgz",
-      "integrity": "sha512-g4KWpPdqN0nth+goDNICNXGfJF7nNnepthp46CAlJoJtC5K/cLu3NgCM3AHu1CkJ5Hzt9V0Y0PBAO6Ay/gGb+w==",
+      "version": "5.15.3",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.15.3.tgz",
+      "integrity": "sha512-vMGi0PjCHSokZxE0NLp2VneGw5sio7SSiDNgIUn2tC0XkWJRNOIoHIg3CliLVfXnJsiHxGAYrkw0PieAu8+KYQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "ajv": "^6.5.3",
+        "ajv": "^6.9.1",
         "chalk": "^2.1.0",
         "cross-spawn": "^6.0.5",
         "debug": "^4.0.1",
-        "doctrine": "^2.1.0",
-        "eslint-scope": "^4.0.0",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^4.0.3",
         "eslint-utils": "^1.3.1",
         "eslint-visitor-keys": "^1.0.0",
-        "espree": "^4.0.0",
+        "espree": "^5.0.1",
         "esquery": "^1.0.1",
         "esutils": "^2.0.2",
-        "file-entry-cache": "^2.0.0",
+        "file-entry-cache": "^5.0.1",
         "functional-red-black-tree": "^1.0.1",
         "glob": "^7.1.2",
         "globals": "^11.7.0",
         "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
-        "inquirer": "^6.1.0",
-        "is-resolvable": "^1.1.0",
+        "inquirer": "^6.2.2",
         "js-yaml": "^3.12.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.3.0",
-        "lodash": "^4.17.5",
+        "lodash": "^4.17.11",
         "minimatch": "^3.0.4",
         "mkdirp": "^0.5.1",
         "natural-compare": "^1.4.0",
         "optionator": "^0.8.2",
         "path-is-inside": "^1.0.2",
-        "pluralize": "^7.0.0",
         "progress": "^2.0.0",
         "regexpp": "^2.0.1",
-        "require-uncached": "^1.0.3",
         "semver": "^5.5.1",
         "strip-ansi": "^4.0.0",
         "strip-json-comments": "^2.0.1",
-        "table": "^5.0.2",
+        "table": "^5.2.3",
         "text-table": "^0.2.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
+        "ajv": {
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
         },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+        "import-fresh": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.0.0.tgz",
+          "integrity": "sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "parent-module": "^1.0.0",
+            "resolve-from": "^4.0.0"
           }
+        },
+        "resolve-from": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+          "dev": true
         }
       }
     },
@@ -3554,13 +2972,13 @@
       }
     },
     "eslint-module-utils": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz",
-      "integrity": "sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz",
+      "integrity": "sha512-lmDJgeOOjk8hObTysjqH7wyMi+nsHwwvfBykwfhjR1LNdd7C2uFJBvx4OpWYpXOw4df1yE1cDEVd1yLHitk34w==",
       "dev": true,
       "requires": {
         "debug": "^2.6.8",
-        "pkg-dir": "^1.0.0"
+        "pkg-dir": "^2.0.0"
       },
       "dependencies": {
         "debug": {
@@ -3581,21 +2999,21 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz",
-      "integrity": "sha512-FpuRtniD/AY6sXByma2Wr0TXvXJ4nA/2/04VPlfpmUDPOpOY264x+ILiwnrk/k4RINgDAyFZByxqPUbSQ5YE7g==",
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.16.0.tgz",
+      "integrity": "sha512-z6oqWlf1x5GkHIFgrSvtmudnqM6Q60KM4KvpWi5ubonMjycLjndvd5+8VAZIsTlHC03djdgJuyKG6XO577px6A==",
       "dev": true,
       "requires": {
         "contains-path": "^0.1.0",
-        "debug": "^2.6.8",
+        "debug": "^2.6.9",
         "doctrine": "1.5.0",
-        "eslint-import-resolver-node": "^0.3.1",
-        "eslint-module-utils": "^2.2.0",
-        "has": "^1.0.1",
-        "lodash": "^4.17.4",
-        "minimatch": "^3.0.3",
+        "eslint-import-resolver-node": "^0.3.2",
+        "eslint-module-utils": "^2.3.0",
+        "has": "^1.0.3",
+        "lodash": "^4.17.11",
+        "minimatch": "^3.0.4",
         "read-pkg-up": "^2.0.0",
-        "resolve": "^1.6.0"
+        "resolve": "^1.9.0"
       },
       "dependencies": {
         "debug": {
@@ -3632,9 +3050,9 @@
       "dev": true
     },
     "eslint-scope": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.1.0",
@@ -3654,12 +3072,12 @@
       "dev": true
     },
     "espree": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz",
-      "integrity": "sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
+      "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
       "dev": true,
       "requires": {
-        "acorn": "^6.0.2",
+        "acorn": "^6.0.7",
         "acorn-jsx": "^5.0.0",
         "eslint-visitor-keys": "^1.0.0"
       }
@@ -3699,90 +3117,63 @@
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
       "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
     },
+    "eventemitter2": {
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
+      "integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas="
+    },
     "eventemitter3": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
       "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
       "dev": true
     },
-    "events": {
-      "version": "1.1.1",
-      "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz",
-      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
-      "dev": true
-    },
-    "evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+    "exec-sh": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
+      "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
       "dev": true,
       "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
+        "merge": "^1.2.0"
       }
     },
-    "expand-braces": {
+    "exit": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
-      "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw="
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "dev": true,
       "requires": {
-        "array-slice": "^0.2.3",
-        "array-unique": "^0.2.1",
-        "braces": "^0.1.2"
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "dependencies": {
-        "braces": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
-          "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
-          "dev": true,
-          "requires": {
-            "expand-range": "^0.1.0"
-          }
-        },
-        "expand-range": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
-          "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
-            "is-number": "^0.1.1",
-            "repeat-string": "^0.2.2"
+            "ms": "2.0.0"
           }
         },
-        "is-number": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
-          "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
-          "dev": true
-        },
-        "repeat-string": {
-          "version": "0.2.2",
-          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
-          "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=",
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         }
       }
     },
-    "expand-brackets": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-      "dev": true,
-      "requires": {
-        "is-posix-bracket": "^0.1.0"
-      }
-    },
-    "expand-range": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-      "dev": true,
-      "requires": {
-        "fill-range": "^2.1.0"
-      }
-    },
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -3790,24 +3181,12 @@
       "dev": true
     },
     "extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
       "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
+        "is-extendable": "^0.1.0"
       }
     },
     "external-editor": {
@@ -3822,12 +3201,65 @@
       }
     },
     "extglob": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "dev": true,
       "requires": {
-        "is-extglob": "^1.0.0"
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
       }
     },
     "extsprintf": {
@@ -3864,32 +3296,24 @@
       }
     },
     "file-entry-cache": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
       "dev": true,
       "requires": {
-        "flat-cache": "^1.2.1",
-        "object-assign": "^4.0.1"
+        "flat-cache": "^2.0.1"
       }
     },
-    "filename-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-      "dev": true
-    },
     "fill-range": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "dev": true,
       "requires": {
-        "is-number": "^2.1.0",
-        "isobject": "^2.0.0",
-        "randomatic": "^3.0.0",
-        "repeat-element": "^1.1.2",
-        "repeat-string": "^1.5.2"
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
       }
     },
     "finalhandler": {
@@ -3930,56 +3354,84 @@
         }
       }
     },
-    "find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dev": true,
-      "requires": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
-      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
-      "dev": true,
+    "findup-sync": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+      "integrity": "sha1-fz56l7gjksZTvwZYm9hRkOk8NoM=",
       "requires": {
-        "circular-json": "^0.3.1",
-        "graceful-fs": "^4.1.2",
-        "rimraf": "~2.6.2",
-        "write": "^0.2.1"
+        "glob": "~3.2.9",
+        "lodash": "~2.4.1"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "3.2.11",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+          "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=",
+          "requires": {
+            "inherits": "2",
+            "minimatch": "0.3"
+          }
+        },
+        "lodash": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+          "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4="
+        },
+        "lru-cache": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+          "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI="
+        },
+        "minimatch": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+          "integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=",
+          "requires": {
+            "lru-cache": "2",
+            "sigmund": "~1.0.0"
+          }
+        }
+      }
+    },
+    "flat-cache": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "dev": true,
+      "requires": {
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
       }
     },
+    "flatted": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz",
+      "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==",
+      "dev": true
+    },
     "focus-visible": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/focus-visible/-/focus-visible-4.1.5.tgz",
       "integrity": "sha512-yo/njtk/BB4Z2euzaZe3CZrg4u5s5uEi7ZwbHBJS2quHx51N0mmcx9nTIiImUGlgy+vf26d0CcQluahBBBL/Fw=="
     },
     "follow-redirects": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
-      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
+      "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
       "dev": true,
       "requires": {
-        "debug": "=3.1.0"
+        "debug": "^3.2.6"
       },
       "dependencies": {
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
         }
       }
     },
@@ -3994,15 +3446,6 @@
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
       "dev": true
     },
-    "for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-      "dev": true,
-      "requires": {
-        "for-in": "^1.0.1"
-      }
-    },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -4049,13 +3492,12 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
-      "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz",
+      "integrity": "sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -4065,28 +3507,25 @@
       "dependencies": {
         "abbrev": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-          "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-          "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "are-we-there-yet": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
-          "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
+          "version": "1.1.5",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
@@ -4096,56 +3535,53 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
           }
         },
         "chownr": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
-          "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
+          "version": "1.1.1",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "code-point-at": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "debug": {
           "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
@@ -4153,30 +3589,26 @@
           }
         },
         "deep-extend": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz",
-          "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==",
+          "version": "0.6.0",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "delegates": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-          "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "detect-libc": {
           "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-          "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "fs-minipass": {
           "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
-          "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
@@ -4185,15 +3617,13 @@
         },
         "fs.realpath": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "gauge": {
           "version": "2.7.4",
-          "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-          "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
@@ -4208,9 +3638,8 @@
           }
         },
         "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "version": "7.1.3",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
@@ -4224,25 +3653,22 @@
         },
         "has-unicode": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-          "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "iconv-lite": {
-          "version": "0.4.21",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz",
-          "integrity": "sha512-En5V9za5mBt2oUA03WGD3TwDv0MKAruqsuxstbMUZaj9W9k/m1CV/9py3l0L5kw9Bln8fdHQmzHSYtvpvTLpKw==",
+          "version": "0.4.24",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "safer-buffer": "^2.1.0"
+            "safer-buffer": ">= 2.1.2 < 3"
           }
         },
         "ignore-walk": {
           "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
-          "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
@@ -4251,8 +3677,7 @@
         },
         "inflight": {
           "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
@@ -4262,62 +3687,59 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-          "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
         },
         "isarray": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "minimatch": {
           "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "minipass": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz",
-          "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
+          "version": "2.3.5",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "safe-buffer": "^5.1.1",
+            "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
           }
         },
         "minizlib": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
-          "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
+          "version": "1.2.1",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
@@ -4326,24 +3748,22 @@
         },
         "mkdirp": {
           "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
         },
         "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "needle": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz",
-          "integrity": "sha512-eFagy6c+TYayorXw/qtAdSvaUpEbBsDwDyxYFgLZ0lTojfH7K+OdBqAF7TAFwDokJaGpubpSGG0wO3iC0XPi8w==",
+          "version": "2.2.4",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
@@ -4353,19 +3773,18 @@
           }
         },
         "node-pre-gyp": {
-          "version": "0.10.0",
-          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz",
-          "integrity": "sha512-G7kEonQLRbcA/mOoFoxvlMrw6Q6dPf92+t/l0DFSMuSlDoWaI9JWIyPwK0jyE1bph//CUEL65/Fz1m2vJbmjQQ==",
+          "version": "0.10.3",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
             "detect-libc": "^1.0.2",
             "mkdirp": "^0.5.1",
-            "needle": "^2.2.0",
+            "needle": "^2.2.1",
             "nopt": "^4.0.1",
             "npm-packlist": "^1.1.6",
             "npmlog": "^4.0.2",
-            "rc": "^1.1.7",
+            "rc": "^1.2.7",
             "rimraf": "^2.6.1",
             "semver": "^5.3.0",
             "tar": "^4"
@@ -4373,8 +3792,7 @@
         },
         "nopt": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
@@ -4383,16 +3801,14 @@
           }
         },
         "npm-bundled": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz",
-          "integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==",
+          "version": "1.0.5",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "npm-packlist": {
-          "version": "1.1.10",
-          "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz",
-          "integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==",
+          "version": "1.2.0",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
@@ -4402,8 +3818,7 @@
         },
         "npmlog": {
           "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-          "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
@@ -4415,44 +3830,40 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "once": {
           "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
         },
         "os-homedir": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-          "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "os-tmpdir": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-          "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "osenv": {
           "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-          "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
@@ -4462,26 +3873,23 @@
         },
         "path-is-absolute": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "process-nextick-args": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "rc": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz",
-          "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==",
+          "version": "1.2.8",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "deep-extend": "^0.5.1",
+            "deep-extend": "^0.6.0",
             "ini": "~1.3.0",
             "minimist": "^1.2.0",
             "strip-json-comments": "~2.0.1"
@@ -4489,8 +3897,7 @@
           "dependencies": {
             "minimist": {
               "version": "1.2.0",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+              "bundled": true,
               "dev": true,
               "optional": true
             }
@@ -4498,8 +3905,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
@@ -4513,61 +3919,55 @@
           }
         },
         "rimraf": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-          "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+          "version": "2.6.3",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "glob": "^7.0.5"
+            "glob": "^7.1.3"
           }
         },
         "safe-buffer": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-          "dev": true
+          "version": "5.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-          "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "sax": {
           "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "semver": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-          "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+          "version": "5.6.0",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "set-blocking": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-          "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "signal-exit": {
           "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "string-width": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4576,8 +3976,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
@@ -4586,64 +3985,60 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
         },
         "strip-json-comments": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "tar": {
-          "version": "4.4.1",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz",
-          "integrity": "sha512-O+v1r9yN4tOsvl90p5HAP4AEqbYhx4036AGMm075fH9F8Qwi3oJ+v4u50FkT/KkvywNGtwkk0zRI+8eYm1X/xg==",
+          "version": "4.4.8",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "chownr": "^1.0.1",
+            "chownr": "^1.1.1",
             "fs-minipass": "^1.2.5",
-            "minipass": "^2.2.4",
-            "minizlib": "^1.1.0",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
             "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.1",
+            "safe-buffer": "^5.1.2",
             "yallist": "^3.0.2"
           }
         },
         "util-deprecate": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
         "wide-align": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-          "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
+          "version": "1.1.3",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "string-width": "^1.0.2"
+            "string-width": "^1.0.2 || 2"
           }
         },
         "wrappy": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "yallist": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
-          "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
-          "dev": true
+          "version": "3.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -4692,6 +4087,12 @@
         "wide-align": "^1.1.0"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
@@ -4711,6 +4112,15 @@
             "is-fullwidth-code-point": "^1.0.0",
             "strip-ansi": "^3.0.0"
           }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
         }
       }
     },
@@ -4723,12 +4133,6 @@
         "globule": "^1.0.0"
       }
     },
-    "get-assigned-identifiers": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz",
-      "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==",
-      "dev": true
-    },
     "get-caller-file": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
@@ -4747,6 +4151,11 @@
       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
       "dev": true
     },
+    "getobject": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz",
+      "integrity": "sha1-BHpEl4n6Fg0Bj1SG7ZEyC27HiFw="
+    },
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -4760,7 +4169,6 @@
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
       "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -4770,23 +4178,25 @@
         "path-is-absolute": "^1.0.0"
       }
     },
-    "glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-      "dev": true,
-      "requires": {
-        "glob-parent": "^2.0.0",
-        "is-glob": "^2.0.0"
-      }
-    },
     "glob-parent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
       "dev": true,
       "requires": {
-        "is-glob": "^2.0.0"
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        }
       }
     },
     "global": {
@@ -4799,23 +4209,9 @@
       }
     },
     "globals": {
-      "version": "11.9.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.9.0.tgz",
-      "integrity": "sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg=="
-    },
-    "globby": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-      "dev": true,
-      "requires": {
-        "array-union": "^1.0.1",
-        "arrify": "^1.0.0",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      }
+      "version": "11.10.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.10.0.tgz",
+      "integrity": "sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ=="
     },
     "globule": {
       "version": "1.2.1",
@@ -4834,100 +4230,449 @@
       "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
       "dev": true
     },
-    "handlebars": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz",
-      "integrity": "sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==",
-      "dev": true,
-      "requires": {
-        "async": "^2.5.0",
-        "optimist": "^0.6.1",
-        "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4"
+    "grunt": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz",
+      "integrity": "sha1-VpN81RlDJK3/bSB2MYMqnWuk5/A=",
+      "requires": {
+        "async": "~0.1.22",
+        "coffee-script": "~1.3.3",
+        "colors": "~0.6.2",
+        "dateformat": "1.0.2-1.2.3",
+        "eventemitter2": "~0.4.13",
+        "exit": "~0.1.1",
+        "findup-sync": "~0.1.2",
+        "getobject": "~0.1.0",
+        "glob": "~3.1.21",
+        "grunt-legacy-log": "~0.1.0",
+        "grunt-legacy-util": "~0.2.0",
+        "hooker": "~0.2.3",
+        "iconv-lite": "~0.2.11",
+        "js-yaml": "~2.0.5",
+        "lodash": "~0.9.2",
+        "minimatch": "~0.2.12",
+        "nopt": "~1.0.10",
+        "rimraf": "~2.2.8",
+        "underscore.string": "~2.2.1",
+        "which": "~1.0.5"
       },
       "dependencies": {
+        "argparse": {
+          "version": "0.1.16",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
+          "integrity": "sha1-z9AeD7uj1srtBJ+9dY1A9lGW9Xw=",
+          "requires": {
+            "underscore": "~1.7.0",
+            "underscore.string": "~2.4.0"
+          },
+          "dependencies": {
+            "underscore.string": {
+              "version": "2.4.0",
+              "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz",
+              "integrity": "sha1-jN2PusTi0uoefi6Al8QvRCKA+Fs="
+            }
+          }
+        },
         "async": {
-          "version": "2.6.1",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
-          "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
-          "dev": true,
+          "version": "0.1.22",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz",
+          "integrity": "sha1-D8GqoIig4+8Ovi2IMbqw3PiEUGE="
+        },
+        "colors": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+          "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w="
+        },
+        "dateformat": {
+          "version": "1.0.2-1.2.3",
+          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz",
+          "integrity": "sha1-sCIMAt6YYXQztyhRz0fePfLNvuk="
+        },
+        "esprima": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+          "integrity": "sha1-n1V+CPw7TSbs6d00+Pv0drYlha0="
+        },
+        "glob": {
+          "version": "3.1.21",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+          "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
           "requires": {
-            "lodash": "^4.17.10"
+            "graceful-fs": "~1.2.0",
+            "inherits": "1",
+            "minimatch": "~0.2.11"
           }
         },
-        "commander": {
-          "version": "2.17.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-          "dev": true,
-          "optional": true
+        "graceful-fs": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
+          "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q="
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+        "iconv-lite": {
+          "version": "0.2.11",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz",
+          "integrity": "sha1-HOYKOleGSiktEyH/RgnKS7llrcg="
         },
-        "uglify-js": {
-          "version": "3.4.9",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
-          "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
-          "dev": true,
-          "optional": true,
+        "inherits": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
+          "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js="
+        },
+        "js-yaml": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz",
+          "integrity": "sha1-olrmUJmZ6X3yeMZxnaEb0Gh3Q6g=",
           "requires": {
-            "commander": "~2.17.1",
-            "source-map": "~0.6.1"
+            "argparse": "~ 0.1.11",
+            "esprima": "~ 1.0.2"
+          }
+        },
+        "lodash": {
+          "version": "0.9.2",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz",
+          "integrity": "sha1-jzSZxSRdNG1oLlsNO0B2fgnxqSw="
+        },
+        "lru-cache": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+          "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI="
+        },
+        "minimatch": {
+          "version": "0.2.14",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+          "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
+          "requires": {
+            "lru-cache": "2",
+            "sigmund": "~1.0.0"
           }
+        },
+        "nopt": {
+          "version": "1.0.10",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
+          "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
+          "requires": {
+            "abbrev": "1"
+          }
+        },
+        "rimraf": {
+          "version": "2.2.8",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+          "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI="
+        },
+        "which": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.0.9.tgz",
+          "integrity": "sha1-RgwdoPgQED0DIam2M6+eV15kSG8="
         }
       }
     },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
+    "grunt-contrib-clean": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-0.4.1.tgz",
+      "integrity": "sha1-f49G4vKnGH6cLQg6swJiqmpk4zQ="
     },
-    "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "dev": true,
+    "grunt-contrib-compress": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-compress/-/grunt-contrib-compress-0.5.3.tgz",
+      "integrity": "sha1-ujtbL/Q4xFMFeeaWLKuAaWWA6+0=",
       "requires": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
+        "archiver": "~0.4.2",
+        "lazystream": "~0.1.0",
+        "prettysize": "~0.0.2"
       }
     },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
+    "grunt-contrib-concat": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-0.3.0.tgz",
+      "integrity": "sha1-SPoNQzbSm2U62CJaa9b4VrRIPjI="
     },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+    "grunt-contrib-copy": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-0.4.1.tgz",
+      "integrity": "sha1-8HU7QK4hu3BtrvsLKZ4DzfX6nW4="
+    },
+    "grunt-contrib-jshint": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.6.5.tgz",
+      "integrity": "sha1-OvtGdnRTZMxKGe7nk0wOBgCLVm4=",
+      "requires": {
+        "jshint": "~2.1.10"
+      },
+      "dependencies": {
+        "jshint": {
+          "version": "2.1.11",
+          "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.1.11.tgz",
+          "integrity": "sha1-61EI/vm6Xd67gwmD9XLSQuSeP5Y=",
+          "requires": {
+            "cli": "0.4.x",
+            "console-browserify": "0.1.x",
+            "minimatch": "0.x.x",
+            "shelljs": "0.1.x",
+            "underscore": "1.4.x"
+          }
+        },
+        "lru-cache": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+          "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI="
+        },
+        "minimatch": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz",
+          "integrity": "sha1-vSx9Bg0sjI/Xzefx8u0tWycP2xs=",
+          "requires": {
+            "lru-cache": "2",
+            "sigmund": "~1.0.0"
+          }
+        },
+        "underscore": {
+          "version": "1.4.4",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
+          "integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ="
+        }
+      }
+    },
+    "grunt-contrib-less": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.5.2.tgz",
+      "integrity": "sha1-XoFCpB97nj8OCpd0P9WwkYm7oW8=",
+      "requires": {
+        "less": "~1.3.3"
+      }
+    },
+    "grunt-contrib-uglify": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.2.7.tgz",
+      "integrity": "sha1-5r2lHgxAoUWfbOrUI8Ze/XJaG/c=",
+      "requires": {
+        "grunt-lib-contrib": "~0.6.1",
+        "uglify-js": "~2.4.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.2.10",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+          "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E="
+        },
+        "source-map": {
+          "version": "0.1.34",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+          "integrity": "sha1-p8/omux7FoLDsZjQrPtH19CQVms=",
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        },
+        "uglify-js": {
+          "version": "2.4.24",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz",
+          "integrity": "sha1-+tV1XB4Vd2WLsG/5q25UjJW+vW4=",
+          "requires": {
+            "async": "~0.2.6",
+            "source-map": "0.1.34",
+            "uglify-to-browserify": "~1.0.0",
+            "yargs": "~3.5.4"
+          }
+        }
+      }
+    },
+    "grunt-legacy-log": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz",
+      "integrity": "sha1-7ClCboAwIa9ZAp+H0vnNczWgVTE=",
+      "requires": {
+        "colors": "~0.6.2",
+        "grunt-legacy-log-utils": "~0.1.1",
+        "hooker": "~0.2.3",
+        "lodash": "~2.4.1",
+        "underscore.string": "~2.3.3"
+      },
+      "dependencies": {
+        "colors": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+          "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w="
+        },
+        "lodash": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+          "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4="
+        },
+        "underscore.string": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz",
+          "integrity": "sha1-ccCL9rQosRM/N+ePo6Icgvcymw0="
+        }
+      }
+    },
+    "grunt-legacy-log-utils": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz",
+      "integrity": "sha1-wHBrndkGThFvNvI/5OawSGcsD34=",
+      "requires": {
+        "colors": "~0.6.2",
+        "lodash": "~2.4.1",
+        "underscore.string": "~2.3.3"
+      },
+      "dependencies": {
+        "colors": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+          "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w="
+        },
+        "lodash": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+          "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4="
+        },
+        "underscore.string": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz",
+          "integrity": "sha1-ccCL9rQosRM/N+ePo6Icgvcymw0="
+        }
+      }
+    },
+    "grunt-legacy-util": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz",
+      "integrity": "sha1-kzJIhNv343qf98Am3/RR2UqeVUs=",
+      "requires": {
+        "async": "~0.1.22",
+        "exit": "~0.1.1",
+        "getobject": "~0.1.0",
+        "hooker": "~0.2.3",
+        "lodash": "~0.9.2",
+        "underscore.string": "~2.2.1",
+        "which": "~1.0.5"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.1.22",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz",
+          "integrity": "sha1-D8GqoIig4+8Ovi2IMbqw3PiEUGE="
+        },
+        "lodash": {
+          "version": "0.9.2",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz",
+          "integrity": "sha1-jzSZxSRdNG1oLlsNO0B2fgnxqSw="
+        },
+        "which": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.0.9.tgz",
+          "integrity": "sha1-RgwdoPgQED0DIam2M6+eV15kSG8="
+        }
+      }
+    },
+    "grunt-lib-contrib": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/grunt-lib-contrib/-/grunt-lib-contrib-0.6.1.tgz",
+      "integrity": "sha1-P1att9oG6BR5XuJBWw6+X7iQPrs=",
+      "requires": {
+        "zlib-browserify": "0.0.1"
+      }
+    },
+    "grunt-replace": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/grunt-replace/-/grunt-replace-0.4.4.tgz",
+      "integrity": "sha1-GN+aMwue2Zxn3Q5a8DOB7z8NDfU=",
+      "requires": {
+        "grunt-lib-contrib": "~0.5.1"
+      },
+      "dependencies": {
+        "grunt-lib-contrib": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/grunt-lib-contrib/-/grunt-lib-contrib-0.5.3.tgz",
+          "integrity": "sha1-6D+e5cigZZLW6CWCHZEhB4IIEzg=",
+          "requires": {
+            "zlib-browserify": "0.0.1"
+          }
+        }
+      }
+    },
+    "handlebars": {
+      "version": "4.0.12",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz",
+      "integrity": "sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==",
       "dev": true,
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "async": "^2.5.0",
+        "optimist": "^0.6.1",
+        "source-map": "^0.6.1",
+        "uglify-js": "^3.1.4"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+          "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.17.10"
+          }
+        },
+        "commander": {
+          "version": "2.17.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+          "dev": true,
+          "optional": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "uglify-js": {
+          "version": "3.4.9",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
+          "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "commander": "~2.17.1",
+            "source-map": "~0.6.1"
+          }
+        }
       }
     },
-    "has-binary": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz",
-      "integrity": "sha1-aOYesWIQyVRaClzOBqhzkS/h5ow=",
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.5.5",
+        "har-schema": "^2.0.0"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "dev": true,
       "requires": {
-        "isarray": "0.0.1"
+        "ansi-regex": "^2.0.0"
       },
       "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         }
       }
@@ -4981,14 +4726,6 @@
         "get-value": "^2.0.6",
         "has-values": "^1.0.0",
         "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
       }
     },
     "has-values": {
@@ -5001,26 +4738,6 @@
         "kind-of": "^4.0.0"
       },
       "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
         "kind-of": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
@@ -5032,42 +4749,16 @@
         }
       }
     },
-    "hash-base": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "hash.js": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.5.tgz",
-      "integrity": "sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
     "hex-color-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
       "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
       "dev": true
     },
-    "hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
+    "hooker": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
+      "integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk="
     },
     "hosted-git-info": {
       "version": "2.7.1",
@@ -5093,12 +4784,6 @@
       "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
       "dev": true
     },
-    "htmlescape": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz",
-      "integrity": "sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E=",
-      "dev": true
-    },
     "http-errors": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
@@ -5133,12 +4818,6 @@
         "sshpk": "^1.7.0"
       }
     },
-    "https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-      "dev": true
-    },
     "iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -5148,12 +4827,6 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
-    "ieee754": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
-      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
-      "dev": true
-    },
     "ignore": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
@@ -5168,23 +4841,6 @@
       "requires": {
         "caller-path": "^2.0.0",
         "resolve-from": "^3.0.0"
-      },
-      "dependencies": {
-        "caller-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-          "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
-          "dev": true,
-          "requires": {
-            "caller-callsite": "^2.0.0"
-          }
-        },
-        "resolve-from": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-          "dev": true
-        }
       }
     },
     "imurmurhash": {
@@ -5224,7 +4880,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -5233,8 +4888,7 @@
     "inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "ini": {
       "version": "1.3.5",
@@ -5242,79 +4896,44 @@
       "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
       "dev": true
     },
-    "inline-source-map": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz",
-      "integrity": "sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU=",
-      "dev": true,
-      "requires": {
-        "source-map": "~0.5.3"
-      }
-    },
     "inquirer": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.0.tgz",
-      "integrity": "sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.2.tgz",
+      "integrity": "sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==",
       "dev": true,
       "requires": {
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.0",
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
         "cli-cursor": "^2.1.0",
         "cli-width": "^2.0.0",
-        "external-editor": "^3.0.0",
+        "external-editor": "^3.0.3",
         "figures": "^2.0.0",
-        "lodash": "^4.17.10",
+        "lodash": "^4.17.11",
         "mute-stream": "0.0.7",
         "run-async": "^2.2.0",
-        "rxjs": "^6.1.0",
+        "rxjs": "^6.4.0",
         "string-width": "^2.1.0",
-        "strip-ansi": "^4.0.0",
+        "strip-ansi": "^5.0.0",
         "through": "^2.3.6"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
         "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "^4.1.0"
           }
         }
       }
     },
-    "insert-module-globals": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.0.tgz",
-      "integrity": "sha512-VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw==",
-      "dev": true,
-      "requires": {
-        "JSONStream": "^1.0.3",
-        "acorn-node": "^1.5.2",
-        "combine-source-map": "^0.8.0",
-        "concat-stream": "^1.6.1",
-        "is-buffer": "^1.1.0",
-        "path-is-absolute": "^1.0.1",
-        "process": "~0.11.0",
-        "through2": "^2.0.0",
-        "undeclared-identifiers": "^1.1.2",
-        "xtend": "^4.0.0"
-      },
-      "dependencies": {
-        "process": {
-          "version": "0.11.10",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-          "dev": true
-        }
-      }
-    },
     "invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
@@ -5324,12 +4943,6 @@
         "loose-envify": "^1.0.0"
       }
     },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true
-    },
     "is-absolute-url": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
@@ -5363,8 +4976,7 @@
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
     "is-builtin-module": {
       "version": "1.0.0",
@@ -5435,21 +5047,6 @@
       "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
       "dev": true
     },
-    "is-dotfile": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-      "dev": true
-    },
-    "is-equal-shallow": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-      "dev": true,
-      "requires": {
-        "is-primitive": "^2.0.0"
-      }
-    },
     "is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -5457,9 +5054,9 @@
       "dev": true
     },
     "is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "dev": true
     },
     "is-finite": {
@@ -5478,18 +5075,18 @@
       "dev": true
     },
     "is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+      "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
       "dev": true,
       "requires": {
-        "is-extglob": "^1.0.0"
+        "is-extglob": "^2.1.1"
       }
     },
     "is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "dev": true,
       "requires": {
         "kind-of": "^3.0.2"
@@ -5501,30 +5098,6 @@
       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
       "dev": true
     },
-    "is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-      "dev": true
-    },
-    "is-path-in-cwd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-      "dev": true,
-      "requires": {
-        "is-path-inside": "^1.0.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-      "dev": true,
-      "requires": {
-        "path-is-inside": "^1.0.1"
-      }
-    },
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -5532,28 +5105,8 @@
       "dev": true,
       "requires": {
         "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
       }
     },
-    "is-posix-bracket": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-      "dev": true
-    },
-    "is-primitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-      "dev": true
-    },
     "is-promise": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
@@ -5638,13 +5191,10 @@
       "dev": true
     },
     "isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-      "dev": true,
-      "requires": {
-        "isarray": "1.0.0"
-      }
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true
     },
     "isstream": {
       "version": "0.1.2",
@@ -5728,101 +5278,81 @@
       "integrity": "sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA==",
       "dev": true
     },
-    "joomla-javascript-tests": {
-      "version": "github:joomla/test-javascript#9b169a1e726392d9ea1125dd8b4e6258bb9dace7",
-      "from": "github:joomla/test-javascript#4.0-dev",
-      "dev": true,
-      "requires": {
-        "jasmine-core": "^2.4.1",
-        "karma": "^0.13.22",
-        "karma-coverage": "^1.1.1",
-        "karma-firefox-launcher": "^0.1.7",
-        "karma-fixture": "^0.2.6",
-        "karma-html2js-preprocessor": "^1.1.0",
-        "karma-jasmine": "^0.3.8",
-        "karma-json-fixtures-preprocessor": "0.0.6",
-        "karma-verbose-reporter": "0.0.3"
-      },
-      "dependencies": {
-        "bluebird": {
-          "version": "2.11.0",
-          "resolved": "http://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
-          "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=",
-          "dev": true
-        },
-        "jasmine-core": {
-          "version": "2.99.1",
-          "resolved": "http://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
-          "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=",
-          "dev": true
-        },
-        "karma": {
-          "version": "0.13.22",
-          "resolved": "http://registry.npmjs.org/karma/-/karma-0.13.22.tgz",
-          "integrity": "sha1-B3ULG9Bj1+fnuRvNLmNU2PKqh0Q=",
-          "dev": true,
-          "requires": {
-            "batch": "^0.5.3",
-            "bluebird": "^2.9.27",
-            "body-parser": "^1.12.4",
-            "chokidar": "^1.4.1",
-            "colors": "^1.1.0",
-            "connect": "^3.3.5",
-            "core-js": "^2.1.0",
-            "di": "^0.0.1",
-            "dom-serialize": "^2.2.0",
-            "expand-braces": "^0.1.1",
-            "glob": "^7.0.0",
-            "graceful-fs": "^4.1.2",
-            "http-proxy": "^1.13.0",
-            "isbinaryfile": "^3.0.0",
-            "lodash": "^3.8.0",
-            "log4js": "^0.6.31",
-            "mime": "^1.3.4",
-            "minimatch": "^3.0.0",
-            "optimist": "^0.6.1",
-            "rimraf": "^2.3.3",
-            "socket.io": "^1.4.5",
-            "source-map": "^0.5.3",
-            "useragent": "^2.1.6"
-          }
-        },
-        "karma-firefox-launcher": {
-          "version": "0.1.7",
-          "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.7.tgz",
-          "integrity": "sha1-wF3YZTNpHmLzGVJZUJjovTV9OfM=",
-          "dev": true
-        },
-        "karma-jasmine": {
-          "version": "0.3.8",
-          "resolved": "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.3.8.tgz",
-          "integrity": "sha1-W2RXeRrZuJqhc/B54+vhuMgFI2w=",
-          "dev": true
-        },
-        "karma-verbose-reporter": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/karma-verbose-reporter/-/karma-verbose-reporter-0.0.3.tgz",
-          "integrity": "sha1-iSUel/bW5HDcVcdZ5oFTBDwHAxw=",
-          "dev": true,
-          "requires": {
-            "colors": ">=1.0"
-          }
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-          "dev": true
-        }
-      }
-    },
     "joomla-ui-custom-elements": {
       "version": "0.0.30",
       "resolved": "https://registry.npmjs.org/joomla-ui-custom-elements/-/joomla-ui-custom-elements-0.0.30.tgz",
       "integrity": "sha512-eFcbnk3kdhy6rd0gRQCNaNfPVSzngA189DdJaI3wRskJIX2WuoH0CRBVYX11sGWTsA8iVXLP+Sp+7ifgh1AxkA==",
       "requires": {
-        "@babel/core": "^7.1.6",
+        "@babel/core": "^7.3.4",
         "bootstrap": "^4.1.3"
+      },
+      "dependencies": {
+        "@babel/core": {
+          "version": "7.3.4",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.3.4.tgz",
+          "integrity": "sha512-jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA==",
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "@babel/generator": "^7.3.4",
+            "@babel/helpers": "^7.2.0",
+            "@babel/parser": "^7.3.4",
+            "@babel/template": "^7.2.2",
+            "@babel/traverse": "^7.3.4",
+            "@babel/types": "^7.3.4",
+            "convert-source-map": "^1.1.0",
+            "debug": "^4.1.0",
+            "json5": "^2.1.0",
+            "lodash": "^4.17.11",
+            "resolve": "^1.3.2",
+            "semver": "^5.4.1",
+            "source-map": "^0.5.0"
+          },
+          "dependencies": {
+            "@babel/generator": {
+              "version": "7.3.4",
+              "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.3.4.tgz",
+              "integrity": "sha512-8EXhHRFqlVVWXPezBW5keTiQi/rJMQTg/Y9uVCEZ0CAF3PKtCCaVRnp64Ii1ujhkoDhhF1fVsImoN4yJ2uz4Wg==",
+              "requires": {
+                "@babel/types": "^7.3.4",
+                "jsesc": "^2.5.1",
+                "lodash": "^4.17.11",
+                "source-map": "^0.5.0",
+                "trim-right": "^1.0.1"
+              }
+            },
+            "@babel/parser": {
+              "version": "7.3.4",
+              "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.3.4.tgz",
+              "integrity": "sha512-tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ=="
+            },
+            "@babel/traverse": {
+              "version": "7.3.4",
+              "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.3.4.tgz",
+              "integrity": "sha512-TvTHKp6471OYEcE/91uWmhR6PrrYywQntCHSaZ8CM8Vmp+pjAusal4nGB2WCCQd0rvI7nOMKn9GnbcvTUz3/ZQ==",
+              "requires": {
+                "@babel/code-frame": "^7.0.0",
+                "@babel/generator": "^7.3.4",
+                "@babel/helper-function-name": "^7.1.0",
+                "@babel/helper-split-export-declaration": "^7.0.0",
+                "@babel/parser": "^7.3.4",
+                "@babel/types": "^7.3.4",
+                "debug": "^4.1.0",
+                "globals": "^11.1.0",
+                "lodash": "^4.17.11"
+              }
+            },
+            "@babel/types": {
+              "version": "7.3.4",
+              "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.3.4.tgz",
+              "integrity": "sha512-WEkp8MsLftM7O/ty580wAmZzN1nDmCACc5+jFzUt+GUFNNIi3LdRlueYz0YIlmJhlZx1QYDMZL5vdWCL0fNjFQ==",
+              "requires": {
+                "esutils": "^2.0.2",
+                "lodash": "^4.17.11",
+                "to-fast-properties": "^2.0.0"
+              }
+            }
+          }
+        }
       }
     },
     "jquery": {
@@ -5836,15 +5366,15 @@
       "integrity": "sha512-NYlhcFnRh4Bv9jvadPlcAKQdVGRE0+TSgFYxQ+ZnCxUUHbwd+SjbOg+Xvu1Oea9mpQJ+2VB1eCfcBORWNQsHaA=="
     },
     "js-base64": {
-      "version": "2.4.9",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.9.tgz",
-      "integrity": "sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
+      "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==",
       "dev": true
     },
     "js-levenshtein": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.4.tgz",
-      "integrity": "sha512-PxfGzSs0ztShKrUYPIn5r0MtyAhYcCwmndozzpz8YObbPnD1jFxzlBGbRnX2mIu6Z13xN6+PTu05TQFnZFlzow==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
+      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
       "dev": true
     },
     "js-tokens": {
@@ -5853,9 +5383,9 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
-      "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+      "version": "3.12.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
+      "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
@@ -5873,6 +5403,44 @@
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
     },
+    "jshint": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jshint/-/jshint-1.1.0.tgz",
+      "integrity": "sha1-mYe5C4YFVsvH84DVdVoj1QQhNRM=",
+      "requires": {
+        "cli": "0.4.x",
+        "esprima": "https://github.com/ariya/esprima/tarball/master",
+        "minimatch": "0.x.x",
+        "peakle": "0.0.x",
+        "shelljs": "0.1.x",
+        "underscore": "1.4.x"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "https://github.com/ariya/esprima/tarball/master",
+          "integrity": "sha512-NpIIa83N47pO8m01O9ja94K9aaU8suEP+Z5w+cFzahlrCDw+dESpBpfwrqJI0RFDaAW+gJYsxZSc4T/amhR56Q=="
+        },
+        "lru-cache": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+          "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI="
+        },
+        "minimatch": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz",
+          "integrity": "sha1-vSx9Bg0sjI/Xzefx8u0tWycP2xs=",
+          "requires": {
+            "lru-cache": "2",
+            "sigmund": "~1.0.0"
+          }
+        },
+        "underscore": {
+          "version": "1.4.4",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
+          "integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ="
+        }
+      }
+    },
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -5891,15 +5459,6 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
-    "json-stable-stringify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
-      "integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=",
-      "dev": true,
-      "requires": {
-        "jsonify": "~0.0.0"
-      }
-    },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@@ -5912,12 +5471,6 @@
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
       "dev": true
     },
-    "json3": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-      "dev": true
-    },
     "json5": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
@@ -5935,18 +5488,6 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "jsonify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-      "dev": true
-    },
-    "jsonparse": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-      "dev": true
-    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -5959,34 +5500,28 @@
         "verror": "1.10.0"
       }
     },
-    "junk": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/junk/-/junk-1.0.3.tgz",
-      "integrity": "sha1-h75jSIZJy9ym9Tqzm+yczSNH9ZI=",
-      "dev": true
-    },
     "karma": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-3.1.1.tgz",
-      "integrity": "sha512-NetT3wPCQMNB36uiL9LLyhrOt8SQwrEKt0xD3+KpTCfm0VxVyUJdPL5oTq2Ic5ouemgL/Iz4wqXEbF3zea9kQQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-4.0.1.tgz",
+      "integrity": "sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==",
       "dev": true,
       "requires": {
         "bluebird": "^3.3.0",
         "body-parser": "^1.16.1",
+        "braces": "^2.3.2",
         "chokidar": "^2.0.3",
         "colors": "^1.1.0",
-        "combine-lists": "^1.0.0",
         "connect": "^3.6.0",
         "core-js": "^2.2.0",
         "di": "^0.0.1",
         "dom-serialize": "^2.2.0",
-        "expand-braces": "^0.1.1",
+        "flatted": "^2.0.0",
         "glob": "^7.1.1",
         "graceful-fs": "^4.1.2",
         "http-proxy": "^1.13.0",
         "isbinaryfile": "^3.0.0",
-        "lodash": "^4.17.4",
-        "log4js": "^3.0.0",
+        "lodash": "^4.17.11",
+        "log4js": "^4.0.0",
         "mime": "^2.3.1",
         "minimatch": "^3.0.2",
         "optimist": "^0.6.1",
@@ -5997,735 +5532,132 @@
         "socket.io": "2.1.1",
         "source-map": "^0.6.1",
         "tmp": "0.0.33",
-        "useragent": "2.2.1"
+        "useragent": "2.3.0"
       },
       "dependencies": {
-        "accepts": {
-          "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
-          "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
-          "dev": true,
-          "requires": {
-            "mime-types": "~2.1.18",
-            "negotiator": "0.6.1"
-          }
-        },
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          }
-        },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+        "core-js": {
+          "version": "2.6.5",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+          "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
           "dev": true
         },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
-        },
-        "arraybuffer.slice": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-          "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
-          "dev": true
-        },
-        "blob": {
-          "version": "0.0.5",
-          "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
-          "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-          "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.0",
-            "braces": "^2.3.0",
-            "fsevents": "^1.2.2",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.1",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "lodash.debounce": "^4.0.8",
-            "normalize-path": "^2.1.1",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0",
-            "upath": "^1.0.5"
-          }
-        },
-        "circular-json": {
-          "version": "0.5.9",
-          "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
-          "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==",
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        }
+      }
+    },
+    "karma-coverage": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-1.1.2.tgz",
+      "integrity": "sha512-eQawj4Cl3z/CjxslYy9ariU4uDh7cCNFZHNWXWRpl0pNeblY/4wHR7M7boTYXWrn9bY0z2pZmr11eKje/S/hIw==",
+      "dev": true,
+      "requires": {
+        "dateformat": "^1.0.6",
+        "istanbul": "^0.4.0",
+        "lodash": "^4.17.0",
+        "minimatch": "^3.0.0",
+        "source-map": "^0.5.1"
+      }
+    },
+    "karma-firefox-launcher": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz",
+      "integrity": "sha512-LbZ5/XlIXLeQ3cqnCbYLn+rOVhuMIK9aZwlP6eOLGzWdo1UVp7t6CN3DP4SafiRLjexKwHeKHDm0c38Mtd3VxA==",
+      "dev": true
+    },
+    "karma-fixture": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/karma-fixture/-/karma-fixture-0.2.6.tgz",
+      "integrity": "sha1-lxzqjCFtc/BwQ5ZMtz8Q4IMAGO8=",
+      "dev": true
+    },
+    "karma-html2js-preprocessor": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/karma-html2js-preprocessor/-/karma-html2js-preprocessor-1.1.0.tgz",
+      "integrity": "sha1-/Ant8Eu+K7bu6boZaPgmtziAIL0=",
+      "dev": true
+    },
+    "karma-jasmine": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-2.0.1.tgz",
+      "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==",
+      "dev": true,
+      "requires": {
+        "jasmine-core": "^3.3"
+      }
+    },
+    "karma-jasmine-ajax": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/karma-jasmine-ajax/-/karma-jasmine-ajax-0.1.13.tgz",
+      "integrity": "sha1-eLuS2Jb+MqJaGACYxHci4dlgW/w=",
+      "dev": true,
+      "requires": {
+        "jasmine-ajax": "^3.0.0"
+      }
+    },
+    "karma-json-fixtures-preprocessor": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/karma-json-fixtures-preprocessor/-/karma-json-fixtures-preprocessor-0.0.6.tgz",
+      "integrity": "sha1-T3ii6800OH+OVaur/2NGVRZMTHY=",
+      "dev": true
+    },
+    "karma-verbose-reporter": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/karma-verbose-reporter/-/karma-verbose-reporter-0.0.6.tgz",
+      "integrity": "sha1-WQkFJFHGB/Aqx3x2N5Gi/hJRJgw=",
+      "dev": true,
+      "requires": {
+        "colors": ">=1.0"
+      }
+    },
+    "kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "requires": {
+        "is-buffer": "^1.1.5"
+      }
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4="
+    },
+    "lazystream": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
+      "integrity": "sha1-GyXWPHcqTCDwpe0KnXf0hLbhaSA=",
+      "requires": {
+        "readable-stream": "~1.0.2"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
         },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "engine.io": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
-          "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
-          "dev": true,
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "requires": {
-            "accepts": "~1.3.4",
-            "base64id": "1.0.0",
-            "cookie": "0.3.1",
-            "debug": "~3.1.0",
-            "engine.io-parser": "~2.1.0",
-            "ws": "~3.3.1"
-          },
-          "dependencies": {
-            "debug": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-              "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-              "dev": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            }
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
           }
-        },
-        "engine.io-client": {
-          "version": "3.2.1",
-          "resolved": "http://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
-          "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
-          "dev": true,
-          "requires": {
-            "component-emitter": "1.2.1",
-            "component-inherit": "0.0.3",
-            "debug": "~3.1.0",
-            "engine.io-parser": "~2.1.1",
-            "has-cors": "1.1.0",
-            "indexof": "0.0.1",
-            "parseqs": "0.0.5",
-            "parseuri": "0.0.5",
-            "ws": "~3.3.1",
-            "xmlhttprequest-ssl": "~1.5.4",
-            "yeast": "0.1.2"
-          },
-          "dependencies": {
-            "debug": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-              "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-              "dev": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            }
-          }
-        },
-        "engine.io-parser": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
-          "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==",
-          "dev": true,
-          "requires": {
-            "after": "0.8.2",
-            "arraybuffer.slice": "~0.0.7",
-            "base64-arraybuffer": "0.1.5",
-            "blob": "0.0.5",
-            "has-binary2": "~1.0.2"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
-              }
-            },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
-          "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isarray": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
-          "dev": true
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        },
-        "log4js": {
-          "version": "3.0.6",
-          "resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz",
-          "integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==",
-          "dev": true,
-          "requires": {
-            "circular-json": "^0.5.5",
-            "date-format": "^1.2.0",
-            "debug": "^3.1.0",
-            "rfdc": "^1.1.2",
-            "streamroller": "0.7.0"
-          },
-          "dependencies": {
-            "debug": {
-              "version": "3.2.6",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-              "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-              "dev": true,
-              "requires": {
-                "ms": "^2.1.1"
-              }
-            },
-            "ms": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-              "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-              "dev": true
-            }
-          }
-        },
-        "lru-cache": {
-          "version": "2.2.4",
-          "resolved": "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
-          "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "mime": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz",
-          "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "socket.io": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
-          "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
-          "dev": true,
-          "requires": {
-            "debug": "~3.1.0",
-            "engine.io": "~3.2.0",
-            "has-binary2": "~1.0.2",
-            "socket.io-adapter": "~1.1.0",
-            "socket.io-client": "2.1.1",
-            "socket.io-parser": "~3.2.0"
-          },
-          "dependencies": {
-            "debug": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-              "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-              "dev": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            }
-          }
-        },
-        "socket.io-adapter": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
-          "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=",
-          "dev": true
-        },
-        "socket.io-client": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
-          "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
-          "dev": true,
-          "requires": {
-            "backo2": "1.0.2",
-            "base64-arraybuffer": "0.1.5",
-            "component-bind": "1.0.0",
-            "component-emitter": "1.2.1",
-            "debug": "~3.1.0",
-            "engine.io-client": "~3.2.0",
-            "has-binary2": "~1.0.2",
-            "has-cors": "1.1.0",
-            "indexof": "0.0.1",
-            "object-component": "0.0.3",
-            "parseqs": "0.0.5",
-            "parseuri": "0.0.5",
-            "socket.io-parser": "~3.2.0",
-            "to-array": "0.1.4"
-          },
-          "dependencies": {
-            "debug": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-              "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-              "dev": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            }
-          }
-        },
-        "socket.io-parser": {
-          "version": "3.2.0",
-          "resolved": "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
-          "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
-          "dev": true,
-          "requires": {
-            "component-emitter": "1.2.1",
-            "debug": "~3.1.0",
-            "isarray": "2.0.1"
-          },
-          "dependencies": {
-            "debug": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-              "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-              "dev": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            }
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "ultron": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-          "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
-          "dev": true
-        },
-        "useragent": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz",
-          "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "2.2.x",
-            "tmp": "0.0.x"
-          }
-        },
-        "ws": {
-          "version": "3.3.3",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-          "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
-          "dev": true,
-          "requires": {
-            "async-limiter": "~1.0.0",
-            "safe-buffer": "~5.1.0",
-            "ultron": "~1.1.0"
-          }
-        },
-        "xmlhttprequest-ssl": {
-          "version": "1.5.5",
-          "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
-          "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
-          "dev": true
         }
       }
     },
-    "karma-coverage": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-1.1.2.tgz",
-      "integrity": "sha512-eQawj4Cl3z/CjxslYy9ariU4uDh7cCNFZHNWXWRpl0pNeblY/4wHR7M7boTYXWrn9bY0z2pZmr11eKje/S/hIw==",
-      "dev": true,
-      "requires": {
-        "dateformat": "^1.0.6",
-        "istanbul": "^0.4.0",
-        "lodash": "^4.17.0",
-        "minimatch": "^3.0.0",
-        "source-map": "^0.5.1"
-      }
-    },
-    "karma-firefox-launcher": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz",
-      "integrity": "sha512-LbZ5/XlIXLeQ3cqnCbYLn+rOVhuMIK9aZwlP6eOLGzWdo1UVp7t6CN3DP4SafiRLjexKwHeKHDm0c38Mtd3VxA==",
-      "dev": true
-    },
-    "karma-fixture": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/karma-fixture/-/karma-fixture-0.2.6.tgz",
-      "integrity": "sha1-lxzqjCFtc/BwQ5ZMtz8Q4IMAGO8=",
-      "dev": true
-    },
-    "karma-html2js-preprocessor": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/karma-html2js-preprocessor/-/karma-html2js-preprocessor-1.1.0.tgz",
-      "integrity": "sha1-/Ant8Eu+K7bu6boZaPgmtziAIL0=",
-      "dev": true
-    },
-    "karma-jasmine": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-2.0.1.tgz",
-      "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==",
-      "dev": true,
-      "requires": {
-        "jasmine-core": "^3.3"
-      }
-    },
-    "karma-jasmine-ajax": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/karma-jasmine-ajax/-/karma-jasmine-ajax-0.1.13.tgz",
-      "integrity": "sha1-eLuS2Jb+MqJaGACYxHci4dlgW/w=",
-      "dev": true,
-      "requires": {
-        "jasmine-ajax": "^3.0.0"
-      }
-    },
-    "karma-json-fixtures-preprocessor": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/karma-json-fixtures-preprocessor/-/karma-json-fixtures-preprocessor-0.0.6.tgz",
-      "integrity": "sha1-T3ii6800OH+OVaur/2NGVRZMTHY=",
-      "dev": true
-    },
-    "karma-verbose-reporter": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/karma-verbose-reporter/-/karma-verbose-reporter-0.0.6.tgz",
-      "integrity": "sha1-WQkFJFHGB/Aqx3x2N5Gi/hJRJgw=",
-      "dev": true,
-      "requires": {
-        "colors": ">=1.0"
-      }
-    },
-    "kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "requires": {
-        "is-buffer": "^1.1.5"
-      }
-    },
-    "labeled-stream-splicer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz",
-      "integrity": "sha512-MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "isarray": "^2.0.4",
-        "stream-splicer": "^2.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz",
-          "integrity": "sha512-GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA==",
-          "dev": true
-        }
-      }
-    },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
+    "less": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/less/-/less-1.3.3.tgz",
+      "integrity": "sha1-fujzAKQQgPNUTIDHpwzfamEoDPk=",
       "requires": {
-        "invert-kv": "^1.0.0"
+        "ycssmin": ">=1.0.1"
       }
     },
     "levn": {
@@ -6748,23 +5680,16 @@
         "parse-json": "^2.2.0",
         "pify": "^2.0.0",
         "strip-bom": "^3.0.0"
-      }
-    },
-    "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "requires": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
       },
       "dependencies": {
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
+        "parse-json": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.2.0"
+          }
         }
       }
     },
@@ -6790,10 +5715,10 @@
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
       "dev": true
     },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
       "dev": true
     },
     "lodash.isplainobject": {
@@ -6803,9 +5728,9 @@
       "dev": true
     },
     "lodash.memoize": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
-      "integrity": "sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
       "dev": true
     },
     "lodash.mergewith": {
@@ -6827,47 +5752,34 @@
       "dev": true
     },
     "log4js": {
-      "version": "0.6.38",
-      "resolved": "http://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz",
-      "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.0.2.tgz",
+      "integrity": "sha512-KE7HjiieVDPPdveA3bJZSuu0n8chMkFl8mIoisBFxwEJ9FmXe4YzNuiqSwYUiR1K8q8/5/8Yd6AClENY1RA9ww==",
       "dev": true,
       "requires": {
-        "readable-stream": "~1.0.2",
-        "semver": "~4.3.3"
+        "date-format": "^2.0.0",
+        "debug": "^3.1.0",
+        "flatted": "^2.0.0",
+        "rfdc": "^1.1.2",
+        "streamroller": "^1.0.1"
       },
       "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "ms": "^2.1.1"
           }
-        },
-        "semver": {
-          "version": "4.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
         }
       }
     },
+    "longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc="
+    },
     "loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -6887,13 +5799,13 @@
       }
     },
     "lru-cache": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.4.tgz",
-      "integrity": "sha512-EPstzZ23znHUVLKj+lcXO1KvZkrlw+ZirdwvOmnAnA/1PB4ggyXJ77LRkCqkff+ShQ+cqoxCxLQOh4cKITO5iA==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
       "requires": {
         "pseudomap": "^1.0.2",
-        "yallist": "^3.0.2"
+        "yallist": "^2.1.2"
       }
     },
     "map-cache": {
@@ -6917,35 +5829,6 @@
         "object-visit": "^1.0.0"
       }
     },
-    "math-random": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
-      "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=",
-      "dev": true
-    },
-    "maximatch": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/maximatch/-/maximatch-0.1.0.tgz",
-      "integrity": "sha1-hs2NawTJ8wfAWmuUGZBtA2D7E6I=",
-      "dev": true,
-      "requires": {
-        "array-differ": "^1.0.0",
-        "array-union": "^1.0.1",
-        "arrify": "^1.0.0",
-        "minimatch": "^3.0.0"
-      }
-    },
-    "md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
     "mdn-data": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz",
@@ -6984,6 +5867,16 @@
         "trim-newlines": "^1.0.0"
       },
       "dependencies": {
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "dev": true,
+          "requires": {
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
         "load-json-file": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -6997,6 +5890,24 @@
             "strip-bom": "^2.0.0"
           }
         },
+        "parse-json": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "^2.0.0"
+          }
+        },
         "path-type": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
@@ -7014,72 +5925,134 @@
           "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
           "dev": true,
           "requires": {
-            "load-json-file": "^1.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^1.0.0"
+            "load-json-file": "^1.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^1.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+          "dev": true,
+          "requires": {
+            "find-up": "^1.0.0",
+            "read-pkg": "^1.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+          "dev": true,
+          "requires": {
+            "is-utf8": "^0.2.0"
+          }
+        }
+      }
+    },
+    "merge": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
+      "dev": true
+    },
+    "metismenujs": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/metismenujs/-/metismenujs-1.0.3.tgz",
+      "integrity": "sha512-sAW2c6zu3AqOX3VDT0vhXw4lyJ2s84NfwlOAc7/xFj7N3ARgA3z6WuG8K+X58oNzrtq0iQwv//PhXI5l8vLZbQ=="
+    },
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+          "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.2",
+            "isobject": "^3.0.1"
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         },
-        "read-pkg-up": {
+        "is-extendable": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
-            "find-up": "^1.0.0",
-            "read-pkg": "^1.0.0"
+            "is-plain-object": "^2.0.4"
           }
         },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-          "dev": true,
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
         }
       }
     },
-    "metismenujs": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/metismenujs/-/metismenujs-1.0.3.tgz",
-      "integrity": "sha512-sAW2c6zu3AqOX3VDT0vhXw4lyJ2s84NfwlOAc7/xFj7N3ARgA3z6WuG8K+X58oNzrtq0iQwv//PhXI5l8vLZbQ=="
-    },
-    "micromatch": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^2.0.0",
-        "array-unique": "^0.2.1",
-        "braces": "^1.8.2",
-        "expand-brackets": "^0.1.4",
-        "extglob": "^0.3.1",
-        "filename-regex": "^2.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.1",
-        "kind-of": "^3.0.2",
-        "normalize-path": "^2.0.1",
-        "object.omit": "^2.0.0",
-        "parse-glob": "^3.0.4",
-        "regex-cache": "^0.4.2"
-      }
-    },
-    "miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      }
-    },
     "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+      "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
       "dev": true
     },
     "mime-db": {
@@ -7111,23 +6084,10 @@
         "dom-walk": "^0.1.0"
       }
     },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
-    },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -7181,29 +6141,6 @@
         }
       }
     },
-    "module-deps": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.0.tgz",
-      "integrity": "sha512-hKPmO06so6bL/ZvqVNVqdTVO8UAYsi3tQWlCa+z9KuWhoN4KDQtb5hcqQQv58qYiDE21wIvnttZEPiDgEbpwbA==",
-      "dev": true,
-      "requires": {
-        "JSONStream": "^1.0.3",
-        "browser-resolve": "^1.7.0",
-        "cached-path-relative": "^1.0.0",
-        "concat-stream": "~1.6.0",
-        "defined": "^1.0.0",
-        "detective": "^5.0.2",
-        "duplexer2": "^0.1.2",
-        "inherits": "^2.0.1",
-        "parents": "^1.0.0",
-        "readable-stream": "^2.0.2",
-        "resolve": "^1.4.0",
-        "stream-combiner2": "^1.1.1",
-        "subarg": "^1.0.0",
-        "through2": "^2.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
     "ms": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
@@ -7216,9 +6153,9 @@
       "dev": true
     },
     "nan": {
-      "version": "2.11.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
-      "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
+      "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==",
       "dev": true
     },
     "nanomatch": {
@@ -7240,17 +6177,63 @@
         "to-regex": "^3.0.1"
       },
       "dependencies": {
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+          "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.2",
+            "isobject": "^3.0.1"
+          }
         },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
         },
         "kind-of": {
           "version": "6.0.2",
@@ -7307,18 +6290,18 @@
       }
     },
     "node-releases": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.0.4.tgz",
-      "integrity": "sha512-GqRV9GcHw8JCRDaP/JoeNMNzEGzHAknMvIHqMb2VeTOmg1Cf9+ej8bkV12tHfzWHQMCkQ5zUFgwFUkfraynNCw==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.11.tgz",
+      "integrity": "sha512-8v1j5KfP+s5WOTa1spNUAOfreajQPN12JXbRR0oDE+YrJBQCXBnNqUDj27EKpPLOoSiU3tKi3xGPB+JaOdUEQQ==",
       "dev": true,
       "requires": {
         "semver": "^5.3.0"
       }
     },
     "node-sass": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.10.0.tgz",
-      "integrity": "sha512-fDQJfXszw6vek63Fe/ldkYXmRYK/QS6NbvM3i5oEo9ntPDy4XX7BcKZyTKv+/kSSxRtXXc7l+MSwEmYc0CSy6Q==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz",
+      "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
       "dev": true,
       "requires": {
         "async-foreach": "^0.1.3",
@@ -7342,6 +6325,12 @@
         "true-case-path": "^1.0.2"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
@@ -7371,6 +6360,15 @@
             "which": "^1.2.9"
           }
         },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -7389,9 +6387,9 @@
       }
     },
     "normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
+      "integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
       "dev": true,
       "requires": {
         "hosted-git-info": "^2.1.4",
@@ -7401,13 +6399,10 @@
       }
     },
     "normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "requires": {
-        "remove-trailing-separator": "^1.0.1"
-      }
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
     },
     "normalize-range": {
       "version": "0.1.2",
@@ -7481,17 +6476,6 @@
         "copy-descriptor": "^0.1.0",
         "define-property": "^0.2.5",
         "kind-of": "^3.0.3"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
       }
     },
     "object-keys": {
@@ -7507,14 +6491,6 @@
       "dev": true,
       "requires": {
         "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
       }
     },
     "object.assign": {
@@ -7530,15 +6506,15 @@
       }
     },
     "object.entries": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.0.4.tgz",
-      "integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.0.tgz",
+      "integrity": "sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.6.1",
-        "function-bind": "^1.1.0",
-        "has": "^1.0.1"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.12.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
       }
     },
     "object.getownpropertydescriptors": {
@@ -7551,16 +6527,6 @@
         "es-abstract": "^1.5.1"
       }
     },
-    "object.omit": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-      "dev": true,
-      "requires": {
-        "for-own": "^0.1.4",
-        "is-extendable": "^0.1.1"
-      }
-    },
     "object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
@@ -7568,26 +6534,18 @@
       "dev": true,
       "requires": {
         "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
       }
     },
     "object.values": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz",
-      "integrity": "sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
+      "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.6.1",
-        "function-bind": "^1.1.0",
-        "has": "^1.0.1"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.12.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
       }
     },
     "on-finished": {
@@ -7603,7 +6561,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -7663,33 +6620,12 @@
         "wordwrap": "~1.0.0"
       }
     },
-    "options": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
-      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=",
-      "dev": true
-    },
-    "os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-      "dev": true
-    },
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
       "dev": true
     },
-    "os-locale": {
-      "version": "1.4.0",
-      "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dev": true,
-      "requires": {
-        "lcid": "^1.0.0"
-      }
-    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -7706,86 +6642,31 @@
         "os-tmpdir": "^1.0.0"
       }
     },
-    "p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dev": true,
-      "requires": {
-        "p-try": "^1.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
-      "requires": {
-        "p-limit": "^1.1.0"
-      }
-    },
-    "p-try": {
+    "parent-module": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true
-    },
-    "pako": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
-      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
-      "dev": true
-    },
-    "parents": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
-      "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=",
-      "dev": true,
-      "requires": {
-        "path-platform": "~0.11.15"
-      }
-    },
-    "parse-asn1": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
-      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
-      "dev": true,
-      "requires": {
-        "asn1.js": "^4.0.0",
-        "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3"
-      }
-    },
-    "parse-glob": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.0.tgz",
+      "integrity": "sha512-8Mf5juOMmiE4FcmzYc4IaiS9L3+9paz2KOiXzkRviCP6aDmN49Hz6EMWz0lGNp9pX80GvvAuLADtyGfW/Em3TA==",
       "dev": true,
       "requires": {
-        "glob-base": "^0.3.0",
-        "is-dotfile": "^1.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.0"
+        "callsites": "^3.0.0"
+      },
+      "dependencies": {
+        "callsites": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.0.0.tgz",
+          "integrity": "sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==",
+          "dev": true
+        }
       }
     },
     "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "requires": {
-        "error-ex": "^1.2.0"
-      }
-    },
-    "parsejson": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz",
-      "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
       "dev": true,
       "requires": {
-        "better-assert": "~1.0.0"
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
       }
     },
     "parseqs": {
@@ -7833,15 +6714,18 @@
           "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
           "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
           "dev": true
+        },
+        "util": {
+          "version": "0.10.4",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+          "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
         }
       }
     },
-    "path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
-    },
     "path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
@@ -7849,19 +6733,15 @@
       "dev": true
     },
     "path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dev": true,
-      "requires": {
-        "pinkie-promise": "^2.0.0"
-      }
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true
     },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "path-is-inside": {
       "version": "1.0.2",
@@ -7880,12 +6760,6 @@
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
     },
-    "path-platform": {
-      "version": "0.11.15",
-      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
-      "integrity": "sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=",
-      "dev": true
-    },
     "path-type": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
@@ -7895,18 +6769,10 @@
         "pify": "^2.0.0"
       }
     },
-    "pbkdf2": {
-      "version": "3.0.17",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
-      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
-      "dev": true,
-      "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
+    "peakle": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/peakle/-/peakle-0.0.1.tgz",
+      "integrity": "sha1-KGRF1qdzPxfcJzUB4uA5n0G4kOA="
     },
     "performance-now": {
       "version": "2.1.0",
@@ -7936,24 +6802,63 @@
       }
     },
     "pkg-dir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
-      "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
       "dev": true,
       "requires": {
-        "find-up": "^1.0.0"
+        "find-up": "^2.1.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        }
       }
     },
-    "pluralize": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
-      "dev": true
-    },
     "popper.js": {
-      "version": "1.14.5",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.5.tgz",
-      "integrity": "sha512-fs4Sd8bZLgEzrk8aS7Em1qh+wcawtE87kRUJQhK6+LndyV1HerX7+LURzAylVaTyWIn5NTB/lyjnWqw/AZ6Yrw=="
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.7.tgz",
+      "integrity": "sha512-4q1hNvoUre/8srWsH7hnoSJ5xVmIL4qgz+s4qf2TnJIMyZFUFMGH+9vE7mXynAlHSZ/NdTmmow86muD0myUkVQ=="
     },
     "posix-character-classes": {
       "version": "0.1.1",
@@ -7962,14 +6867,14 @@
       "dev": true
     },
     "postcss": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.6.tgz",
-      "integrity": "sha512-Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug==",
+      "version": "7.0.14",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
+      "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.1",
+        "chalk": "^2.4.2",
         "source-map": "^0.6.1",
-        "supports-color": "^5.5.0"
+        "supports-color": "^6.1.0"
       },
       "dependencies": {
         "source-map": {
@@ -7977,6 +6882,15 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -7993,9 +6907,9 @@
       }
     },
     "postcss-colormin": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.2.tgz",
-      "integrity": "sha512-1QJc2coIehnVFsz0otges8kQLsryi4lo19WD+U5xCWvXd0uw/Z+KKYnbiNDCnO9GP+PvErPHCG0jNvWTngk9Rw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
+      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -8016,9 +6930,9 @@
       }
     },
     "postcss-discard-comments": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.1.tgz",
-      "integrity": "sha512-Ay+rZu1Sz6g8IdzRjUgG2NafSNpp2MSMOQUb+9kkzzzP+kh07fP0yNbhtFejURnyVXSX3FYy2nVNW1QTnNjgBQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
+      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
       "dev": true,
       "requires": {
         "postcss": "^7.0.0"
@@ -8052,9 +6966,9 @@
       }
     },
     "postcss-merge-longhand": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.9.tgz",
-      "integrity": "sha512-UVMXrXF5K/kIwUbK/crPFCytpWbNX2Q3dZSc8+nQUgfOHrCT4+MHncpdxVphUlQeZxlLXUJbDyXc5NBhTnS2tA==",
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
+      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
       "dev": true,
       "requires": {
         "css-color-names": "0.0.4",
@@ -8064,9 +6978,9 @@
       }
     },
     "postcss-merge-rules": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.2.tgz",
-      "integrity": "sha512-UiuXwCCJtQy9tAIxsnurfF0mrNHKc4NnNx6NxqmzNNjXpQwLSukUxELHTRF0Rg1pAmcoKLih8PwvZbiordchag==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
+      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -8101,9 +7015,9 @@
       }
     },
     "postcss-minify-gradients": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.1.tgz",
-      "integrity": "sha512-pySEW3E6Ly5mHm18rekbWiAjVi/Wj8KKt2vwSfVFAWdW6wOIekgqxKxLU7vJfb107o3FDNPkaYFCxGAJBFyogA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
+      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
       "dev": true,
       "requires": {
         "cssnano-util-get-arguments": "^4.0.0",
@@ -8113,9 +7027,9 @@
       }
     },
     "postcss-minify-params": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.1.tgz",
-      "integrity": "sha512-h4W0FEMEzBLxpxIVelRtMheskOKKp52ND6rJv+nBS33G1twu2tCyurYj/YtgU76+UDCvWeNs0hs8HFAWE2OUFg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
+      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
       "dev": true,
       "requires": {
         "alphanum-sort": "^1.0.0",
@@ -8127,9 +7041,9 @@
       }
     },
     "postcss-minify-selectors": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.1.tgz",
-      "integrity": "sha512-8+plQkomve3G+CodLCgbhAKrb5lekAnLYuL1d7Nz+/7RANpBEVdgBkPNwljfSKvZ9xkkZTZITd04KP+zeJTJqg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
+      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
       "dev": true,
       "requires": {
         "alphanum-sort": "^1.0.0",
@@ -8161,9 +7075,9 @@
       }
     },
     "postcss-normalize-display-values": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.1.tgz",
-      "integrity": "sha512-R5mC4vaDdvsrku96yXP7zak+O3Mm9Y8IslUobk7IMP+u/g+lXvcN4jngmHY5zeJnrQvE13dfAg5ViU05ZFDwdg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
+      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
       "dev": true,
       "requires": {
         "cssnano-util-get-match": "^4.0.0",
@@ -8172,9 +7086,9 @@
       }
     },
     "postcss-normalize-positions": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.1.tgz",
-      "integrity": "sha512-GNoOaLRBM0gvH+ZRb2vKCIujzz4aclli64MBwDuYGU2EY53LwiP7MxOZGE46UGtotrSnmarPPZ69l2S/uxdaWA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
+      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
       "dev": true,
       "requires": {
         "cssnano-util-get-arguments": "^4.0.0",
@@ -8184,9 +7098,9 @@
       }
     },
     "postcss-normalize-repeat-style": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.1.tgz",
-      "integrity": "sha512-fFHPGIjBUyUiswY2rd9rsFcC0t3oRta4wxE1h3lpwfQZwFeFjXFSiDtdJ7APCmHQOnUZnqYBADNRPKPwFAONgA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
+      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
       "dev": true,
       "requires": {
         "cssnano-util-get-arguments": "^4.0.0",
@@ -8196,9 +7110,9 @@
       }
     },
     "postcss-normalize-string": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.1.tgz",
-      "integrity": "sha512-IJoexFTkAvAq5UZVxWXAGE0yLoNN/012v7TQh5nDo6imZJl2Fwgbhy3J2qnIoaDBrtUP0H7JrXlX1jjn2YcvCQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
+      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
       "dev": true,
       "requires": {
         "has": "^1.0.0",
@@ -8207,9 +7121,9 @@
       }
     },
     "postcss-normalize-timing-functions": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.1.tgz",
-      "integrity": "sha512-1nOtk7ze36+63ONWD8RCaRDYsnzorrj+Q6fxkQV+mlY5+471Qx9kspqv0O/qQNMeApg8KNrRf496zHwJ3tBZ7w==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
+      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
       "dev": true,
       "requires": {
         "cssnano-util-get-match": "^4.0.0",
@@ -8241,9 +7155,9 @@
       }
     },
     "postcss-normalize-whitespace": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.1.tgz",
-      "integrity": "sha512-U8MBODMB2L+nStzOk6VvWWjZgi5kQNShCyjRhMT3s+W9Jw93yIjOnrEkKYD3Ul7ChWbEcjDWmXq0qOL9MIAnAw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
+      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
       "dev": true,
       "requires": {
         "postcss": "^7.0.0",
@@ -8251,9 +7165,9 @@
       }
     },
     "postcss-ordered-values": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.1.tgz",
-      "integrity": "sha512-PeJiLgJWPzkVF8JuKSBcylaU+hDJ/TX3zqAMIjlghgn1JBi6QwQaDZoDIlqWRcCAI8SxKrt3FCPSRmOgKRB97Q==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
+      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
       "dev": true,
       "requires": {
         "cssnano-util-get-arguments": "^4.0.0",
@@ -8262,9 +7176,9 @@
       }
     },
     "postcss-reduce-initial": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.2.tgz",
-      "integrity": "sha512-epUiC39NonKUKG+P3eAOKKZtm5OtAtQJL7Ye0CBN1f+UQTHzqotudp+hki7zxXm7tT0ZAKDMBj1uihpPjP25ug==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
+      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -8274,9 +7188,9 @@
       }
     },
     "postcss-reduce-transforms": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.1.tgz",
-      "integrity": "sha512-sZVr3QlGs0pjh6JAIe6DzWvBaqYw05V1t3d9Tp+VnFRT5j+rsqoWsysh/iSD7YNsULjq9IAylCznIwVd5oU/zA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
+      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
       "dev": true,
       "requires": {
         "cssnano-util-get-match": "^4.0.0",
@@ -8286,9 +7200,9 @@
       }
     },
     "postcss-selector-parser": {
-      "version": "5.0.0-rc.4",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0-rc.4.tgz",
-      "integrity": "sha512-0XvfYuShrKlTk1ooUrVzMCFQRcypsdEIsGqh5IxC5rdtBi4/M/tDAJeSONwC2MTqEFsmPZYAV7Dd4X8rgAfV0A==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+      "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
       "dev": true,
       "requires": {
         "cssesc": "^2.0.0",
@@ -8297,9 +7211,9 @@
       }
     },
     "postcss-svgo": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.1.tgz",
-      "integrity": "sha512-YD5uIk5NDRySy0hcI+ZJHwqemv2WiqqzDgtvgMzO8EGSkK5aONyX8HMVFRFJSdO8wUWTuisUFn/d7yRRbBr5Qw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
+      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
       "dev": true,
       "requires": {
         "is-svg": "^3.0.0",
@@ -8331,11 +7245,10 @@
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
       "dev": true
     },
-    "preserve": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-      "dev": true
+    "prettysize": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/prettysize/-/prettysize-0.0.3.tgz",
+      "integrity": "sha1-FK//amReWRpN3xxykZwjtBRhgaE="
     },
     "private": {
       "version": "0.1.8",
@@ -8355,24 +7268,9 @@
       "dev": true
     },
     "progress": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz",
-      "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==",
-      "dev": true
-    },
-    "promise": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-      "dev": true,
-      "requires": {
-        "asap": "~2.0.3"
-      }
-    },
-    "prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true
     },
     "pseudomap": {
@@ -8382,25 +7280,11 @@
       "dev": true
     },
     "psl": {
-      "version": "1.1.29",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz",
-      "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==",
+      "version": "1.1.31",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
+      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
       "dev": true
     },
-    "public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
@@ -8424,62 +7308,6 @@
       "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
       "dev": true
     },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "dev": true
-    },
-    "querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-      "dev": true
-    },
-    "randomatic": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
-      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
-      "dev": true,
-      "requires": {
-        "is-number": "^4.0.0",
-        "kind-of": "^6.0.0",
-        "math-random": "^1.0.1"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        }
-      }
-    },
-    "randombytes": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
     "range-parser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
@@ -8509,15 +7337,6 @@
         }
       }
     },
-    "read-only-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
-      "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.2"
-      }
-    },
     "read-pkg": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
@@ -8547,342 +7366,78 @@
           "requires": {
             "locate-path": "^2.0.0"
           }
-        }
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-      "dev": true,
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
-              }
-            },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
         },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
           "dev": true,
           "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
           }
         },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "p-try": "^1.0.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "p-limit": "^1.1.0"
           }
         },
-        "is-data-descriptor": {
+        "p-try": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
           "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+        }
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      },
+      "dependencies": {
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
+            "safe-buffer": "~5.1.0"
           }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
         }
       }
     },
-    "recursive-copy": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/recursive-copy/-/recursive-copy-2.0.9.tgz",
-      "integrity": "sha512-0AkHV+QtfS/1jW01z3m2t/TRTW56Fpc+xYbsoa/bqn8BCYPwmsaNjlYmUU/dyGg9w8MmGoUWihU5W+s+qjxvBQ==",
+    "readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
       "dev": true,
       "requires": {
-        "del": "^2.2.0",
-        "emitter-mixin": "0.0.3",
-        "errno": "^0.1.2",
-        "graceful-fs": "^4.1.4",
-        "junk": "^1.0.1",
-        "maximatch": "^0.1.0",
-        "mkdirp": "^0.5.1",
-        "pify": "^2.3.0",
-        "promise": "^7.0.1",
-        "slash": "^1.0.0"
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
       }
     },
     "recursive-readdir": {
@@ -8922,27 +7477,21 @@
       "dev": true
     },
     "regenerate-unicode-properties": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz",
-      "integrity": "sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz",
+      "integrity": "sha512-SbA/iNrBUf6Pv2zU8Ekv1Qbhv92yxL4hiDa2siuxs4KKn4oOoMDHXjAf7+Nz9qinUQ46B1LcWEi/PhJfPWpZWQ==",
       "dev": true,
       "requires": {
         "regenerate": "^1.4.0"
       }
     },
-    "regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-      "dev": true
-    },
-    "regex-cache": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+    "regenerator-transform": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.4.tgz",
+      "integrity": "sha512-T0QMBjK3J0MtxjPmdIMXm72Wvj2Abb0Bd4HADdfijwMdoIsyQZ6fWC7kDFhk2YinBBEMZDL7Y7wh0J1sGx3S4A==",
       "dev": true,
       "requires": {
-        "is-equal-shallow": "^0.1.3"
+        "private": "^0.1.6"
       }
     },
     "regex-not": {
@@ -8953,14 +7502,78 @@
       "requires": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
       }
     },
+    "regexp-tree": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.5.tgz",
+      "integrity": "sha512-nUmxvfJyAODw+0B13hj8CFVAxhe7fDEAgJgaotBu3nnR+IgGgZq59YedJP5VYTlkEfqjuK6TuRpnymKdatLZfQ==",
+      "dev": true
+    },
     "regexpp": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
       "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
       "dev": true
     },
+    "regexpu-core": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz",
+      "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.4.0",
+        "regenerate-unicode-properties": "^8.0.2",
+        "regjsgen": "^0.5.0",
+        "regjsparser": "^0.6.0",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.1.0"
+      }
+    },
+    "regjsgen": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz",
+      "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz",
+      "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
+      "dev": true,
+      "requires": {
+        "jsesc": "~0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        }
+      }
+    },
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
@@ -8976,8 +7589,7 @@
     "repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
     },
     "repeating": {
       "version": "2.0.1",
@@ -9028,16 +7640,6 @@
       "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
       "dev": true
     },
-    "require-uncached": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-      "dev": true,
-      "requires": {
-        "caller-path": "^0.1.0",
-        "resolve-from": "^1.0.0"
-      }
-    },
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -9045,17 +7647,17 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz",
-      "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+      "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
       "requires": {
-        "path-parse": "^1.0.5"
+        "path-parse": "^1.0.6"
       }
     },
     "resolve-from": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
       "dev": true
     },
     "resolve-url": {
@@ -9098,23 +7700,21 @@
       "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
       "dev": true
     },
-    "rimraf": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-      "dev": true,
+    "right-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
       "requires": {
-        "glob": "^7.0.5"
+        "align-text": "^0.1.1"
       }
     },
-    "ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+    "rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
       "dev": true,
       "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
+        "glob": "^7.1.3"
       }
     },
     "run-async": {
@@ -9127,9 +7727,9 @@
       }
     },
     "rxjs": {
-      "version": "6.3.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-      "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+      "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
       "dev": true,
       "requires": {
         "tslib": "^1.9.0"
@@ -9165,6 +7765,208 @@
         "lodash": "^4.0.0",
         "scss-tokenizer": "^0.2.3",
         "yargs": "^7.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+          "dev": true,
+          "requires": {
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wrap-ansi": "^2.0.0"
+          }
+        },
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "dev": true,
+          "requires": {
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "invert-kv": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+          "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "lcid": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+          "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+          "dev": true,
+          "requires": {
+            "invert-kv": "^1.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^2.2.0",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0",
+            "strip-bom": "^2.0.0"
+          }
+        },
+        "os-locale": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+          "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+          "dev": true,
+          "requires": {
+            "lcid": "^1.0.0"
+          }
+        },
+        "parse-json": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "path-type": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "read-pkg": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^1.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^1.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+          "dev": true,
+          "requires": {
+            "find-up": "^1.0.0",
+            "read-pkg": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "dev": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+          "dev": true,
+          "requires": {
+            "is-utf8": "^0.2.0"
+          }
+        },
+        "which-module": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+          "dev": true
+        },
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+          "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^3.0.0",
+            "cliui": "^3.2.0",
+            "decamelize": "^1.1.1",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^1.4.0",
+            "read-pkg-up": "^1.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^1.0.2",
+            "which-module": "^1.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^5.0.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+          "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^3.0.0"
+          }
+        }
       }
     },
     "sax": {
@@ -9210,22 +8012,11 @@
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
       "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
       "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
       }
     },
     "setprototypeof": {
@@ -9234,26 +8025,6 @@
       "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
       "dev": true
     },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "shasum": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
-      "integrity": "sha1-5wEjENj0F/TetXEhUOVni4euVl8=",
-      "dev": true,
-      "requires": {
-        "json-stable-stringify": "~0.0.0",
-        "sha.js": "~2.4.4"
-      }
-    },
     "shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -9269,17 +8040,15 @@
       "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
       "dev": true
     },
-    "shell-quote": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
-      "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
-      "dev": true,
-      "requires": {
-        "array-filter": "~0.0.0",
-        "array-map": "~0.0.0",
-        "array-reduce": "~0.0.0",
-        "jsonify": "~0.0.0"
-      }
+    "shelljs": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.1.4.tgz",
+      "integrity": "sha1-37vnjVbDwBaNL7eeEOzR28sH7A4="
+    },
+    "sigmund": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA="
     },
     "signal-exit": {
       "version": "3.0.2",
@@ -9287,12 +8056,6 @@
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
       "dev": true
     },
-    "simple-concat": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz",
-      "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=",
-      "dev": true
-    },
     "simple-swizzle": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
@@ -9310,18 +8073,56 @@
         }
       }
     },
-    "slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-      "dev": true
+    "skipto": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/skipto/-/skipto-2.0.3.tgz",
+      "integrity": "sha512-LPN2iQa//xC2movc1LH1d0VTYATXN778LuNB3AUESnZJe0MV3pRlzhwC5kWTce0ENHX+9cmOt7cTT2gz32wUOw==",
+      "requires": {
+        "grunt": "~0.4.2",
+        "grunt-contrib-clean": "~0.4.1",
+        "grunt-contrib-compress": "~0.5.2",
+        "grunt-contrib-concat": "~0.3.0",
+        "grunt-contrib-copy": "~0.4.1",
+        "grunt-contrib-jshint": "~0.6.5",
+        "grunt-contrib-less": "~0.5.2",
+        "grunt-contrib-uglify": "~0.2.7",
+        "grunt-replace": "~0.4.4",
+        "jshint": "~1.1.0",
+        "less": "~1.3.3",
+        "uglify-js": "~2.8.0"
+      },
+      "dependencies": {
+        "uglify-js": {
+          "version": "2.8.29",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+          "requires": {
+            "source-map": "~0.5.1",
+            "uglify-to-browserify": "~1.0.0",
+            "yargs": "~3.10.0"
+          }
+        },
+        "yargs": {
+          "version": "3.10.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "requires": {
+            "camelcase": "^1.0.2",
+            "cliui": "^2.1.0",
+            "decamelize": "^1.0.0",
+            "window-size": "0.1.0"
+          }
+        }
+      }
     },
     "slice-ansi": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
       "dev": true,
       "requires": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
         "is-fullwidth-code-point": "^2.0.0"
       }
     },
@@ -9350,24 +8151,6 @@
             "ms": "2.0.0"
           }
         },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -9425,12 +8208,6 @@
             "kind-of": "^6.0.2"
           }
         },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
         "kind-of": {
           "version": "6.0.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
@@ -9449,143 +8226,111 @@
       }
     },
     "socket.io": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.7.4.tgz",
-      "integrity": "sha1-L37O3DORvy1cc+KR/iM+bjTU3QA=",
-      "dev": true,
-      "requires": {
-        "debug": "2.3.3",
-        "engine.io": "~1.8.4",
-        "has-binary": "0.1.7",
-        "object-assign": "4.1.0",
-        "socket.io-adapter": "0.5.0",
-        "socket.io-client": "1.7.4",
-        "socket.io-parser": "2.3.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.3.3",
-          "resolved": "http://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
-          "dev": true,
-          "requires": {
-            "ms": "0.7.2"
-          }
-        },
-        "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-          "dev": true
-        },
-        "object-assign": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
-          "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=",
-          "dev": true
-        }
-      }
-    },
-    "socket.io-adapter": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz",
-      "integrity": "sha1-y21LuL7IHhB4uZZ3+c7QBGBmu4s=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
+      "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
       "dev": true,
       "requires": {
-        "debug": "2.3.3",
-        "socket.io-parser": "2.3.1"
+        "debug": "~3.1.0",
+        "engine.io": "~3.2.0",
+        "has-binary2": "~1.0.2",
+        "socket.io-adapter": "~1.1.0",
+        "socket.io-client": "2.1.1",
+        "socket.io-parser": "~3.2.0"
       },
       "dependencies": {
         "debug": {
-          "version": "2.3.3",
-          "resolved": "http://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
-            "ms": "0.7.2"
+            "ms": "2.0.0"
           }
         },
         "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         }
       }
     },
+    "socket.io-adapter": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
+      "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=",
+      "dev": true
+    },
     "socket.io-client": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.4.tgz",
-      "integrity": "sha1-7J+CA1btme9tNX8HVtZIcXvdQoE=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
+      "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
       "dev": true,
       "requires": {
         "backo2": "1.0.2",
+        "base64-arraybuffer": "0.1.5",
         "component-bind": "1.0.0",
         "component-emitter": "1.2.1",
-        "debug": "2.3.3",
-        "engine.io-client": "~1.8.4",
-        "has-binary": "0.1.7",
+        "debug": "~3.1.0",
+        "engine.io-client": "~3.2.0",
+        "has-binary2": "~1.0.2",
+        "has-cors": "1.1.0",
         "indexof": "0.0.1",
         "object-component": "0.0.3",
+        "parseqs": "0.0.5",
         "parseuri": "0.0.5",
-        "socket.io-parser": "2.3.1",
+        "socket.io-parser": "~3.2.0",
         "to-array": "0.1.4"
       },
       "dependencies": {
         "debug": {
-          "version": "2.3.3",
-          "resolved": "http://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
-            "ms": "0.7.2"
+            "ms": "2.0.0"
           }
         },
         "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         }
       }
     },
     "socket.io-parser": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz",
-      "integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
+      "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
       "dev": true,
       "requires": {
-        "component-emitter": "1.1.2",
-        "debug": "2.2.0",
-        "isarray": "0.0.1",
-        "json3": "3.3.2"
+        "component-emitter": "1.2.1",
+        "debug": "~3.1.0",
+        "isarray": "2.0.1"
       },
       "dependencies": {
-        "component-emitter": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
-          "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=",
-          "dev": true
-        },
         "debug": {
-          "version": "2.2.0",
-          "resolved": "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
-            "ms": "0.7.1"
+            "ms": "2.0.0"
           }
         },
         "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
           "dev": true
         },
         "ms": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         }
       }
@@ -9615,9 +8360,9 @@
       "dev": true
     },
     "spdx-correct": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz",
-      "integrity": "sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
       "dev": true,
       "requires": {
         "spdx-expression-parse": "^3.0.0",
@@ -9641,9 +8386,9 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz",
-      "integrity": "sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
+      "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==",
       "dev": true
     },
     "split-string": {
@@ -9653,6 +8398,27 @@
       "dev": true,
       "requires": {
         "extend-shallow": "^3.0.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
       }
     },
     "sprintf-js": {
@@ -9662,9 +8428,9 @@
       "dev": true
     },
     "sshpk": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz",
-      "integrity": "sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==",
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
       "dev": true,
       "requires": {
         "asn1": "~0.2.3",
@@ -9692,17 +8458,6 @@
       "requires": {
         "define-property": "^0.2.5",
         "object-copy": "^0.1.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
       }
     },
     "statuses": {
@@ -9720,61 +8475,28 @@
         "readable-stream": "^2.0.1"
       }
     },
-    "stream-browserify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
-      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "stream-combiner2": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
-      "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
-      "dev": true,
-      "requires": {
-        "duplexer2": "~0.1.0",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "stream-splicer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz",
-      "integrity": "sha1-G2O+Q4oTPktnHMGTUZdgAXWRDYM=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
     "streamroller": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.3.tgz",
+      "integrity": "sha512-P7z9NwP51EltdZ81otaGAN3ob+/F88USJE546joNq7bqRNTe6jc74fTBDyynxP4qpIfKlt/CesEYicuMzI0yJg==",
       "dev": true,
       "requires": {
-        "date-format": "^1.2.0",
+        "async": "^2.6.1",
+        "date-format": "^2.0.0",
         "debug": "^3.1.0",
-        "mkdirp": "^0.5.1",
-        "readable-stream": "^2.3.0"
+        "fs-extra": "^7.0.0",
+        "lodash": "^4.17.10"
       },
       "dependencies": {
+        "async": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
+          "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.17.11"
+          }
+        },
         "debug": {
           "version": "3.2.6",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
@@ -9794,41 +8516,20 @@
       "requires": {
         "is-fullwidth-code-point": "^2.0.0",
         "strip-ansi": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
       }
     },
     "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
     },
     "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
       "dev": true,
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "^3.0.0"
       }
     },
     "strip-bom": {
@@ -9853,9 +8554,9 @@
       "dev": true
     },
     "stylehacks": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.1.tgz",
-      "integrity": "sha512-TK5zEPeD9NyC1uPIdjikzsgWxdQQN/ry1X3d1iOz1UkYDCmcr928gWD1KHgyC27F50UnE0xCTrBOO1l6KR8M4w==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
+      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -9876,15 +8577,6 @@
         }
       }
     },
-    "subarg": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
-      "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.1.0"
-      }
-    },
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -9894,33 +8586,25 @@
       }
     },
     "svgo": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.1.1.tgz",
-      "integrity": "sha512-GBkJbnTuFpM4jFbiERHDWhZc/S/kpHToqmZag3aEBjPYK44JAN2QBjvrGIxLOoCyMZjuFQIfTO2eJd8uwLY/9g==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.0.tgz",
+      "integrity": "sha512-xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw==",
       "dev": true,
       "requires": {
-        "coa": "~2.0.1",
-        "colors": "~1.1.2",
+        "chalk": "^2.4.1",
+        "coa": "^2.0.2",
         "css-select": "^2.0.0",
-        "css-select-base-adapter": "~0.1.0",
+        "css-select-base-adapter": "^0.1.1",
         "css-tree": "1.0.0-alpha.28",
         "css-url-regex": "^1.1.0",
-        "csso": "^3.5.0",
+        "csso": "^3.5.1",
         "js-yaml": "^3.12.0",
         "mkdirp": "~0.5.1",
-        "object.values": "^1.0.4",
+        "object.values": "^1.1.0",
         "sax": "~1.2.4",
-        "stable": "~0.1.6",
+        "stable": "^0.1.8",
         "unquote": "~1.1.1",
         "util.promisify": "~1.0.0"
-      },
-      "dependencies": {
-        "colors": {
-          "version": "1.1.2",
-          "resolved": "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-          "dev": true
-        }
       }
     },
     "symbol-observable": {
@@ -9928,25 +8612,56 @@
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
       "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
     },
-    "syntax-error": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz",
-      "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
-      "dev": true,
-      "requires": {
-        "acorn-node": "^1.2.0"
-      }
-    },
     "table": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.1.0.tgz",
-      "integrity": "sha512-e542in22ZLhD/fOIuXs/8yDZ9W61ltF8daM88rkRNtgTIct+vI2fTnAyu/Db2TCfEcI8i7mjZz6meLq0nW7TYg==",
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.2.3.tgz",
+      "integrity": "sha512-N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ==",
       "dev": true,
       "requires": {
-        "ajv": "^6.5.3",
-        "lodash": "^4.17.10",
-        "slice-ansi": "1.0.0",
-        "string-width": "^2.1.1"
+        "ajv": "^6.9.1",
+        "lodash": "^4.17.11",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
       }
     },
     "tar": {
@@ -9972,38 +8687,11 @@
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
       "dev": true
     },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
     "ticky": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ticky/-/ticky-1.0.1.tgz",
       "integrity": "sha1-t8+nHnaPHJAAxJe5FRswlHxQ5G0="
     },
-    "timers-browserify": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
-      "integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=",
-      "dev": true,
-      "requires": {
-        "process": "~0.11.0"
-      },
-      "dependencies": {
-        "process": {
-          "version": "0.11.10",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-          "dev": true
-        }
-      }
-    },
     "timsort": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
@@ -10030,12 +8718,6 @@
       "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
       "dev": true
     },
-    "to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -10060,6 +8742,72 @@
         "extend-shallow": "^3.0.2",
         "regex-not": "^1.0.2",
         "safe-regex": "^1.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+          "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.2",
+            "isobject": "^3.0.1"
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
       }
     },
     "to-regex-range": {
@@ -10070,17 +8818,6 @@
       "requires": {
         "is-number": "^3.0.0",
         "repeat-string": "^1.6.1"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        }
       }
     },
     "tough-cookie": {
@@ -10119,12 +8856,6 @@
       "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
       "dev": true
     },
-    "tty-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
-      "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
-      "dev": true
-    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -10159,12 +8890,6 @@
         "mime-types": "~2.1.18"
       }
     },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
     "uglify-es": {
       "version": "3.3.9",
       "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
@@ -10189,6 +8914,11 @@
         }
       }
     },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc="
+    },
     "uglifycss": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/uglifycss/-/uglifycss-0.0.29.tgz",
@@ -10196,28 +8926,20 @@
       "dev": true
     },
     "ultron": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
-      "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
       "dev": true
     },
-    "umd": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz",
-      "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==",
-      "dev": true
+    "underscore": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
+      "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk="
     },
-    "undeclared-identifiers": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz",
-      "integrity": "sha512-13EaeocO4edF/3JKime9rD7oB6QI8llAGhgn5fKOPyfkJbRb6NFv9pYV6dFEmpa4uRjKeBqLZP8GpuzqHlKDMQ==",
-      "dev": true,
-      "requires": {
-        "acorn-node": "^1.3.0",
-        "get-assigned-identifiers": "^1.2.0",
-        "simple-concat": "^1.0.0",
-        "xtend": "^4.0.1"
-      }
+    "underscore.string": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz",
+      "integrity": "sha1-18D6KvXVoaZ/QlPa7pgTLnM/Dxk="
     },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
@@ -10236,15 +8958,15 @@
       }
     },
     "unicode-match-property-value-ecmascript": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz",
-      "integrity": "sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
+      "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==",
       "dev": true
     },
     "unicode-property-aliases-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
+      "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==",
       "dev": true
     },
     "union-value": {
@@ -10259,15 +8981,6 @@
         "set-value": "^0.4.3"
       },
       "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
         "set-value": {
           "version": "0.4.3",
           "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
@@ -10349,19 +9062,13 @@
           "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
           "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
           "dev": true
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
         }
       }
     },
     "upath": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+      "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
       "dev": true
     },
     "uri-js": {
@@ -10387,24 +9094,6 @@
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "dev": true
     },
-    "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-          "dev": true
-        }
-      }
-    },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -10421,15 +9110,6 @@
         "tmp": "0.0.x"
       }
     },
-    "util": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3"
-      }
-    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -10485,18 +9165,22 @@
         "extsprintf": "^1.2.0"
       }
     },
-    "vm-browserify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
-      "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==",
-      "dev": true
-    },
     "void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
       "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
       "dev": true
     },
+    "watch": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/watch/-/watch-1.0.2.tgz",
+      "integrity": "sha1-NApxe952Vyb6CqB9ch4BR6VR3ww=",
+      "dev": true,
+      "requires": {
+        "exec-sh": "^0.2.0",
+        "minimist": "^1.2.0"
+      }
+    },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -10506,12 +9190,6 @@
         "isexe": "^2.0.0"
       }
     },
-    "which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-      "dev": true
-    },
     "wide-align": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
@@ -10521,6 +9199,11 @@
         "string-width": "^1.0.2 || 2"
       }
     },
+    "window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0="
+    },
     "wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
@@ -10537,6 +9220,12 @@
         "strip-ansi": "^3.0.1"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
@@ -10556,189 +9245,89 @@
             "is-fullwidth-code-point": "^1.0.0",
             "strip-ansi": "^3.0.0"
           }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
         }
       }
     },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
       "dev": true,
       "requires": {
         "mkdirp": "^0.5.1"
       }
     },
     "ws": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz",
-      "integrity": "sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
       "dev": true,
       "requires": {
-        "options": ">=0.0.5",
-        "ultron": "1.0.x"
+        "async-limiter": "~1.0.0",
+        "safe-buffer": "~5.1.0",
+        "ultron": "~1.1.0"
       }
     },
-    "wtf-8": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz",
-      "integrity": "sha1-OS2LotDxw00e4tYw8V0O+2jhBIo=",
-      "dev": true
-    },
     "xmlhttprequest-ssl": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz",
-      "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=",
-      "dev": true
-    },
-    "xtend": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-      "dev": true
-    },
-    "y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
+      "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
       "dev": true
     },
     "yallist": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-      "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
       "dev": true
     },
     "yargs": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-      "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
-      "dev": true,
-      "requires": {
-        "camelcase": "^3.0.0",
-        "cliui": "^3.2.0",
-        "decamelize": "^1.1.1",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^1.4.0",
-        "read-pkg-up": "^1.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^1.0.2",
-        "which-module": "^1.0.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "^5.0.0"
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
+      "integrity": "sha1-2K/49mXpTDS9JZvevRv68N3TU2E=",
+      "requires": {
+        "camelcase": "^1.0.2",
+        "decamelize": "^1.0.0",
+        "window-size": "0.1.0",
+        "wordwrap": "0.0.2"
       },
       "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "1.1.0",
-          "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "strip-bom": "^2.0.0"
-          }
-        },
-        "path-type": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "read-pkg": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-          "dev": true,
-          "requires": {
-            "load-json-file": "^1.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^1.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-          "dev": true,
-          "requires": {
-            "find-up": "^1.0.0",
-            "read-pkg": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-          "dev": true,
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
         }
       }
     },
-    "yargs-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
-      "dev": true,
-      "requires": {
-        "camelcase": "^3.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        }
-      }
+    "ycssmin": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ycssmin/-/ycssmin-1.0.1.tgz",
+      "integrity": "sha1-fN3o23jPqwDSkBw7IwHjBPr03xY=",
+      "optional": true
     },
     "yeast": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
       "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
       "dev": true
+    },
+    "zlib-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.1.tgz",
+      "integrity": "sha1-T6akXQDbwV8xikr6HZr8Aljhdsw="
     }
   }
 }
diff --git a/package.json b/package.json
index 943a4b04b2f56..ded47f6e92562 100644
--- a/package.json
+++ b/package.json
@@ -14,24 +14,24 @@
   "scripts": {
     "build:js": "node build.js --compile-js",
     "build:css": "node build.js --compile-css",
-    "watch:js": "node build.js --compile-js --watch",
-    "watch:css": "node build.js --compile-css --watch",
+    "watch": "node build.js --watch",
     "lint:js": "npx eslint .",
-    "test": "npx karma start node_modules/joomla-javascript-tests/src/karma.conf.js --single-run",
-    "install": "node build.js --copy-assets && node build.js --build-check",
-    "postinstall": "node build.js --compile-js && node build.js --compile-css && node build.js --compile-ce && cd administrator/components/com_media && npm ci && npm run build",
-    "update": "node build.js --copy-assets && node build.js --build-check && node build.js --compile-js && node build.js --compile-ce && node build.js --compile-css"
+    "test": "npx karma start tests/javascript/karma.conf.js --single-run",
+    "install": "node build.js --copy-assets && node build.js --build-pages",
+    "postinstall": "node build.js --compile-js && node build.js --compile-css && cd administrator/components/com_media && npm ci && npm run build",
+    "update": "node build.js --copy-assets && node build.js --build-pages && node build.js --compile-js && node build.js --compile-css",
+    "gzip": "node -e 'require(\"./build/build-modules-js/gzip-assets.es6.js\").gzipFiles()'"
   },
   "dependencies": {
     "@claviska/jquery-minicolors": "2.2.6",
     "@webcomponents/webcomponentsjs": "2.1.2",
     "awesomplete": "github:LeaVerou/awesomplete",
-    "bootstrap": "4.1.3",
+    "bootstrap": "~4.3",
     "choices.js": "^3.0.4",
     "chosen-js": "1.6.2",
-    "codemirror": "5.38.0",
+    "codemirror": "5.40.0",
     "cropperjs": "1.2.2",
-    "css-vars-ponyfill": "^1.9.0",
+    "css-vars-ponyfill": "^1.17.2",
     "diff": "3.4.0",
     "dragula": "3.7.2",
     "focus-visible": "^4.1.4",
@@ -43,44 +43,43 @@
     "metismenujs": "^1.0.3",
     "popper.js": "^1.14.3",
     "punycode": "1.4.1",
+    "skipto": "^2.0.3",
     "tinymce": "4.8.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.1.6",
-    "@babel/plugin-transform-classes": "^7.1.0",
-    "@babel/preset-env": "^7.1.6",
-    "autoprefixer": "^9.3.1",
+    "@babel/core": "^7.4.0",
+    "@babel/plugin-transform-classes": "^7.4.0",
+    "@babel/preset-env": "^7.4.2",
+    "@gfx/zopfli": "^1.0.11",
+    "autoprefixer": "^9.5.0",
     "babel-plugin-add-header-comment": "^1.0.3",
-    "babel-plugin-static-fs": "^1.1.0",
     "babel-preset-minify": "^0.4.3",
     "babelify": "^10.0.0",
-    "bluebird": "^3.5.3",
-    "browserify": "*",
     "commander": "^2.19.0",
     "copy-dir": "^0.4.0",
-    "cssnano": "^4.1.7",
-    "eslint": "^5.9.0",
+    "cssnano": "^4.1.10",
+    "eslint": "^5.15.3",
     "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-import": "^2.16.0",
     "fs": "0.0.1-security",
     "fs-extra": "^7.0.1",
-    "glob": "^7.1.3",
     "ini": "^1.3.5",
     "jasmine-core": "^3.3.0",
-    "joomla-javascript-tests": "github:joomla/test-javascript#4.0-dev",
-    "karma": "^3.1.1",
+    "karma": "^4.0.1",
     "karma-coverage": "^1.1.2",
     "karma-firefox-launcher": "^1.1.0",
+    "karma-fixture": "^0.2.6",
+    "karma-html2js-preprocessor": "^1.1.0",
     "karma-jasmine": "^2.0.1",
     "karma-jasmine-ajax": "^0.1.13",
+    "karma-json-fixtures-preprocessor": "0.0.6",
     "karma-verbose-reporter": "^0.0.6",
-    "lodash.debounce": "^4.0.8",
-    "node-sass": "^4.10.0",
+    "node-sass": "^4.11.0",
     "path": "^0.12.7",
-    "postcss": "^7.0.6",
-    "recursive-copy": "^2.0.9",
+    "postcss": "^7.0.14",
     "recursive-readdir": "^2.2.2",
     "uglify-es": "^3.3.9",
-    "uglifycss": "^0.0.29"
+    "uglifycss": "^0.0.29",
+    "watch": "^1.0.2"
   }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index f93745ab871b5..81dad5cb44222 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,51 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="tests/unit/bootstrap.php" colors="false">
-	<!-- These constants help setup environment configurations for running optional tests.
-	<php>
-		<const name="JTEST_DATABASE_MYSQLI_DSN" value="host=localhost;dbname=joomla_ut;user=utuser;pass=ut1234" />
-		<const name="JTEST_DATABASE_PDO_MYSQL_DSN" value="host=localhost;dbname=joomla_ut;user=utuser;pass=ut1234" />
-		<const name="JTEST_DATABASE_POSTGRESQL_DSN" value="host=localhost;port=5432;dbname=joomla_ut;user=utuser;pass=ut1234" />
-		<const name="JTEST_DATABASE_SQLSRV_DSN" value="host=localhost;dbname=joomla_ut;user=utuser;pass=ut1234" />
-		<const name="JTEST_HTTP_STUB" value="http://localhost/joomla-cms/tests/unit/stubs/jhttp_stub.php" />
-		<const name="JOOMLA_TEST_LOGGING" value="yes" />
-		<const name="JTEST_CACHE_REDIS_DSN" value="host=localhost;port=6379;db=;auth=" />
-		<const name="JTEST_CACHE_MEMCACHED_DSN" value="host=localhost;port=11211" />
-	</php>
-	-->
+<phpunit bootstrap="tests/Unit/bootstrap.php" colors="false">
 
 	<testsuites>
-		<testsuite name="libraries-cms">
-			<directory>tests/unit/suites/libraries/cms</directory>
-		</testsuite>
-		<testsuite name="libraries-platform">
-			<directory>tests/unit/suites/libraries/joomla</directory>
-		</testsuite>
-		<testsuite name="administrator">
-			<directory>tests/unit/suites/administrator</directory>
-		</testsuite>
-		<testsuite name="FinderIndexer">
-			<directory>tests/unit/suites/finderIndexer</directory>
-		</testsuite>
-		<testsuite name="plugins">
-			<directory>tests/unit/suites/plugins</directory>
+
+		<testsuite name="libraries">
+			<directory suffix="Test.php">./tests/Unit/Libraries</directory>
 		</testsuite>
+
 	</testsuites>
 
-	<logging>
-		<log type="coverage-html" target="build/coverage" title="Joomla-CMS" charset="UTF-8" yui="true" highlight="true"
-			lowUpperBound="35" highLowerBound="70" />
-		<log type="coverage-clover" target="build/logs/clover.xml" />
-		<log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false" />
-	</logging>
-	<filter>
-		<whitelist addUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">libraries/cms</directory>
-			<directory suffix=".php">libraries/joomla</directory>
-			<directory suffix=".php">libraries/src</directory>
-			<directory suffix=".php">administrator/components/com_finder/helpers/indexer</directory>
-			<directory suffix=".php">plugins</directory>
-			<file>administrator/includes/helper.php</file>
-			<file>libraries/loader.php</file>
-		</whitelist>
-	</filter>
 </phpunit>
diff --git a/plugins/actionlog/joomla/joomla.php b/plugins/actionlog/joomla/joomla.php
new file mode 100644
index 0000000000000..a745c302f67d7
--- /dev/null
+++ b/plugins/actionlog/joomla/joomla.php
@@ -0,0 +1,910 @@
+<?php
+/**
+ * @package     Joomla.Plugins
+ * @subpackage  System.actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('ActionLogPlugin', JPATH_ADMINISTRATOR . '/components/com_actionlogs/libraries/actionlogplugin.php');
+JLoader::register('ActionlogsHelper', JPATH_ADMINISTRATOR . '/components/com_actionlogs/helpers/actionlogs.php');
+
+/**
+ * Joomla! Users Actions Logging Plugin.
+ *
+ * @since  3.9.0
+ */
+class PlgActionlogJoomla extends ActionLogPlugin
+{
+	/**
+	 * Array of loggable extensions.
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 */
+	protected $loggableExtensions = array();
+
+	/**
+	 * Context aliases
+	 *
+	 * @var    array
+	 * @since  3.9.0 
+	 */
+	protected $contextAliases = array('com_content.form' => 'com_content.article');
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   object  &$subject  The object to observe.
+	 * @param   array   $config    An optional associative array of configuration settings.
+	 *
+	 * @since   3.9.0
+	 */
+	public function __construct(&$subject, $config)
+	{
+		parent::__construct($subject, $config);
+
+		$params = ComponentHelper::getComponent('com_actionlogs')->getParams();
+
+		$this->loggableExtensions = $params->get('loggable_extensions', array());
+	}
+
+	/**
+	 * After save content logging method
+	 * This method adds a record to #__action_logs contains (message, date, context, user)
+	 * Method is called right after the content is saved
+	 *
+	 * @param   string   $context  The context of the content passed to the plugin
+	 * @param   object   $article  A JTableContent object
+	 * @param   boolean  $isNew    If the content is just about to be created
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onContentAfterSave($context, $article, $isNew)
+	{
+		if (isset($this->contextAliases[$context]))
+		{
+			$context = $this->contextAliases[$context];
+		}
+
+		$option = $this->app->input->getCmd('option');
+
+		if (!$this->checkLoggable($option))
+		{
+			return;
+		}
+
+		$params = ActionlogsHelper::getLogContentTypeParams($context);
+
+		// Not found a valid content type, don't process further
+		if ($params === null)
+		{
+			return;
+		}
+
+		list(, $contentType) = explode('.', $params->type_alias);
+
+		if ($isNew)
+		{
+			$messageLanguageKey = $params->text_prefix . '_' . $params->type_title . '_ADDED';
+			$defaultLanguageKey = 'PLG_SYSTEM_ACTIONLOGS_CONTENT_ADDED';
+		}
+		else
+		{
+			$messageLanguageKey = $params->text_prefix . '_' . $params->type_title . '_UPDATED';
+			$defaultLanguageKey = 'PLG_SYSTEM_ACTIONLOGS_CONTENT_UPDATED';
+		}
+
+		// If the content type doesn't has it own language key, use default language key
+		if (!$this->app->getLanguage()->hasKey($messageLanguageKey))
+		{
+			$messageLanguageKey = $defaultLanguageKey;
+		}
+
+		$id = empty($params->id_holder) ? 0 : $article->get($params->id_holder);
+
+		$message = array(
+			'action'   => $isNew ? 'add' : 'update',
+			'type'     => $params->text_prefix . '_TYPE_' . $params->type_title,
+			'id'       => $id,
+			'title'    => $article->get($params->title_holder),
+			'itemlink' => ActionlogsHelper::getContentTypeLink($option, $contentType, $id)
+		);
+
+		$this->addLog(array($message), $messageLanguageKey, $context);
+	}
+
+	/**
+	 * After delete content logging method
+	 * This method adds a record to #__action_logs contains (message, date, context, user)
+	 * Method is called right after the content is deleted
+	 *
+	 * @param   string  $context  The context of the content passed to the plugin
+	 * @param   object  $article  A JTableContent object
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onContentAfterDelete($context, $article)
+	{
+		$option = $this->app->input->get('option');
+
+		if (!$this->checkLoggable($option))
+		{
+			return;
+		}
+
+		$params = ActionlogsHelper::getLogContentTypeParams($context);
+
+		// Not found a valid content type, don't process further
+		if ($params === null)
+		{
+			return;
+		}
+
+		// If the content type has it own language key, use it, otherwise, use default language key
+		if ($this->app->getLanguage()->hasKey(strtoupper($params->text_prefix . '_' . $params->type_title . '_DELETED')))
+		{
+			$messageLanguageKey = $params->text_prefix . '_' . $params->type_title . '_DELETED';
+		}
+		else
+		{
+			$messageLanguageKey = 'PLG_SYSTEM_ACTIONLOGS_CONTENT_DELETED';
+		}
+
+		$id = empty($params->id_holder) ? 0 : $article->get($params->id_holder);
+
+		$message = array(
+			'action' => 'delete',
+			'type'   => $params->text_prefix . '_TYPE_' . $params->type_title,
+			'id'     => $id,
+			'title'  => $article->get($params->title_holder)
+		);
+
+		$this->addLog(array($message), $messageLanguageKey, $context);
+	}
+
+	/**
+	 * On content change status logging method
+	 * This method adds a record to #__action_logs contains (message, date, context, user)
+	 * Method is called when the status of the article is changed
+	 *
+	 * @param   string   $context  The context of the content passed to the plugin
+	 * @param   array    $pks      An array of primary key ids of the content that has changed state.
+	 * @param   integer  $value    The value of the state that the content has been changed to.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onContentChangeState($context, $pks, $value)
+	{
+		$option = $this->app->input->getCmd('option');
+
+		if (!$this->checkLoggable($option))
+		{
+			return;
+		}
+
+		$params = ActionlogsHelper::getLogContentTypeParams($context);
+
+		// Not found a valid content type, don't process further
+		if ($params === null)
+		{
+			return;
+		}
+
+		list(, $contentType) = explode('.', $params->type_alias);
+
+		switch ($value)
+		{
+			case 0:
+				$messageLanguageKey = $params->text_prefix . '_' . $params->type_title . '_UNPUBLISHED';
+				$defaultLanguageKey = 'PLG_SYSTEM_ACTIONLOGS_CONTENT_UNPUBLISHED';
+				$action             = 'unpublish';
+				break;
+			case 1:
+				$messageLanguageKey = $params->text_prefix . '_' . $params->type_title . '_PUBLISHED';
+				$defaultLanguageKey = 'PLG_SYSTEM_ACTIONLOGS_CONTENT_PUBLISHED';
+				$action             = 'publish';
+				break;
+			case 2:
+				$messageLanguageKey = $params->text_prefix . '_' . $params->type_title . '_ARCHIVED';
+				$defaultLanguageKey = 'PLG_SYSTEM_ACTIONLOGS_CONTENT_ARCHIVED';
+				$action             = 'archive';
+				break;
+			case -2:
+				$messageLanguageKey = $params->text_prefix . '_' . $params->type_title . '_TRASHED';
+				$defaultLanguageKey = 'PLG_SYSTEM_ACTIONLOGS_CONTENT_TRASHED';
+				$action             = 'trash';
+				break;
+			default:
+				$messageLanguageKey = '';
+				$defaultLanguageKey = '';
+				$action             = '';
+				break;
+		}
+
+		// If the content type doesn't has it own language key, use default language key
+		if (!$this->app->getLanguage()->hasKey($messageLanguageKey))
+		{
+			$messageLanguageKey = $defaultLanguageKey;
+		}
+
+		$db    = $this->db;
+		$query = $db->getQuery(true)
+			->select($db->quoteName(array($params->title_holder, $params->id_holder)))
+			->from($db->quoteName($params->table_name))
+			->where($db->quoteName($params->id_holder) . ' IN (' . implode(',', ArrayHelper::toInteger($pks)) . ')');
+		$db->setQuery($query);
+
+		try
+		{
+			$items = $db->loadObjectList($params->id_holder);
+		}
+		catch (RuntimeException $e)
+		{
+			$items = array();
+		}
+
+		$messages = array();
+
+		foreach ($pks as $pk)
+		{
+			$message = array(
+				'action'      => $action,
+				'type'        => $params->text_prefix . '_TYPE_' . $params->type_title,
+				'id'          => $pk,
+				'title'       => $items[$pk]->{$params->title_holder},
+				'itemlink'    => ActionlogsHelper::getContentTypeLink($option, $contentType, $pk)
+			);
+
+			$messages[] = $message;
+		}
+
+		$this->addLog($messages, $messageLanguageKey, $context);
+	}
+
+	/**
+	 * On Saving application configuration logging method
+	 * Method is called when the application config is being saved
+	 *
+	 * @param   JRegistry  $config  JRegistry object with the new config
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onApplicationAfterSave($config)
+	{
+		$option = $this->app->input->getCmd('option');
+
+		if (!$this->checkLoggable($option))
+		{
+			return;
+		}
+
+		$messageLanguageKey = 'PLG_ACTIONLOG_JOOMLA_APPLICATION_CONFIG_UPDATED';
+		$action             = 'update';
+
+		$message = array(
+			'action'         => $action,
+			'type'           => 'PLG_ACTIONLOG_JOOMLA_TYPE_APPLICATION_CONFIG',
+			'extension_name' => 'com_config.application',
+			'itemlink'       => 'index.php?option=com_config'
+		);
+
+		$this->addLog(array($message), $messageLanguageKey, 'com_config.application');
+	}
+
+	/**
+	 * On installing extensions logging method
+	 * This method adds a record to #__action_logs contains (message, date, context, user)
+	 * Method is called when an extension is installed
+	 *
+	 * @param   JInstaller  $installer  Installer object
+	 * @param   integer     $eid        Extension Identifier
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onExtensionAfterInstall($installer, $eid)
+	{
+		$context = $this->app->input->get('option');
+
+		if (!$this->checkLoggable($context))
+		{
+			return;
+		}
+
+		$manifest      = $installer->get('manifest');
+
+		if ($manifest === null)
+		{
+			return;
+		}
+
+		$extensionType = $manifest->attributes()->type;
+
+		// If the extension type has it own language key, use it, otherwise, use default language key
+		if ($this->app->getLanguage()->hasKey(strtoupper('PLG_ACTIONLOG_JOOMLA_' . $extensionType . '_INSTALLED')))
+		{
+			$messageLanguageKey = 'PLG_ACTIONLOG_JOOMLA_' . $extensionType . '_INSTALLED';
+		}
+		else
+		{
+			$messageLanguageKey = 'PLG_ACTIONLOG_JOOMLA_EXTENSION_INSTALLED';
+		}
+
+		$message = array(
+			'action'         => 'install',
+			'type'           => 'PLG_ACTIONLOG_JOOMLA_TYPE_' . $extensionType,
+			'id'             => $eid,
+			'name'           => (string) $manifest->name,
+			'extension_name' => (string) $manifest->name
+		);
+
+		$this->addLog(array($message), $messageLanguageKey, $context);
+	}
+
+	/**
+	 * On uninstalling extensions logging method
+	 * This method adds a record to #__action_logs contains (message, date, context, user)
+	 * Method is called when an extension is uninstalled
+	 *
+	 * @param   JInstaller  $installer  Installer instance
+	 * @param   integer     $eid        Extension id
+	 * @param   integer     $result     Installation result
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onExtensionAfterUninstall($installer, $eid, $result)
+	{
+		$context = $this->app->input->get('option');
+
+		if (!$this->checkLoggable($context))
+		{
+			return;
+		}
+
+		// If the process failed, we don't have manifest data, stop process to avoid fatal error
+		if ($result === false)
+		{
+			return;
+		}
+
+		$manifest      = $installer->get('manifest');
+
+		if ($manifest === null)
+		{
+			return;
+		}
+
+		$extensionType = $manifest->attributes()->type;
+
+		// If the extension type has it own language key, use it, otherwise, use default language key
+		if ($this->app->getLanguage()->hasKey(strtoupper('PLG_ACTIONLOG_JOOMLA_' . $extensionType . '_UNINSTALLED')))
+		{
+			$messageLanguageKey = 'PLG_ACTIONLOG_JOOMLA_' . $extensionType . '_UNINSTALLED';
+		}
+		else
+		{
+			$messageLanguageKey = 'PLG_ACTIONLOG_JOOMLA_EXTENSION_UNINSTALLED';
+		}
+
+		$message = array(
+			'action'         => 'install',
+			'type'           => 'PLG_ACTIONLOG_JOOMLA_TYPE_' . $extensionType,
+			'id'             => $eid,
+			'name'           => (string) $manifest->name,
+			'extension_name' => (string) $manifest->name
+		);
+
+		$this->addLog(array($message), $messageLanguageKey, $context);
+	}
+
+	/**
+	 * On updating extensions logging method
+	 * This method adds a record to #__action_logs contains (message, date, context, user)
+	 * Method is called when an extension is updated
+	 *
+	 * @param   JInstaller  $installer  Installer instance
+	 * @param   integer     $eid        Extension id
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onExtensionAfterUpdate($installer, $eid)
+	{
+		$context = $this->app->input->get('option');
+
+		if (!$this->checkLoggable($context))
+		{
+			return;
+		}
+
+		$manifest      = $installer->get('manifest');
+
+		if ($manifest === null)
+		{
+			return;
+		}
+
+		$extensionType = $manifest->attributes()->type;
+
+		// If the extension type has it own language key, use it, otherwise, use default language key
+		if ($this->app->getLanguage()->hasKey('PLG_ACTIONLOG_JOOMLA_' . $extensionType . '_UPDATED'))
+		{
+			$messageLanguageKey = 'PLG_ACTIONLOG_JOOMLA_' . $extensionType . '_UPDATED';
+		}
+		else
+		{
+			$messageLanguageKey = 'PLG_ACTIONLOG_JOOMLA_EXTENSION_UPDATED';
+		}
+
+		$message = array(
+			'action'         => 'update',
+			'type'           => 'PLG_ACTIONLOG_JOOMLA_TYPE_' . $extensionType,
+			'id'             => $eid,
+			'name'           => (string) $manifest->name,
+			'extension_name' => (string) $manifest->name
+		);
+
+		$this->addLog(array($message), $messageLanguageKey, $context);
+	}
+
+	/**
+	 * On Saving extensions logging method
+	 * Method is called when an extension is being saved
+	 *
+	 * @param   string   $context  The extension
+	 * @param   JTable   $table    DataBase Table object
+	 * @param   boolean  $isNew    If the extension is new or not
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onExtensionAfterSave($context, $table, $isNew)
+	{
+		$option = $this->app->input->getCmd('option');
+
+		if ($table->get('module') != null)
+		{
+			$option = 'com_modules';
+		}
+
+		if (!$this->checkLoggable($option))
+		{
+			return;
+		}
+
+		$params = ActionlogsHelper::getLogContentTypeParams($context);
+
+		// Not found a valid content type, don't process further
+		if ($params === null)
+		{
+			return;
+		}
+
+		list(, $contentType) = explode('.', $params->type_alias);
+
+		if ($isNew)
+		{
+			$messageLanguageKey = $params->text_prefix . '_' . $params->type_title . '_ADDED';
+			$defaultLanguageKey = 'PLG_SYSTEM_ACTIONLOGS_CONTENT_ADDED';
+		}
+		else
+		{
+			$messageLanguageKey = $params->text_prefix . '_' . $params->type_title . '_UPDATED';
+			$defaultLanguageKey = 'PLG_SYSTEM_ACTIONLOGS_CONTENT_UPDATED';
+		}
+
+		// If the extension type doesn't have it own language key, use default language key
+		if (!$this->app->getLanguage()->hasKey($messageLanguageKey))
+		{
+			$messageLanguageKey = $defaultLanguageKey;
+		}
+
+		$message = array(
+			'action'         => $isNew ? 'add' : 'update',
+			'type'           => 'PLG_ACTIONLOG_JOOMLA_TYPE_' . $params->type_title,
+			'id'             => $table->get($params->id_holder),
+			'title'          => $table->get($params->title_holder),
+			'extension_name' => $table->get($params->title_holder),
+			'itemlink'       => ActionlogsHelper::getContentTypeLink($option, $contentType, $table->get($params->id_holder), $params->id_holder)
+		);
+
+		$this->addLog(array($message), $messageLanguageKey, $context);
+	}
+
+	/**
+	 * On Deleting extensions logging method
+	 * Method is called when an extension is being deleted
+	 *
+	 * @param   string  $context  The extension
+	 * @param   JTable  $table    DataBase Table object
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onExtensionAfterDelete($context, $table)
+	{
+		if (!$this->checkLoggable($this->app->input->get('option')))
+		{
+			return;
+		}
+
+		$params = ActionlogsHelper::getLogContentTypeParams($context);
+
+		// Not found a valid content type, don't process further
+		if ($params === null)
+		{
+			return;
+		}
+
+		$messageLanguageKey = 'PLG_SYSTEM_ACTIONLOGS_CONTENT_DELETED';
+
+		$message = array(
+			'action' => 'delete',
+			'type'   => 'PLG_ACTIONLOG_JOOMLA_TYPE_' . $params->type_title,
+			'title'  => $table->get($params->title_holder)
+		);
+
+		$this->addLog(array($message), $messageLanguageKey, $context);
+	}
+
+	/**
+	 * On saving user data logging method
+	 *
+	 * Method is called after user data is stored in the database.
+	 * This method logs who created/edited any user's data
+	 *
+	 * @param   array    $user     Holds the new user data.
+	 * @param   boolean  $isnew    True if a new user is stored.
+	 * @param   boolean  $success  True if user was succesfully stored in the database.
+	 * @param   string   $msg      Message.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onUserAfterSave($user, $isnew, $success, $msg)
+	{
+		$context = $this->app->input->get('option');
+		$task    = $this->app->input->get->getCmd('task');
+
+		if (!$this->checkLoggable($context))
+		{
+			return;
+		}
+
+		$jUser = JFactory::getUser();
+
+		if (!$jUser->id)
+		{
+			$messageLanguageKey = 'PLG_ACTIONLOG_JOOMLA_USER_REGISTERED';
+			$action             = 'register';
+
+			// Reset request
+			if ($task === 'reset.request')
+			{
+				$messageLanguageKey = 'PLG_ACTIONLOG_JOOMLA_USER_RESET_REQUEST';
+				$action             = 'resetrequest';
+			}
+
+			// Reset complete
+			if ($task === 'reset.complete')
+			{
+				$messageLanguageKey = 'PLG_ACTIONLOG_JOOMLA_USER_RESET_COMPLETE';
+				$action             = 'resetcomplete';
+			}
+		}
+		elseif ($isnew)
+		{
+			$messageLanguageKey = 'PLG_SYSTEM_ACTIONLOGS_CONTENT_ADDED';
+			$action             = 'add';
+		}
+		else
+		{
+			$messageLanguageKey = 'PLG_SYSTEM_ACTIONLOGS_CONTENT_UPDATED';
+			$action             = 'update';
+		}
+
+		$userId   = $jUser->id ?: $user['id'];
+		$username = $jUser->username ?: $user['username'];
+
+		$message = array(
+			'action'      => $action,
+			'type'        => 'PLG_ACTIONLOG_JOOMLA_TYPE_USER',
+			'id'          => $user['id'],
+			'title'       => $user['name'],
+			'itemlink'    => 'index.php?option=com_users&task=user.edit&id=' . $user['id'],
+			'userid'      => $userId,
+			'username'    => $username,
+			'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $userId,
+		);
+
+		$this->addLog(array($message), $messageLanguageKey, $context, $userId);
+	}
+
+	/**
+	 * On deleting user data logging method
+	 *
+	 * Method is called after user data is deleted from the database
+	 *
+	 * @param   array    $user     Holds the user data
+	 * @param   boolean  $success  True if user was succesfully stored in the database
+	 * @param   string   $msg      Message
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onUserAfterDelete($user, $success, $msg)
+	{
+		$context = $this->app->input->get('option');
+
+		if (!$this->checkLoggable($context))
+		{
+			return;
+		}
+
+		$messageLanguageKey = 'PLG_SYSTEM_ACTIONLOGS_CONTENT_DELETED';
+
+		$message = array(
+			'action'      => 'delete',
+			'type'        => 'PLG_ACTIONLOG_JOOMLA_TYPE_USER',
+			'id'          => $user['id'],
+			'title'       => $user['name']
+		);
+
+		$this->addLog(array($message), $messageLanguageKey, $context);
+	}
+
+	/**
+	 * On after save user group data logging method
+	 *
+	 * Method is called after user data is deleted from the database
+	 *
+	 * @param   string   $context  The context
+	 * @param   JTable   $table    DataBase Table object
+	 * @param   boolean  $isNew    Is new or not
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onUserAfterSaveGroup($context, $table, $isNew)
+	{
+		$context = $this->app->input->get('option');
+
+		if (!$this->checkLoggable($context))
+		{
+			return;
+		}
+
+		if ($isNew)
+		{
+			$messageLanguageKey = 'PLG_SYSTEM_ACTIONLOGS_CONTENT_ADDED';
+			$action             = 'add';
+		}
+		else
+		{
+			$messageLanguageKey = 'PLG_SYSTEM_ACTIONLOGS_CONTENT_UPDATED';
+			$action             = 'update';
+		}
+
+		$message = array(
+			'action'      => $action,
+			'type'        => 'PLG_ACTIONLOG_JOOMLA_TYPE_USER_GROUP',
+			'id'          => $table->id,
+			'title'       => $table->title,
+			'itemlink'    => 'index.php?option=com_users&task=group.edit&id=' . $table->id
+		);
+
+		$this->addLog(array($message), $messageLanguageKey, $context);
+	}
+
+	/**
+	 * On deleting user group data logging method
+	 *
+	 * Method is called after user data is deleted from the database
+	 *
+	 * @param   array    $group    Holds the group data
+	 * @param   boolean  $success  True if user was succesfully stored in the database
+	 * @param   string   $msg      Message
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onUserAfterDeleteGroup($group, $success, $msg)
+	{
+		$context = $this->app->input->get('option');
+
+		if (!$this->checkLoggable($context))
+		{
+			return;
+		}
+
+		$messageLanguageKey = 'PLG_SYSTEM_ACTIONLOGS_CONTENT_DELETED';
+
+		$message = array(
+			'action'      => 'delete',
+			'type'        => 'PLG_ACTIONLOG_JOOMLA_TYPE_USER_GROUP',
+			'id'          => $group['id'],
+			'title'       => $group['title']
+		);
+
+		$this->addLog(array($message), $messageLanguageKey, $context);
+	}
+
+	/**
+	 * Method to log user login success action
+	 *
+	 * @param   array  $options  Array holding options (user, responseType)
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onUserAfterLogin($options)
+	{
+		$context = 'com_users';
+
+		if (!$this->checkLoggable($context))
+		{
+			return;
+		}
+
+		$loggedInUser       = $options['user'];
+		$messageLanguageKey = 'PLG_ACTIONLOG_JOOMLA_USER_LOGGED_IN';
+
+		$message = array(
+			'action'      => 'login',
+			'userid'      => $loggedInUser->id,
+			'username'    => $loggedInUser->username,
+			'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $loggedInUser->id,
+			'app'         => 'PLG_ACTIONLOG_JOOMLA_APPLICATION_' . $this->app->getName(),
+		);
+
+		$this->addLog(array($message), $messageLanguageKey, $context, $loggedInUser->id);
+	}
+
+	/**
+	 * Method to log user login failed action
+	 *
+	 * @param   array  $response  Array of response data.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onUserLoginFailure($response)
+	{
+		$context = 'com_users';
+
+		if (!$this->checkLoggable($context))
+		{
+			return;
+		}
+
+		$loggedInUser = JUser::getInstance($response['username']);
+
+		// Not a valid user, return
+		if (!$loggedInUser->id)
+		{
+			return;
+		}
+
+		$messageLanguageKey = 'PLG_ACTIONLOG_JOOMLA_USER_LOGIN_FAILED';
+
+		$message = array(
+			'action'      => 'login',
+			'id'          => $loggedInUser->id,
+			'userid'      => $loggedInUser->id,
+			'username'    => $loggedInUser->username,
+			'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $loggedInUser->id,
+			'app'         => 'PLG_ACTIONLOG_JOOMLA_APPLICATION_' . $this->app->getName(),
+		);
+
+		$this->addLog(array($message), $messageLanguageKey, $context, $loggedInUser->id);
+	}
+
+	/**
+	 * Method to log user's logout action
+	 *
+	 * @param   array  $user     Holds the user data
+	 * @param   array  $options  Array holding options (remember, autoregister, group)
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onUserLogout($user, $options = array())
+	{
+		$context = 'com_users';
+
+		if (!$this->checkLoggable($context))
+		{
+			return;
+		}
+
+		$loggedOutUser      = JUser::getInstance($user['id']);
+		$messageLanguageKey = 'PLG_ACTIONLOG_JOOMLA_USER_LOGGED_OUT';
+
+		$message = array(
+			'action'      => 'logout',
+			'id'          => $loggedOutUser->id,
+			'userid'      => $loggedOutUser->id,
+			'username'    => $loggedOutUser->username,
+			'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $loggedOutUser->id,
+			'app'         => 'PLG_ACTIONLOG_JOOMLA_APPLICATION_' . $this->app->getName(),
+		);
+
+		$this->addLog(array($message), $messageLanguageKey, $context);
+	}
+
+	/**
+	 * Function to check if a component is loggable or not
+	 *
+	 * @param   string  $extension  The extension that triggered the event
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	protected function checkLoggable($extension)
+	{
+		return in_array($extension, $this->loggableExtensions);
+	}
+
+	/**
+	 * On after Remind username request
+	 *
+	 * Method is called after user request to remind their username.
+	 *
+	 * @param   array  $user  Holds the user data.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onUserAfterRemind($user)
+	{
+		$context = $this->app->input->get('option');
+
+		if (!$this->checkLoggable($context))
+		{
+			return;
+		}
+
+		$message = array(
+			'action'      => 'remind',
+			'type'        => 'PLG_ACTIONLOG_JOOMLA_TYPE_USER',
+			'id'          => $user->id,
+			'title'       => $user->name,
+			'itemlink'    => 'index.php?option=com_users&task=user.edit&id=' . $user->id,
+			'userid'      => $user->id,
+			'username'    => $user->name,
+			'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $user->id,
+		);
+
+		$this->addLog(array($message), 'PLG_ACTIONLOG_JOOMLA_USER_REMIND', $context, $user->id);
+	}
+}
diff --git a/plugins/actionlog/joomla/joomla.xml b/plugins/actionlog/joomla/joomla.xml
new file mode 100644
index 0000000000000..80ac50a0ac823
--- /dev/null
+++ b/plugins/actionlog/joomla/joomla.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension version="3.9" type="plugin" group="actionlog" method="upgrade">
+	<name>PLG_ACTIONLOG_JOOMLA</name>
+	<author>Joomla! Project</author>
+	<creationDate>May 2018</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>PLG_ACTIONLOG_JOOMLA_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="joomla">joomla.php</filename>
+	</files>
+	<config />
+</extension>
diff --git a/plugins/api-authentication/basic/basic.php b/plugins/api-authentication/basic/basic.php
new file mode 100644
index 0000000000000..9f55e4fd002be
--- /dev/null
+++ b/plugins/api-authentication/basic/basic.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Authentication.joomla
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\User\User;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\User\UserHelper;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Authentication\Authentication;
+
+/**
+ * Joomla Authentication plugin
+ *
+ * @since  4.0.0
+ */
+class PlgApiAuthenticationBasic extends CMSPlugin
+{
+	/**
+	 * The application object
+	 *
+	 * @type   \Joomla\CMS\Application\CMSApplicationInterface
+	 * @since  4.0.0
+	 */
+	protected $app;
+
+	/**
+	 * The application object
+	 *
+	 * @type   \Joomla\Database\DatabaseInterface
+	 * @since  4.0.0
+	 */
+	protected $db;
+
+	/**
+	 * This method should handle any authentication and report back to the subject
+	 *
+	 * @param   array   $credentials  Array holding the user credentials
+	 * @param   array   $options      Array of extra options
+	 * @param   object  &$response    Authentication response object
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function onUserAuthenticate($credentials, $options, &$response)
+	{
+		$response->type = 'Basic';
+
+		$username = $this->app->input->server->get('PHP_AUTH_USER');
+		$password = $this->app->input->server->get('PHP_AUTH_PW');
+
+		if (empty($password))
+		{
+			$response->status        = Authentication::STATUS_FAILURE;
+			$response->error_message = Text::_('JGLOBAL_AUTH_EMPTY_PASS_NOT_ALLOWED');
+
+			return;
+		}
+
+		// Get a database object
+		$query = $this->db->getQuery(true)
+			->select($this->db->quoteName(array('id', 'password')))
+			->from($this->db->quoteName('#__users'))
+			->where($this->db->quoteName('username') . '=' . $this->db->quote($username));
+
+		$this->db->setQuery($query);
+		$result = $this->db->loadObject();
+
+		if ($result)
+		{
+			$match = UserHelper::verifyPassword($password, $result->password, $result->id);
+
+			if ($match === true)
+			{
+				// Bring this in line with the rest of the system
+				$user               = User::getInstance($result->id);
+				$response->email    = $user->email;
+				$response->fullname = $user->name;
+				$response->username = $username;
+
+				if ($this->app->isClient('administrator'))
+				{
+					$response->language = $user->getParam('admin_language');
+				}
+
+				else
+				{
+					$response->language = $user->getParam('language');
+				}
+
+				$response->status        = Authentication::STATUS_SUCCESS;
+				$response->error_message = '';
+			}
+			else
+			{
+				// Invalid password
+				$response->status        = Authentication::STATUS_FAILURE;
+				$response->error_message = Text::_('JGLOBAL_AUTH_INVALID_PASS');
+			}
+		}
+		else
+		{
+			// Let's hash the entered password even if we don't have a matching user for some extra response time
+			// By doing so, we mitigate side channel user enumeration attacks
+			UserHelper::hashPassword($password);
+
+			// Invalid user
+			$response->status        = Authentication::STATUS_FAILURE;
+			$response->error_message = Text::_('JGLOBAL_AUTH_NO_USER');
+		}
+	}
+}
diff --git a/plugins/api-authentication/basic/basic.xml b/plugins/api-authentication/basic/basic.xml
new file mode 100644
index 0000000000000..b175f8b3306b1
--- /dev/null
+++ b/plugins/api-authentication/basic/basic.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="4.0" type="plugin" group="api-authentication" method="upgrade">
+	<name>plg_api-authentication_basic</name>
+	<author>Joomla! Project</author>
+	<creationDate>November 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>4.0.0</version>
+	<description>PLG_AUTH_AUTHENTICATION_BASIC_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="basic">basic.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_authentication_api_basic.ini</language>
+		<language tag="en-GB">en-GB.plg_authentication_api_basic.sys.ini</language>
+	</languages>
+</extension>
diff --git a/plugins/authentication/cookie/cookie.php b/plugins/authentication/cookie/cookie.php
index 9210a67ee3467..9c69c3851bf1c 100644
--- a/plugins/authentication/cookie/cookie.php
+++ b/plugins/authentication/cookie/cookie.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Authentication.cookie
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -42,6 +42,24 @@ class PlgAuthenticationCookie extends CMSPlugin
 	 */
 	protected $db;
 
+	/**
+	 * Reports the privacy related capabilities for this plugin to site administrators.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.9.0
+	 */
+	public function onPrivacyCollectAdminCapabilities()
+	{
+		$this->loadLanguage();
+
+		return array(
+			JText::_('PLG_AUTHENTICATION_COOKIE') => array(
+				JText::_('PLG_AUTH_COOKIE_PRIVACY_CAPABILITY_COOKIE'),
+			)
+		);
+	}
+
 	/**
 	 * This method should handle any authentication and report back to the subject
 	 *
diff --git a/plugins/authentication/cookie/cookie.xml b/plugins/authentication/cookie/cookie.xml
index 45f1daaa6d1d8..805ec6d636ca0 100644
--- a/plugins/authentication/cookie/cookie.xml
+++ b/plugins/authentication/cookie/cookie.xml
@@ -3,7 +3,7 @@
 	<name>plg_authentication_cookie</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2013</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/authentication/joomla/joomla.php b/plugins/authentication/joomla/joomla.php
index 27149729ad1b1..5bb40b48b324c 100644
--- a/plugins/authentication/joomla/joomla.php
+++ b/plugins/authentication/joomla/joomla.php
@@ -3,14 +3,13 @@
  * @package     Joomla.Plugin
  * @subpackage  Authentication.joomla
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Authentication\Authentication;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\AuthenticationHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
@@ -25,6 +24,22 @@
  */
 class PlgAuthenticationJoomla extends CMSPlugin
 {
+	/**
+	 * Application object
+	 *
+	 * @var    \Joomla\CMS\Application\CMSApplication
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $app;
+
+	/**
+	 * Database object
+	 *
+	 * @var    \Joomla\Database\DatabaseDriver
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $db;
+
 	/**
 	 * This method should handle any authentication and report back to the subject
 	 *
@@ -49,15 +64,13 @@ public function onUserAuthenticate($credentials, $options, &$response)
 			return;
 		}
 
-		// Get a database object
-		$db    = Factory::getDbo();
-		$query = $db->getQuery(true)
+		$query = $this->db->getQuery(true)
 			->select('id, password')
 			->from('#__users')
-			->where('username=' . $db->quote($credentials['username']));
+			->where('username=' . $this->db->quote($credentials['username']));
 
-		$db->setQuery($query);
-		$result = $db->loadObject();
+		$this->db->setQuery($query);
+		$result = $this->db->loadObject();
 
 		if ($result)
 		{
@@ -70,7 +83,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 				$response->email    = $user->email;
 				$response->fullname = $user->name;
 
-				if (Factory::getApplication()->isClient('administrator'))
+				if ($this->app->isClient('administrator'))
 				{
 					$response->language = $user->getParam('admin_language');
 				}
@@ -111,8 +124,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 				return;
 			}
 
-			$model = Factory::getApplication()->bootComponent('com_users')
-				->getMVCFactory()->createModel('User', 'Administrator', ['ignore_request' => true]);
+			$model = $this->app->bootComponent('com_users')->getMVCFactory()->createModel('User', 'Administrator', ['ignore_request' => true]);
 
 			// Load the user's OTP (one time password, a.k.a. two factor auth) configuration
 			if (!array_key_exists('otp_config', $options))
@@ -134,11 +146,9 @@ public function onUserAuthenticate($credentials, $options, &$response)
 				{
 					try
 					{
-						$app = Factory::getApplication();
-
 						$this->loadLanguage();
 
-						$app->enqueueMessage(Text::_('PLG_AUTH_JOOMLA_ERR_SECRET_CODE_WITHOUT_TFA'), 'warning');
+						$this->app->enqueueMessage(Text::_('PLG_AUTH_JOOMLA_ERR_SECRET_CODE_WITHOUT_TFA'), 'warning');
 					}
 					catch (Exception $exc)
 					{
@@ -154,7 +164,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 			// Try to validate the OTP
 			PluginHelper::importPlugin('twofactorauth');
 
-			$otpAuthReplies = Factory::getApplication()->triggerEvent('onUserTwofactorAuthenticate', array($credentials, $options));
+			$otpAuthReplies = $this->app->triggerEvent('onUserTwofactorAuthenticate', array($credentials, $options));
 
 			$check = false;
 
diff --git a/plugins/authentication/joomla/joomla.xml b/plugins/authentication/joomla/joomla.xml
index da4b7ad013b77..d9545c2ef5342 100644
--- a/plugins/authentication/joomla/joomla.xml
+++ b/plugins/authentication/joomla/joomla.xml
@@ -3,7 +3,7 @@
 	<name>plg_authentication_joomla</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/authentication/ldap/ldap.php b/plugins/authentication/ldap/ldap.php
index d55be3c897e55..9a70274c90cab 100644
--- a/plugins/authentication/ldap/ldap.php
+++ b/plugins/authentication/ldap/ldap.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Authentication.ldap
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/authentication/ldap/ldap.xml b/plugins/authentication/ldap/ldap.xml
index aee33ac6afc71..a2986bfbbc8b3 100644
--- a/plugins/authentication/ldap/ldap.xml
+++ b/plugins/authentication/ldap/ldap.xml
@@ -3,7 +3,7 @@
 	<name>plg_authentication_ldap</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/behaviour/taggable/taggable.php b/plugins/behaviour/taggable/taggable.php
index 1a08b786d4af9..bfee5d5ca4f86 100644
--- a/plugins/behaviour/taggable/taggable.php
+++ b/plugins/behaviour/taggable/taggable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Taggable
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/behaviour/taggable/taggable.xml b/plugins/behaviour/taggable/taggable.xml
index c374865f7b4eb..bbc2fe39b17da 100644
--- a/plugins/behaviour/taggable/taggable.xml
+++ b/plugins/behaviour/taggable/taggable.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="4.0" type="plugin" group="behaviour" method="upgrade">
 	<name>plg_behaviour_taggable</name>
-	<version>4.0.0.</version>
+	<version>4.0.0</version>
 	<creationDate>August 2015</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>PLG_BEHAVIOUR_TAGGABLE_XML_DESCRIPTION</description>
 	<files>
diff --git a/plugins/behaviour/versionable/versionable.php b/plugins/behaviour/versionable/versionable.php
index 810ac32296a50..8549e09c78159 100644
--- a/plugins/behaviour/versionable/versionable.php
+++ b/plugins/behaviour/versionable/versionable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Taggable
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/behaviour/versionable/versionable.xml b/plugins/behaviour/versionable/versionable.xml
index 4d78a2c7cc666..baf735b46ee71 100644
--- a/plugins/behaviour/versionable/versionable.xml
+++ b/plugins/behaviour/versionable/versionable.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="4.0" type="plugin" group="behaviour" method="upgrade">
 	<name>plg_behaviour_versionable</name>
-	<version>4.0.0.</version>
+	<version>4.0.0</version>
 	<creationDate>August 2015</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>PLG_BEHAVIOUR_VERSIONABLE_XML_DESCRIPTION</description>
 	<files>
diff --git a/plugins/captcha/recaptcha/recaptcha.php b/plugins/captcha/recaptcha/recaptcha.php
index 9022c9814ca64..0f15fe38da95f 100644
--- a/plugins/captcha/recaptcha/recaptcha.php
+++ b/plugins/captcha/recaptcha/recaptcha.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Captcha
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,11 +14,12 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\Utilities\IpHelper;
 use ReCaptcha\ReCaptcha;
 
 /**
- * Recaptcha Plugin.
- * Based on the official recaptcha library( https://developers.google.com/recaptcha/docs/php )
+ * Recaptcha Plugin
+ * Based on the official recaptcha library( https://packagist.org/packages/google/recaptcha )
  *
  * @since  2.5
  */
@@ -32,6 +33,24 @@ class PlgCaptchaRecaptcha extends CMSPlugin
 	 */
 	protected $autoloadLanguage = true;
 
+	/**
+	 * Reports the privacy related capabilities for this plugin to site administrators.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.9.0
+	 */
+	public function onPrivacyCollectAdminCapabilities()
+	{
+		$this->loadLanguage();
+
+		return array(
+			JText::_('PLG_CAPTCHA_RECAPTCHA') => array(
+				JText::_('PLG_RECAPTCHA_PRIVACY_CAPABILITY_IP_ADDRESS'),
+			)
+		);
+	}
+
 	/**
 	 * Initialise the captcha
 	 *
@@ -39,9 +58,8 @@ class PlgCaptchaRecaptcha extends CMSPlugin
 	 *
 	 * @return  Boolean	True on success, false otherwise
 	 *
-	 * @throws  Exception
-	 *
-	 * @since  2.5
+	 * @since   2.5
+	 * @throws  \RuntimeException
 	 */
 	public function onInit($id = 'dynamic_recaptcha_1')
 	{
@@ -49,7 +67,7 @@ public function onInit($id = 'dynamic_recaptcha_1')
 
 		if ($pubkey === '')
 		{
-			throw new Exception(Text::_('PLG_RECAPTCHA_ERROR_NO_PUBLIC_KEY'));
+			throw new \RuntimeException(Text::_('PLG_RECAPTCHA_ERROR_NO_PUBLIC_KEY'));
 		}
 
 		// Load callback first for browser compatibility
@@ -68,8 +86,7 @@ public function onInit($id = 'dynamic_recaptcha_1')
 	 *
 	 * @param   string  $name   The name of the field. Not Used.
 	 * @param   string  $id     The id of the field.
-	 * @param   string  $class  The class of the field. This should be passed as
-	 *                          e.g. 'class="required"'.
+	 * @param   string  $class  The class of the field.
 	 *
 	 * @return  string  The HTML to be embedded in the form.
 	 *
@@ -77,11 +94,21 @@ public function onInit($id = 'dynamic_recaptcha_1')
 	 */
 	public function onDisplay($name = null, $id = 'dynamic_recaptcha_1', $class = '')
 	{
-		return '<div id="' . $id . '" ' . str_replace('class="', 'class="g-recaptcha ', $class)
-				. ' data-sitekey="' . $this->params->get('public_key', '')
-				. '" data-theme="' . $this->params->get('theme2', 'light')
-				. '" data-size="' . $this->params->get('size', 'normal')
-				. '"></div>';
+		$dom = new \DOMDocument('1.0', 'UTF-8');
+		$ele = $dom->createElement('div');
+		$ele->setAttribute('id', $id);
+
+		$ele->setAttribute('class', ((trim($class) == '') ? 'g-recaptcha' : ($class . ' g-recaptcha')));
+		$ele->setAttribute('data-sitekey', $this->params->get('public_key', ''));
+		$ele->setAttribute('data-theme', $this->params->get('theme2', 'light'));
+		$ele->setAttribute('data-size', $this->params->get('size', 'normal'));
+		$ele->setAttribute('data-tabindex', $this->params->get('tabindex', '0'));
+		$ele->setAttribute('data-callback', $this->params->get('callback', ''));
+		$ele->setAttribute('data-expired-callback', $this->params->get('expired_callback', ''));
+		$ele->setAttribute('data-error-callback', $this->params->get('error_callback', ''));
+
+		$dom->appendChild($ele);
+		return $dom->saveHTML($ele);
 	}
 
 	/**
@@ -91,23 +118,21 @@ public function onDisplay($name = null, $id = 'dynamic_recaptcha_1', $class = ''
 	 *
 	 * @return  True if the answer is correct, false otherwise
 	 *
-	 * @since  2.5
+	 * @since   2.5
+	 * @throws  \RuntimeException
 	 */
 	public function onCheckAnswer($code = null)
 	{
 		$input      = Factory::getApplication()->input;
 		$privatekey = $this->params->get('private_key');
 		$version    = $this->params->get('version', '2.0');
-		$remoteip   = $input->server->get('REMOTE_ADDR', '', 'string');
-		$challenge  = null;
+		$remoteip   = IpHelper::getIp();
 		$response   = null;
 		$spam       = false;
 
 		switch ($version)
 		{
 			case '2.0':
-				// Challenge Not needed in 2.0 but needed for getResponse call
-				$challenge = null;
 				$response  = $input->get('g-recaptcha-response', '', 'string');
 				$spam      = ($response === '');
 				break;
@@ -116,22 +141,22 @@ public function onCheckAnswer($code = null)
 		// Check for Private Key
 		if (empty($privatekey))
 		{
-			throw new RuntimeException(Text::_('PLG_RECAPTCHA_ERROR_NO_PRIVATE_KEY'), 500);
+			throw new \RuntimeException(Text::_('PLG_RECAPTCHA_ERROR_NO_PRIVATE_KEY'), 500);
 		}
 
 		// Check for IP
 		if (empty($remoteip))
 		{
-			throw new RuntimeException(Text::_('PLG_RECAPTCHA_ERROR_NO_IP'), 500);
+			throw new \RuntimeException(Text::_('PLG_RECAPTCHA_ERROR_NO_IP'), 500);
 		}
 
 		// Discard spam submissions
 		if ($spam)
 		{
-			throw new RuntimeException(Text::_('PLG_RECAPTCHA_ERROR_EMPTY_SOLUTION'), 500);
+			throw new \RuntimeException(Text::_('PLG_RECAPTCHA_ERROR_EMPTY_SOLUTION'), 500);
 		}
 
-		return $this->getResponse($privatekey, $remoteip, $response, $challenge);
+		return $this->getResponse($privatekey, $remoteip, $response);
 	}
 
 	/**
@@ -144,6 +169,7 @@ public function onCheckAnswer($code = null)
 	 * @return  bool True if response is good | False if response is bad.
 	 *
 	 * @since   3.4
+	 * @throws  \RuntimeException
 	 */
 	private function getResponse(string $privatekey, string $remoteip, string $response)
 	{
@@ -158,7 +184,7 @@ private function getResponse(string $privatekey, string $remoteip, string $respo
 				{
 					foreach ($apiResponse->getErrorCodes() as $error)
 					{
-						throw new RuntimeException($error, 403);
+						throw new \RuntimeException($error, 403);
 					}
 
 					return false;
diff --git a/plugins/captcha/recaptcha/recaptcha.xml b/plugins/captcha/recaptcha/recaptcha.xml
index 2dba052c491a1..a504a6a87a5aa 100644
--- a/plugins/captcha/recaptcha/recaptcha.xml
+++ b/plugins/captcha/recaptcha/recaptcha.xml
@@ -6,7 +6,7 @@
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION</description>
 	<files>
@@ -32,7 +32,8 @@
 					default=""
 					required="true"
 					filter="string"
-					size="50"
+					size="100"
+					class="input-xxlarge"
 				/>
 
 				<field
@@ -42,7 +43,8 @@
 					default=""
 					required="true"
 					filter="string"
-					size="50"
+					size="100"
+					class="input-xxlarge"
 				/>
 
 				<field
@@ -68,6 +70,46 @@
 					<option value="normal">PLG_RECAPTCHA_THEME_NORMAL</option>
 					<option value="compact">PLG_RECAPTCHA_THEME_COMPACT</option>
 				</field>
+
+				<field
+					name="tabindex"
+					type="number"
+					label="PLG_RECAPTCHA_TABINDEX_LABEL"
+					description="PLG_RECAPTCHA_TABINDEX_DESC"
+					default="0"
+					showon="version:2.0"
+					min="0"
+				/>
+
+				<field
+					name="callback"
+					type="text"
+					label="PLG_RECAPTCHA_CALLBACK_LABEL"
+					description="PLG_RECAPTCHA_CALLBACK_DESC"
+					default=""
+					showon="version:2.0"
+					filter="string"
+				/>
+
+				<field
+					name="expired_callback"
+					type="text"
+					label="PLG_RECAPTCHA_EXPIRED_CALLBACK_LABEL"
+					description="PLG_RECAPTCHA_EXPIRED_CALLBACK_DESC"
+					default=""
+					showon="version:2.0"
+					filter="string"
+				/>
+
+				<field
+					name="error_callback"
+					type="text"
+					label="PLG_RECAPTCHA_ERROR_CALLBACK_LABEL"
+					description="PLG_RECAPTCHA_ERROR_CALLBACK_DESC"
+					default=""
+					showon="version:2.0"
+					filter="string"
+				/>
 			</fieldset>
 		</fields>
 	</config>
diff --git a/plugins/captcha/recaptcha_invisible/recaptcha_invisible.php b/plugins/captcha/recaptcha_invisible/recaptcha_invisible.php
new file mode 100644
index 0000000000000..1c95070f8e242
--- /dev/null
+++ b/plugins/captcha/recaptcha_invisible/recaptcha_invisible.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Captcha
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Captcha\Google\HttpBridgePostRequestMethod;
+use Joomla\Utilities\IpHelper; 
+
+/**
+ * Invisible reCAPTCHA Plugin.
+ *
+ * @since  3.9.0
+ */
+class PlgCaptchaRecaptcha_Invisible extends \JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.9.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Reports the privacy related capabilities for this plugin to site administrators.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.9.0
+	 */
+	public function onPrivacyCollectAdminCapabilities()
+	{
+		$this->loadLanguage();
+
+		return array(
+			JText::_('PLG_CAPTCHA_RECAPTCHA_INVISIBLE') => array(
+				JText::_('PLG_RECAPTCHA_INVISIBLE_PRIVACY_CAPABILITY_IP_ADDRESS'),
+			)
+		);
+	}
+
+	/**
+	 * Initialise the captcha
+	 *
+	 * @param   string  $id  The id of the field.
+	 *
+	 * @return  boolean	True on success, false otherwise
+	 *
+	 * @since   3.9.0
+	 * @throws  \RuntimeException
+	 */
+	public function onInit($id = 'dynamic_recaptcha_invisible_1')
+	{
+		$pubkey = $this->params->get('public_key', '');
+
+		if ($pubkey === '')
+		{
+			throw new \RuntimeException(JText::_('PLG_RECAPTCHA_INVISIBLE_ERROR_NO_PUBLIC_KEY'));
+		}
+
+		// Load callback first for browser compatibility
+		\JHtml::_(
+			'script',
+			'plg_captcha_recaptcha_invisible/recaptcha.min.js',
+			array('version' => 'auto', 'relative' => true),
+			array('async' => 'async', 'defer' => 'defer')
+		);
+
+		// Load Google reCAPTCHA api js
+		$file = 'https://www.google.com/recaptcha/api.js'
+			. '?onload=JoomlaInitReCaptchaInvisible'
+			. '&render=explicit'
+			. '&hl=' . \JFactory::getLanguage()->getTag();
+		\JHtml::_(
+			'script',
+			$file,
+			array(),
+			array('async' => 'async', 'defer' => 'defer')
+		);
+
+		return true;
+	}
+
+	/**
+	 * Gets the challenge HTML
+	 *
+	 * @param   string  $name   The name of the field. Not Used.
+	 * @param   string  $id     The id of the field.
+	 * @param   string  $class  The class of the field.
+	 *
+	 * @return  string  The HTML to be embedded in the form.
+	 *
+	 * @since  3.9.0
+	 */
+	public function onDisplay($name = null, $id = 'dynamic_recaptcha_invisible_1', $class = '')
+	{
+		$dom = new \DOMDocument('1.0', 'UTF-8');
+		$ele = $dom->createElement('div');
+		$ele->setAttribute('id', $id);
+		$ele->setAttribute('class', ((trim($class) == '') ? 'g-recaptcha' : ($class . ' g-recaptcha')));
+		$ele->setAttribute('data-sitekey', $this->params->get('public_key', ''));
+		$ele->setAttribute('data-badge', $this->params->get('badge', 'bottomright'));
+		$ele->setAttribute('data-size', 'invisible');
+		$ele->setAttribute('data-tabindex', $this->params->get('tabindex', '0'));
+		$ele->setAttribute('data-callback', $this->params->get('callback', ''));
+		$ele->setAttribute('data-expired-callback', $this->params->get('expired_callback', ''));
+		$ele->setAttribute('data-error-callback', $this->params->get('error_callback', ''));
+		$dom->appendChild($ele);
+
+		return $dom->saveHTML($ele);
+	}
+
+	/**
+	 * Calls an HTTP POST function to verify if the user's guess was correct
+	 *
+	 * @param   string  $code  Answer provided by user. Not needed for the Recaptcha implementation
+	 *
+	 * @return  boolean  True if the answer is correct, false otherwise
+	 *
+	 * @since   3.9.0
+	 * @throws  \RuntimeException
+	 */
+	public function onCheckAnswer($code = null)
+	{
+		$input      = \JFactory::getApplication()->input;
+		$privatekey = $this->params->get('private_key');
+		$remoteip   = IpHelper::getIp();
+
+		$response  = $input->get('g-recaptcha-response', '', 'string');
+
+		// Check for Private Key
+		if (empty($privatekey))
+		{
+			throw new \RuntimeException(JText::_('PLG_RECAPTCHA_INVISIBLE_ERROR_NO_PRIVATE_KEY'));
+		}
+
+		// Check for IP
+		if (empty($remoteip))
+		{
+			throw new \RuntimeException(JText::_('PLG_RECAPTCHA_INVISIBLE_ERROR_NO_IP'));
+		}
+
+		// Discard spam submissions
+		if (trim($response) == '')
+		{
+			throw new \RuntimeException(JText::_('PLG_RECAPTCHA_INVISIBLE_ERROR_EMPTY_SOLUTION'));
+		}
+
+		return $this->getResponse($privatekey, $remoteip, $response);
+	}
+
+	/**
+	 * Method to react on the setup of a captcha field. Gives the possibility
+	 * to change the field and/or the XML element for the field.
+	 *
+	 * @param   \Joomla\CMS\Form\Field\CaptchaField  $field    Captcha field instance
+	 * @param   \SimpleXMLElement                    $element  XML form definition
+	 *
+	 * @return void
+	 *
+	 * @since 3.9.0
+	 */
+	public function onSetupField(\Joomla\CMS\Form\Field\CaptchaField $field, \SimpleXMLElement $element)
+	{
+		// Hide the label for the invisible recaptcha type
+		$element['hiddenLabel'] = true;
+	}
+
+	/**
+	 * Get the reCaptcha response.
+	 *
+	 * @param   string  $privatekey  The private key for authentication.
+	 * @param   string  $remoteip    The remote IP of the visitor.
+	 * @param   string  $response    The response received from Google.
+	 *
+	 * @return  boolean  True if response is good | False if response is bad.
+	 *
+	 * @since   3.9.0
+	 * @throws  \RuntimeException
+	 */
+	private function getResponse($privatekey, $remoteip, $response)
+	{
+		$reCaptcha = new \ReCaptcha\ReCaptcha($privatekey, new HttpBridgePostRequestMethod);
+		$response = $reCaptcha->verify($response, $remoteip);
+
+		if (!$response->isSuccess())
+		{
+			foreach ($response->getErrorCodes() as $error)
+			{
+				throw new \RuntimeException($error);
+			}
+
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/plugins/captcha/recaptcha_invisible/recaptcha_invisible.xml b/plugins/captcha/recaptcha_invisible/recaptcha_invisible.xml
new file mode 100644
index 0000000000000..f0a1275faa8f9
--- /dev/null
+++ b/plugins/captcha/recaptcha_invisible/recaptcha_invisible.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.8" type="plugin" group="captcha" method="upgrade">
+	<name>plg_captcha_recaptcha_invisible</name>
+	<version>3.8</version>
+	<creationDate>November 2017</creationDate>
+	<author>Joomla! Project</author>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<description>PLG_CAPTCHA_RECAPTCHA_INVISIBLE_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="recaptcha_invisible">recaptcha_invisible.php</filename>
+	</files>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+
+				<field
+					name="public_key"
+					type="text"
+					label="PLG_RECAPTCHA_INVISIBLE_PUBLIC_KEY_LABEL"
+					description="PLG_RECAPTCHA_INVISIBLE_PUBLIC_KEY_DESC"
+					default=""
+					required="true"
+					filter="string"
+					size="100"
+					class="input-xxlarge"
+				/>
+
+				<field
+					name="private_key"
+					type="text"
+					label="PLG_RECAPTCHA_INVISIBLE_PRIVATE_KEY_LABEL"
+					description="PLG_RECAPTCHA_INVISIBLE_PRIVATE_KEY_DESC"
+					default=""
+					required="true"
+					filter="string"
+					size="100"
+					class="input-xxlarge"
+				/>
+
+				<field
+					name="badge"
+					type="list"
+					label="PLG_RECAPTCHA_INVISIBLE_BADGE_LABEL"
+					description="PLG_RECAPTCHA_INVISIBLE_BADGE_DESC"
+					default="bottomright"
+					>
+					<option value="bottomright">PLG_RECAPTCHA_INVISIBLE_BADGE_BOTTOMRIGHT</option>
+					<option value="bottomleft">PLG_RECAPTCHA_INVISIBLE_BADGE_BOTTOMLEFT</option>
+					<option value="inline">PLG_RECAPTCHA_INVISIBLE_BADGE_INLINE</option>
+				</field>
+
+				<field
+					name="tabindex"
+					type="number"
+					label="PLG_RECAPTCHA_INVISIBLE_TABINDEX_LABEL"
+					description="PLG_RECAPTCHA_INVISIBLE_TABINDEX_DESC"
+					default="0"
+					min="0"
+					filter="integer"
+				/>
+
+				<field
+					name="callback"
+					type="text"
+					label="PLG_RECAPTCHA_INVISIBLE_CALLBACK_LABEL"
+					description="PLG_RECAPTCHA_INVISIBLE_CALLBACK_DESC"
+					default=""
+					filter="string"
+				/>
+
+				<field
+					name="expired_callback"
+					type="text"
+					label="PLG_RECAPTCHA_INVISIBLE_EXPIRED_CALLBACK_LABEL"
+					description="PLG_RECAPTCHA_INVISIBLE_EXPIRED_CALLBACK_DESC"
+					default=""
+					filter="string"
+				/>
+
+				<field
+					name="error_callback"
+					type="text"
+					label="PLG_RECAPTCHA_INVISIBLE_ERROR_CALLBACK_LABEL"
+					description="PLG_RECAPTCHA_INVISIBLE_ERROR_CALLBACK_DESC"
+					default=""
+					filter="string"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/plugins/content/confirmconsent/confirmconsent.php b/plugins/content/confirmconsent/confirmconsent.php
new file mode 100644
index 0000000000000..56b38e31ac295
--- /dev/null
+++ b/plugins/content/confirmconsent/confirmconsent.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.confirmconsent
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
+
+/**
+ * The Joomla Core confirm consent plugin
+ *
+ * @since  3.9.0
+ */
+class PlgContentConfirmConsent extends CMSPlugin
+{
+	/**
+	 * The Application object
+	 *
+	 * @var    JApplicationSite
+	 * @since  3.9.0
+	 */
+	protected $app;
+
+	/**
+	 * The Database object.
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.9.0
+	 */
+	protected $db;
+
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.9.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * The supported form contexts
+	 *
+	 * @var    array
+	 * @since  3.9.0
+	 */
+	protected $supportedContext = array(
+		'com_contact.contact',
+		'com_mailto.mailto',
+		'com_privacy.request',
+	);
+
+	/**
+	 * Add additional fields to the supported forms
+	 *
+	 * @param   JForm  $form  The form to be altered.
+	 * @param   mixed  $data  The associated data for the form.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function onContentPrepareForm(JForm $form, $data)
+	{
+		if ($this->app->isClient('administrator') || !in_array($form->getName(), $this->supportedContext))
+		{
+			return true;
+		}
+
+		// Get the consent box Text & the selected privacyarticle
+		$consentboxLabel = JText::_('PLG_CONTENT_CONFIRMCONSENT_CONSENTBOX_LABEL');
+		$consentboxText  = (string) $this->params->get('consentbox_text', Text::_('PLG_CONTENT_CONFIRMCONSENT_FIELD_NOTE_DEFAULT'));
+		$privacyArticle  = $this->params->get('privacy_article', false);
+
+		// When we have a article just add it arround to the text
+		if ($privacyArticle)
+		{
+			HTMLHelper::_('behavior.modal');
+
+			$consentboxLabel = $this->getAssignedArticleUrl($privacyArticle, $consentboxLabel);
+		}
+
+		$form->load('
+			<form>
+				<fieldset name="default">
+					<field
+						name="consentbox"
+						type="checkboxes"
+						label="' . htmlspecialchars($consentboxLabel, ENT_COMPAT, 'UTF-8') . '"
+						required="true"
+						>
+						<option value="0">' . htmlspecialchars($consentboxText, ENT_COMPAT, 'UTF-8') . '</option>
+					</field>
+				</fieldset>
+			</form>'
+		);
+
+		return true;
+	}
+
+	/**
+	 * Return the url of the assigned article based on the current user language
+	 *
+	 * @param   integer  $articleId        The form to be altered.
+	 * @param   string   $consentboxLabel  The consent box label
+	 *
+	 * @return  string  Returns the a tag containing everything for the modal
+	 *
+	 * @since   3.9.0
+	 */
+	private function getAssignedArticleUrl($articleId, $consentboxLabel)
+	{
+		// Get the info from the article
+		$query = $this->db->getQuery(true)
+			->select($this->db->quoteName(array('id', 'catid', 'language')))
+			->from($this->db->quoteName('#__content'))
+			->where($this->db->quoteName('id') . ' = ' . (int) $articleId);
+		$this->db->setQuery($query);
+
+		$attribs          = array();
+		$attribs['class'] = 'modal';
+		$attribs['rel']   = '{handler: \'iframe\', size: {x:800, y:500}}';
+
+		try
+		{
+			$article = $this->db->loadObject();
+		}
+		catch (JDatabaseExceptionExecuting $e)
+		{
+			// Something at the database layer went wrong
+			return HTMLHelper::_(
+				'link',
+				Route::_(
+					'index.php?option=com_content&view=article&id='
+					. $articleId . '&tmpl=component'
+				),
+				$consentboxLabel,
+				$attribs
+			);
+		}
+
+		// Register ContentHelperRoute
+		JLoader::register('ContentHelperRoute', JPATH_BASE . '/components/com_content/helpers/route.php');
+
+		if (!Associations::isEnabled())
+		{
+			return HTMLHelper::_('link',
+				Route::_(
+					ContentHelperRoute::getArticleRoute(
+						$article->id,
+						$article->catid,
+						$article->language
+					) . '&tmpl=component'
+				),
+				$consentboxLabel,
+				$attribs
+			);
+		}
+
+		$associatedArticles = Associations::getAssociations('com_content', '#__content', 'com_content.item', $article->id);
+		$currentLang        = Factory::getLanguage()->getTag();
+
+		if (isset($associatedArticles) && $currentLang !== $article->language && array_key_exists($currentLang, $associatedArticles))
+		{
+			return HTMLHelper::_('link',
+				Route::_(
+					ContentHelperRoute::getArticleRoute(
+						$associatedArticles[$currentLang]->id,
+						$associatedArticles[$currentLang]->catid,
+						$associatedArticles[$currentLang]->language
+					) . '&tmpl=component'
+				),
+				$consentboxLabel,
+				$attribs
+			);
+		}
+
+		// Association is enabled but this article is not associated
+		return HTMLHelper::_(
+			'link',
+			Route::_(
+				'index.php?option=com_content&view=article&id='
+					. $article->id . '&catid=' . $article->catid
+					. '&tmpl=component&lang=' . $article->language
+			),
+			$consentboxLabel,
+			$attribs
+		);
+	}
+}
diff --git a/plugins/content/confirmconsent/confirmconsent.xml b/plugins/content/confirmconsent/confirmconsent.xml
new file mode 100644
index 0000000000000..dfec50159c96c
--- /dev/null
+++ b/plugins/content/confirmconsent/confirmconsent.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.9" type="plugin" group="content" method="upgrade">
+	<name>plg_content_confirmconsent</name>
+	<author>Joomla! Project</author>
+	<creationDate>May 2018</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>PLG_CONTENT_CONFIRMCONSENT_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="confirmconsent">confirmconsent.php</filename>
+	</files>
+	<config>
+		<fields name="params">
+			<fieldset name="basic" addfieldpath="/administrator/components/com_content/models/fields">
+				<field
+					name="consentbox_text"
+					type="textarea"
+					label="PLG_CONTENT_CONFIRMCONSENT_FIELD_NOTE_LABEL"
+					description="PLG_CONTENT_CONFIRMCONSENT_FIELD_NOTE_DESC"
+					hint="PLG_CONTENT_CONFIRMCONSENT_FIELD_NOTE_DEFAULT"
+					class="span12"
+					rows="7"
+					cols="20"
+					filter="html"
+				/>
+
+				<field
+					name="privacy_article"
+					type="modal_article"
+					label="PLG_CONTENT_CONFIRMCONSENT_FIELD_ARTICLE_LABEL"
+					description="PLG_CONTENT_CONFIRMCONSENT_FIELD_ARTICLE_DESC"
+					select="true"
+					new="true"
+					edit="true"
+					clear="true"
+					filter="integer"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
\ No newline at end of file
diff --git a/plugins/content/contact/contact.php b/plugins/content/contact/contact.php
index 7fe97a0b82fe8..0aa450f00cc0f 100644
--- a/plugins/content/contact/contact.php
+++ b/plugins/content/contact/contact.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.Contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -55,20 +55,36 @@ public function onContentPrepare($context, &$row, $params, $page = 0)
 			return true;
 		}
 
+		// Return if an alias is used
+		if ($this->params->get('link_to_alias') == 0 & $row->created_by_alias != '')
+		{
+			return true;
+		}
+
 		// Return if we don't have a valid article id
 		if (!isset($row->id) || !(int) $row->id)
 		{
 			return true;
 		}
 
-		$contact = $this->getContactId($row->created_by);
+		$contact = $this->getContactData($row->created_by);
 		$row->contactid = $contact->contactid;
+		$row->webpage = $contact->webpage;
+		$row->email = $contact->email_to;
 
-		if ($row->contactid)
+		if ($row->contactid && $this->params->get('url') == 'url')
 		{
 			JLoader::register('ContactHelperRoute', JPATH_SITE . '/components/com_contact/helpers/route.php');
 			$row->contact_link = Route::_(ContactHelperRoute::getContactRoute($contact->contactid . ':' . $contact->alias, $contact->catid));
 		}
+		elseif ($row->webpage && $this->params->get('url') == 'webpage')
+		{
+			$row->contact_link = $row->webpage;
+		}
+		elseif ($row->email && $this->params->get('url') == 'email')
+		{
+			$row->contact_link = 'mailto:' . $row->email;
+		}
 		else
 		{
 			$row->contact_link = '';
@@ -84,7 +100,7 @@ public function onContentPrepare($context, &$row, $params, $page = 0)
 	 *
 	 * @return  mixed|null|integer
 	 */
-	protected function getContactId($created_by)
+	protected function getContactData($created_by)
 	{
 		static $contacts = array();
 
@@ -95,7 +111,7 @@ protected function getContactId($created_by)
 
 		$query = $this->db->getQuery(true);
 
-		$query->select('MAX(contact.id) AS contactid, contact.alias, contact.catid');
+		$query->select('MAX(contact.id) AS contactid, contact.alias, contact.catid, contact.webpage, contact.email_to');
 		$query->from($this->db->quoteName('#__contact_details', 'contact'));
 		$query->where('contact.published = 1');
 		$query->where('contact.user_id = ' . (int) $created_by);
diff --git a/plugins/content/contact/contact.xml b/plugins/content/contact/contact.xml
index fe5aac18033e5..267f98d850c90 100644
--- a/plugins/content/contact/contact.xml
+++ b/plugins/content/contact/contact.xml
@@ -3,7 +3,7 @@
 	<name>plg_content_contact</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2014</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
@@ -18,6 +18,31 @@
 	</languages>
 	<config>
 		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="url"
+					type="list"
+					label="PLG_CONTENT_CONTACT_PARAM_URL_LABEL"
+					description="PLG_CONTENT_CONTACT_PARAM_URL_DESCRIPTION"
+					default="0"
+					>
+					<option value="url">PLG_CONTENT_CONTACT_PARAM_URL_URL</option>
+					<option value="webpage">PLG_CONTENT_CONTACT_PARAM_URL_WEBPAGE</option>
+					<option value="email">PLG_CONTENT_CONTACT_PARAM_URL_EMAIL</option>
+				</field>
+
+				<field
+					name="link_to_alias"
+					type="radio"
+					label="PLG_CONTENT_CONTACT_PARAM_ALIAS_LABEL"
+					description="PLG_CONTENT_CONTACT_PARAM_ALIAS_DESCRIPTION"
+					default="0"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+			</fieldset>
 		</fields>
 	</config>
 </extension>
diff --git a/plugins/content/emailcloak/emailcloak.php b/plugins/content/emailcloak/emailcloak.php
index 5300ecf88022b..4846406132dec 100644
--- a/plugins/content/emailcloak/emailcloak.php
+++ b/plugins/content/emailcloak/emailcloak.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.emailcloak
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -413,9 +413,9 @@ protected function _cloak(&$text, &$params)
 		/*
 		 * Search for plain text email addresses, such as email@example.org but not within HTML tags:
 		 * <img src="..." title="email@example.org"> or <input type="text" placeholder="email@example.org">
-		 * The negative lookahead '(?![^<]*>)' is used to exclude this kind of occurrences
+		 * The '<[^<]*>(*SKIP)(*F)|' trick is used to exclude this kind of occurrences
 		 */
-		$pattern = '~(?![^<>]*>)' . $searchEmail . '~i';
+		$pattern = '~<[^<]*>(*SKIP)(*F)|' . $searchEmail . '~i';
 
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{
diff --git a/plugins/content/emailcloak/emailcloak.xml b/plugins/content/emailcloak/emailcloak.xml
index 2142a5ba010f0..e8d88586934c4 100644
--- a/plugins/content/emailcloak/emailcloak.xml
+++ b/plugins/content/emailcloak/emailcloak.xml
@@ -3,7 +3,7 @@
 	<name>plg_content_emailcloak</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/content/fields/fields.php b/plugins/content/fields/fields.php
index 1f22c1e821f45..33b4c44a2cea7 100644
--- a/plugins/content/fields/fields.php
+++ b/plugins/content/fields/fields.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.Fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -116,13 +116,13 @@ private function prepare($string, $context, $item)
 			// $match[0] is the full pattern match, $match[1] is the type (field or fieldgroup) and $match[2] the ID and optional the layout
 			$explode = explode(',', $match[2]);
 			$id      = (int) $explode[0];
-			$layout  = !empty($explode[1]) ? trim($explode[1]) : 'render';
 			$output  = '';
 
 			if ($match[1] === 'field' && $id)
 			{
 				if (isset($fieldsById[$id]))
 				{
+					$layout = !empty($explode[1]) ? trim($explode[1]) : $fieldsById[$id]->params->get('layout', 'render');
 					$output = FieldsHelper::render(
 						$context,
 						'field.' . $layout,
@@ -148,6 +148,7 @@ private function prepare($string, $context, $item)
 
 				if ($renderFields)
 				{
+					$layout = !empty($explode[1]) ? trim($explode[1]) : 'render';
 					$output = FieldsHelper::render(
 						$context,
 						'fields.' . $layout,
diff --git a/plugins/content/fields/fields.xml b/plugins/content/fields/fields.xml
index 2ebcd27c2398a..72663879c55cf 100644
--- a/plugins/content/fields/fields.xml
+++ b/plugins/content/fields/fields.xml
@@ -3,7 +3,7 @@
 	<name>plg_content_fields</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2017</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/content/finder/finder.php b/plugins/content/finder/finder.php
index 2760967ba9bea..bbd8f13c0a4a4 100644
--- a/plugins/content/finder/finder.php
+++ b/plugins/content/finder/finder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/content/finder/finder.xml b/plugins/content/finder/finder.xml
index afd19630f514a..73f4b939b1664 100644
--- a/plugins/content/finder/finder.xml
+++ b/plugins/content/finder/finder.xml
@@ -3,7 +3,7 @@
 	<name>plg_content_finder</name>
 	<author>Joomla! Project</author>
 	<creationDate>December 2011</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/content/joomla/joomla.php b/plugins/content/joomla/joomla.php
index e79bb533d64b1..58e86ec1455af 100644
--- a/plugins/content/joomla/joomla.php
+++ b/plugins/content/joomla/joomla.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.joomla
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/content/joomla/joomla.xml b/plugins/content/joomla/joomla.xml
index 2cd076ce9163b..1694f72e5d17b 100644
--- a/plugins/content/joomla/joomla.xml
+++ b/plugins/content/joomla/joomla.xml
@@ -3,7 +3,7 @@
 	<name>plg_content_joomla</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2010</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/content/loadmodule/loadmodule.php b/plugins/content/loadmodule/loadmodule.php
index ca42e57843582..bf89b5cd8ddf7 100644
--- a/plugins/content/loadmodule/loadmodule.php
+++ b/plugins/content/loadmodule/loadmodule.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.loadmodule
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -59,6 +59,9 @@ public function onContentPrepare($context, &$article, &$params, $page = 0)
 		$regexmod = '/{loadmodule\s(.*?)}/i';
 		$stylemod = $this->params->def('style', 'none');
 
+		// Expression to search for(id)
+		$regexmodid = '/{loadmoduleid\s([1-9][0-9]*)}/i';
+
 		// Find all instances of plugin and put in $matches for loadposition
 		// $matches[0] is full pattern match, $matches[1] is the position
 		preg_match_all($regex, $article->text, $matches, PREG_SET_ORDER);
@@ -121,6 +124,23 @@ public function onContentPrepare($context, &$article, &$params, $page = 0)
 				$stylemod = $this->params->def('style', 'none');
 			}
 		}
+
+		// Find all instances of plugin and put in $matchesmodid for loadmoduleid
+		preg_match_all($regexmodid, $article->text, $matchesmodid, PREG_SET_ORDER);
+
+		// If no matches, skip this
+		if ($matchesmodid)
+		{
+			foreach ($matchesmodid as $match)
+			{
+				$id     = trim($match[1]);
+				$output = $this->_loadid($id);
+
+				// We should replace only first occurrence in order to allow positions with the same name to regenerate their content:
+				$article->text = preg_replace("|$match[0]|", addcslashes($output, '\\$'), $article->text, 1);
+				$style = $this->params->def('style', 'none');
+			}
+		}
 	}
 
 	/**
@@ -191,4 +211,32 @@ protected function _loadmod($module, $title, $style = 'none')
 
 		return self::$mods[$module];
 	}
+
+	/**
+	 * Loads and renders the module
+	 *
+	 * @param   string  $id  The id of the module
+	 *
+	 * @return  mixed
+	 *
+	 * @since   3.9.0
+	 */
+	protected function _loadid($id)
+	{
+		self::$modules[$id] = '';
+		$document = JFactory::getDocument();
+		$renderer = $document->loadRenderer('module');
+		$modules  = JModuleHelper::getModuleById($id);
+		$params   = array('style' => 'none');
+		ob_start();
+
+		if ($modules->id > 0)
+		{
+			echo $renderer->render($modules, $params);
+		}
+
+		self::$modules[$id] = ob_get_clean();
+
+		return self::$modules[$id];
+	}
 }
diff --git a/plugins/content/loadmodule/loadmodule.xml b/plugins/content/loadmodule/loadmodule.xml
index 2bee46607a68e..a747544cb1bd2 100644
--- a/plugins/content/loadmodule/loadmodule.xml
+++ b/plugins/content/loadmodule/loadmodule.xml
@@ -3,7 +3,7 @@
 	<name>plg_content_loadmodule</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/content/pagebreak/pagebreak.php b/plugins/content/pagebreak/pagebreak.php
index 5ac3e31f76669..bfe333eb12fd3 100644
--- a/plugins/content/pagebreak/pagebreak.php
+++ b/plugins/content/pagebreak/pagebreak.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.pagebreak
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -59,7 +59,7 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
 		$style = $this->params->get('style', 'pages');
 
 		// Expression to search for.
-		$regex = '#<hr(.*)class="system-pagebreak"(.*)\/>#iU';
+		$regex = '#<hr(.*)class="system-pagebreak"(.*)\/?>#iU';
 
 		$input = Factory::getApplication()->input;
 
@@ -177,6 +177,9 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
 				// Traditional mos page navigation
 				$pageNav = new Pagination($n, $page, 1);
 
+				// Flag indicates to not add limitstart=0 to URL
+				$pageNav->hideEmptyLimitstart = true;
+
 				// Page counter.
 				$row->text .= '<div class="pagenavcounter">';
 				$row->text .= $pageNav->getPagesCounter();
@@ -289,15 +292,14 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
 	 */
 	protected function _createToc(&$row, &$matches, &$page)
 	{
-		$heading = $row->title ?? Text::_('PLG_CONTENT_PAGEBREAK_NO_TITLE');
-		$input = Factory::getApplication()->input;
-		$limitstart = $input->getUInt('limitstart', 0);
-		$showall = $input->getInt('showall', 0);
-
-		// TOC header.
-		$row->toc = '<div class="card float-right article-index"><div class="card-body">';
-
-		if ($this->params->get('article_index') == 1)
+		$heading     = $row->title ?? Text::_('PLG_CONTENT_PAGEBREAK_NO_TITLE');
+		$input       = Factory::getApplication()->input;
+		$limitstart  = $input->getUInt('limitstart', 0);
+		$showall     = $input->getInt('showall', 0);
+		$headingtext = '';
+		$list        = array();
+
+		if ($this->params->get('article_index', 1) == 1)
 		{
 			$headingtext = Text::_('PLG_CONTENT_PAGEBREAK_ARTICLE_INDEX');
 
@@ -305,27 +307,19 @@ protected function _createToc(&$row, &$matches, &$page)
 			{
 				$headingtext = htmlspecialchars($this->params->get('article_index_text'), ENT_QUOTES, 'UTF-8');
 			}
-
-			$row->toc .= '<h3>' . $headingtext . '</h3>';
 		}
 
 		// TOC first Page link.
-		$liClass = ($limitstart === 0 && $showall === 0) ? 'nav-item toclink active' : 'toclink';
-		$class = ($limitstart === 0 && $showall === 0) ? 'toclink active' : 'toclink';
-		$row->toc .= '<ul class="nav flex-column">
-		<li class="' . $liClass . '">
-			<a href="'
-			. Route::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid, $row->language) . '&showall=&limitstart=')
-			. '" class="' . $class . '">' . $heading . '</a>
-		</li>
-		';
+		$list[1]          = new stdClass;
+		$list[1]->liClass = ($limitstart === 0 && $showall === 0) ? 'nav-item toclink active' : 'toclink';
+		$list[1]->class   = ($limitstart === 0 && $showall === 0) ? 'toclink active' : 'toclink';
+		$list[1]->link    = Route::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid, $row->language));
+		$list[1]->title   = $heading;
 
 		$i = 2;
 
 		foreach ($matches as $bot)
 		{
-			$link = Route::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid, $row->language) . '&showall=&limitstart=' . ($i - 1));
-
 			if (@$bot[0])
 			{
 				$attrs2 = Utility::parseAttributes($bot[0]);
@@ -348,22 +342,28 @@ protected function _createToc(&$row, &$matches, &$page)
 				$title = Text::sprintf('PLG_CONTENT_PAGEBREAK_PAGE_NUM', $i);
 			}
 
-			$liClass   = ($limitstart === $i - 1) ? ' class="nav-item active"' : '';
-			$class     = ($limitstart === $i - 1) ? 'toclink active' : 'toclink';
-			$row->toc .= '<li' . $liClass . '><a href="' . $link . '" class="' . $class . '">' . $title . '</a></li>';
+			$list[$i]          = new stdClass;
+			$list[$i]->link    = Route::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid, $row->language) . '&limitstart=' . ($i - 1));
+			$list[$i]->title   = $title;
+			$list[$i]->liClass = ($limitstart === $i - 1) ? 'nav-item active' : '';
+			$list[$i]->class   = ($limitstart === $i - 1) ? 'toclink active' : 'toclink';
+
 			$i++;
 		}
 
 		if ($this->params->get('showall'))
 		{
-			$link      = Route::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid, $row->language) . '&showall=1&limitstart=');
-			$liClass   = ($limitstart === $i - 1) ? ' class="nav-item active"' : '';
-			$class     = ($limitstart === $i - 1) ? 'toclink active' : 'toclink';
-			$row->toc .= '<li' . $liClass . '><a href="' . $link . '" class="' . $class . '">'
-				. Text::_('PLG_CONTENT_PAGEBREAK_ALL_PAGES') . '</a></li>';
+			$list[$i]          = new stdClass;
+			$list[$i]->link    = Route::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid, $row->language) . '&showall=1');
+			$list[$i]->liClass = ($limitstart === $i - 1) ? ' class="nav-item active"' : '';
+			$list[$i]->class   = ($limitstart === $i - 1) ? 'toclink active' : 'toclink';
+			$list[$i]->title   = Text::_('PLG_CONTENT_PAGEBREAK_ALL_PAGES');
 		}
 
-		$row->toc .= '</ul></div></div>';
+		$path = JPluginHelper::getLayoutPath('content', 'pagebreak', 'toc');
+		ob_start();
+		include $path;
+		$row->toc = ob_get_clean();
 	}
 
 	/**
@@ -390,7 +390,7 @@ protected function _createNavigation(&$row, $page, $n)
 		{
 			$page_next = $page + 1;
 
-			$link_next = Route::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid, $row->language) . '&showall=&limitstart=' . $page_next);
+			$link_next = Route::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid, $row->language) . '&limitstart=' . $page_next);
 
 			// Next >>
 			$next = '<a href="' . $link_next . '">' . Text::_('JNEXT') . $pnSpace . Text::_('JGLOBAL_GT') . Text::_('JGLOBAL_GT') . '</a>';
@@ -402,12 +402,15 @@ protected function _createNavigation(&$row, $page, $n)
 
 		if ($page > 0)
 		{
-			$page_prev = $page - 1 === 0 ? '' : $page - 1;
+			$link_prev = ContentHelperRoute::getArticleRoute($row->slug, $row->catid, $row->language);
 
-			$link_prev = Route::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid, $row->language) . '&showall=&limitstart=' . $page_prev);
+			if ($page > 1)
+			{
+				$link_prev .= '&limitstart=' . ($page - 1);
+			}
 
 			// << Prev
-			$prev = '<a href="' . $link_prev . '">' . Text::_('JGLOBAL_LT') . Text::_('JGLOBAL_LT') . $pnSpace . Text::_('JPREV') . '</a>';
+			$prev = '<a href="' . Route::_($link_prev) . '">' . Text::_('JGLOBAL_LT') . Text::_('JGLOBAL_LT') . $pnSpace . Text::_('JPREV') . '</a>';
 		}
 		else
 		{
diff --git a/plugins/content/pagebreak/pagebreak.xml b/plugins/content/pagebreak/pagebreak.xml
index 2f7c1712a7a28..d873e100beeda 100644
--- a/plugins/content/pagebreak/pagebreak.xml
+++ b/plugins/content/pagebreak/pagebreak.xml
@@ -3,7 +3,7 @@
 	<name>plg_content_pagebreak</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/content/pagebreak/tmpl/toc.php b/plugins/content/pagebreak/tmpl/toc.php
new file mode 100644
index 0000000000000..df71c3d8f4a9b
--- /dev/null
+++ b/plugins/content/pagebreak/tmpl/toc.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.pagebreak
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="card float-right article-index">
+	<div class="card-body">
+
+		<?php if ($headingtext) : ?>
+		<h3><?php echo $headingtext; ?></h3>
+		<?php endif; ?>
+
+		<ul class="nav flex-column">
+		<?php foreach ($list as $listItem) : ?>
+			<?php $class = $listItem->liClass ? ' class="' . $listItem->liClass . '"' : ''; ?>
+
+			<li<?php echo $class; ?>>
+				<a href="<?php echo $listItem->link; ?>" class="<?php echo $listItem->class; ?>">
+					<?php echo $listItem->title; ?>
+				</a>
+			</li>
+		<?php endforeach; ?>
+		</ul>
+	</div>
+</div>
diff --git a/plugins/content/pagenavigation/pagenavigation.php b/plugins/content/pagenavigation/pagenavigation.php
index ce960bf48430c..7561390cceb6a 100644
--- a/plugins/content/pagenavigation/pagenavigation.php
+++ b/plugins/content/pagenavigation/pagenavigation.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.pagenavigation
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/content/pagenavigation/pagenavigation.xml b/plugins/content/pagenavigation/pagenavigation.xml
index 340b5f13a3d92..552329d62425d 100644
--- a/plugins/content/pagenavigation/pagenavigation.xml
+++ b/plugins/content/pagenavigation/pagenavigation.xml
@@ -3,7 +3,7 @@
 	<name>plg_content_pagenavigation</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/content/pagenavigation/tmpl/default.php b/plugins/content/pagenavigation/tmpl/default.php
index 6800ecd8e4e83..3e0a2cd02abaa 100644
--- a/plugins/content/pagenavigation/tmpl/default.php
+++ b/plugins/content/pagenavigation/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.pagenavigation
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/content/vote/tmpl/rating.php b/plugins/content/vote/tmpl/rating.php
index ed599cc552d58..9f43b26ddc0a1 100644
--- a/plugins/content/vote/tmpl/rating.php
+++ b/plugins/content/vote/tmpl/rating.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.vote
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -29,6 +29,7 @@
 }
 
 $rating = (int) $row->rating;
+$rcount = (int) $row->rating_count;
 
 // Look for images in template if available
 $starImageOn  = HTMLHelper::_('image', 'system/rating_star.png', Text::_('PLG_VOTE_STAR_ACTIVE'), null, true);
@@ -46,11 +47,13 @@
 }
 
 ?>
+<?php if ($rcount) : ?>
 <div class="content_rating" itemprop="aggregateRating" itemscope itemtype="https://schema.org/AggregateRating">
 	<p class="unseen sr-only">
 		<?php echo Text::sprintf('PLG_VOTE_USER_RATING', '<span itemprop="ratingValue">' . $rating . '</span>', '<span itemprop="bestRating">5</span>'); ?>
-		<meta itemprop="ratingCount" content="<?php echo (int) $row->rating_count; ?>">
-		<meta itemprop="worstRating" content="0">
+		<meta itemprop="ratingCount" content="<?php echo $rcount; ?>">
+		<meta itemprop="worstRating" content="1">
 	</p>
-	<?php echo $img; ?>
 </div>
+<?php endif; ?>
+<?php echo $img; ?>
diff --git a/plugins/content/vote/tmpl/vote.php b/plugins/content/vote/tmpl/vote.php
index 29000881b5224..45d98c5d0631e 100644
--- a/plugins/content/vote/tmpl/vote.php
+++ b/plugins/content/vote/tmpl/vote.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.vote
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/content/vote/vote.php b/plugins/content/vote/vote.php
index 6355a4b024038..6175a1637166c 100644
--- a/plugins/content/vote/vote.php
+++ b/plugins/content/vote/vote.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.vote
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/content/vote/vote.xml b/plugins/content/vote/vote.xml
index 9b69d66b3f03c..cf3e49c979569 100644
--- a/plugins/content/vote/vote.xml
+++ b/plugins/content/vote/vote.xml
@@ -3,7 +3,7 @@
 	<name>plg_content_vote</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/editors-xtd/article/article.php b/plugins/editors-xtd/article/article.php
index d599e1878e1ca..504fafcc11103 100644
--- a/plugins/editors-xtd/article/article.php
+++ b/plugins/editors-xtd/article/article.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors-xtd.article
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors-xtd/article/article.xml b/plugins/editors-xtd/article/article.xml
index 0586349389a8d..6ef5b59d68e86 100644
--- a/plugins/editors-xtd/article/article.xml
+++ b/plugins/editors-xtd/article/article.xml
@@ -3,7 +3,7 @@
 	<name>plg_editors-xtd_article</name>
 	<author>Joomla! Project</author>
 	<creationDate>October 2009</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/editors-xtd/contact/contact.php b/plugins/editors-xtd/contact/contact.php
index ba5cba1a026f3..c76167c13d7a3 100644
--- a/plugins/editors-xtd/contact/contact.php
+++ b/plugins/editors-xtd/contact/contact.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors-xtd.contact
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors-xtd/contact/contact.xml b/plugins/editors-xtd/contact/contact.xml
index df5f47a6b50c4..9ccfcd00e1a3d 100644
--- a/plugins/editors-xtd/contact/contact.xml
+++ b/plugins/editors-xtd/contact/contact.xml
@@ -3,7 +3,7 @@
 	<name>plg_editors-xtd_contact</name>
 	<author>Joomla! Project</author>
 	<creationDate>October 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/editors-xtd/fields/fields.php b/plugins/editors-xtd/fields/fields.php
index ca11222a50226..89f329a3c0629 100644
--- a/plugins/editors-xtd/fields/fields.php
+++ b/plugins/editors-xtd/fields/fields.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors-xtd.fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors-xtd/fields/fields.xml b/plugins/editors-xtd/fields/fields.xml
index a708f59ec7036..6c0ebeacf1df4 100644
--- a/plugins/editors-xtd/fields/fields.xml
+++ b/plugins/editors-xtd/fields/fields.xml
@@ -3,7 +3,7 @@
 	<name>plg_editors-xtd_fields</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2017</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/editors-xtd/image/image.php b/plugins/editors-xtd/image/image.php
index 0ea095655d3b8..9cb2671636274 100644
--- a/plugins/editors-xtd/image/image.php
+++ b/plugins/editors-xtd/image/image.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors-xtd.image
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -76,7 +76,7 @@ public function onDisplay($name, $asset, $author)
 				'modalWidth' => '80',
 				'tinyPath'   => $link,
 				'confirmCallback' => 'Joomla.getImage(Joomla.selectedFile, \'' . $name . '\')',
-				'confirmText' => 'insert image' // Needs to be translated
+				'confirmText' => Text::_('PLG_IMAGE_BUTTON_INSERT')
 			];
 
 			return $button;
diff --git a/plugins/editors-xtd/image/image.xml b/plugins/editors-xtd/image/image.xml
index a9b0cfdb0e263..daec50998b554 100644
--- a/plugins/editors-xtd/image/image.xml
+++ b/plugins/editors-xtd/image/image.xml
@@ -3,7 +3,7 @@
 	<name>plg_editors-xtd_image</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/editors-xtd/menu/menu.php b/plugins/editors-xtd/menu/menu.php
index 9d5ceedb58726..9844440a9a89c 100644
--- a/plugins/editors-xtd/menu/menu.php
+++ b/plugins/editors-xtd/menu/menu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors-xtd.menu
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors-xtd/menu/menu.xml b/plugins/editors-xtd/menu/menu.xml
index c3897f8eee204..bf2e25230fcf8 100644
--- a/plugins/editors-xtd/menu/menu.xml
+++ b/plugins/editors-xtd/menu/menu.xml
@@ -3,7 +3,7 @@
 	<name>plg_editors-xtd_menu</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/editors-xtd/module/module.php b/plugins/editors-xtd/module/module.php
index 9ee632ba191bc..beacaca0dee6d 100644
--- a/plugins/editors-xtd/module/module.php
+++ b/plugins/editors-xtd/module/module.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors-xtd.module
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors-xtd/module/module.xml b/plugins/editors-xtd/module/module.xml
index 1b0b8952d427d..a42f076021ed7 100644
--- a/plugins/editors-xtd/module/module.xml
+++ b/plugins/editors-xtd/module/module.xml
@@ -3,7 +3,7 @@
 	<name>plg_editors-xtd_module</name>
 	<author>Joomla! Project</author>
 	<creationDate>October 2015</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/editors-xtd/pagebreak/pagebreak.php b/plugins/editors-xtd/pagebreak/pagebreak.php
index f53f99660f791..dd03d8709b5d8 100644
--- a/plugins/editors-xtd/pagebreak/pagebreak.php
+++ b/plugins/editors-xtd/pagebreak/pagebreak.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors-xtd.pagebreak
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors-xtd/pagebreak/pagebreak.xml b/plugins/editors-xtd/pagebreak/pagebreak.xml
index b42f7355edf40..10edf86460816 100644
--- a/plugins/editors-xtd/pagebreak/pagebreak.xml
+++ b/plugins/editors-xtd/pagebreak/pagebreak.xml
@@ -3,7 +3,7 @@
 	<name>plg_editors-xtd_pagebreak</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/editors-xtd/readmore/readmore.php b/plugins/editors-xtd/readmore/readmore.php
index 041c2f09f4d43..681e241f9bc62 100644
--- a/plugins/editors-xtd/readmore/readmore.php
+++ b/plugins/editors-xtd/readmore/readmore.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors-xtd.readmore
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors-xtd/readmore/readmore.xml b/plugins/editors-xtd/readmore/readmore.xml
index a658a8c79be73..96ba3c923bcec 100644
--- a/plugins/editors-xtd/readmore/readmore.xml
+++ b/plugins/editors-xtd/readmore/readmore.xml
@@ -3,7 +3,7 @@
 	<name>plg_editors-xtd_readmore</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/editors/codemirror/codemirror.php b/plugins/editors/codemirror/codemirror.php
index 8267223af49f7..89f4c44489bcc 100644
--- a/plugins/editors/codemirror/codemirror.php
+++ b/plugins/editors/codemirror/codemirror.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors.codemirror
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors/codemirror/codemirror.xml b/plugins/editors/codemirror/codemirror.xml
index 3a1c82aa04c51..c2f1003ffad9f 100644
--- a/plugins/editors/codemirror/codemirror.xml
+++ b/plugins/editors/codemirror/codemirror.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="3.2" type="plugin" group="editors" method="upgrade">
 	<name>plg_editors_codemirror</name>
-	<version>5.38.0</version>
+	<version>5.40.0</version>
 	<creationDate>28 March 2011</creationDate>
 	<author>Marijn Haverbeke</author>
 	<authorEmail>marijnh@gmail.com</authorEmail>
@@ -184,6 +184,7 @@
 					name="fullScreenMod"
 					type="checkboxes"
 					label="PLG_CODEMIRROR_FIELD_FULLSCREEN_MOD_LABEL"
+					hiddenLabel="true"
 					filter="options"
 					>
 					<option value="Shift">PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_SHIFT</option>
diff --git a/plugins/editors/codemirror/fonts.php b/plugins/editors/codemirror/fonts.php
index b5c94ae2909f3..f00ac6b75b74f 100644
--- a/plugins/editors/codemirror/fonts.php
+++ b/plugins/editors/codemirror/fonts.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors.codemirror
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors/codemirror/layouts/editors/codemirror/element.php b/plugins/editors/codemirror/layouts/editors/codemirror/element.php
index cdeba7deeead4..7148c789286d0 100644
--- a/plugins/editors/codemirror/layouts/editors/codemirror/element.php
+++ b/plugins/editors/codemirror/layouts/editors/codemirror/element.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors.codemirror
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -36,7 +36,7 @@
 
 HTMLHelper::_('stylesheet', $basePath . 'lib/codemirror' . $extCSS, array('version' => 'auto'));
 HTMLHelper::_('stylesheet', $basePath . 'lib/addons' . $extCSS, array('version' => 'auto'));
-HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-editor-codemirror.min.js', array('version' => 'auto', 'relative' => true));
+HTMLHelper::_('webcomponent', 'plg_editors_codemirror/joomla-editor-codemirror.min.js', array('version' => 'auto', 'relative' => true));
 
 ?>
 <joomla-editor-codemirror <?php echo $editor, $addons, $modPath, $fsCombo, $option; ?>>
diff --git a/plugins/editors/codemirror/layouts/editors/codemirror/styles.php b/plugins/editors/codemirror/layouts/editors/codemirror/styles.php
index 88c42063bf6f1..dbff4ffcbeb3e 100644
--- a/plugins/editors/codemirror/layouts/editors/codemirror/styles.php
+++ b/plugins/editors/codemirror/layouts/editors/codemirror/styles.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors.codemirror
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors/none/none.php b/plugins/editors/none/none.php
index ff54027c2233b..acb3e0b4c1ca7 100644
--- a/plugins/editors/none/none.php
+++ b/plugins/editors/none/none.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors.none
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -59,7 +59,7 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 
 		$readonly = !empty($params['readonly']) ? ' readonly disabled' : '';
 
-		HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-editor-none.min.js', ['version' => 'auto', 'relative' => true]);
+		HTMLHelper::_('webcomponent', 'plg_editors_none/joomla-editor-none.min.js', ['version' => 'auto', 'relative' => true]);
 
 		return '<joomla-editor-none>'
 			. '<textarea name="' . $name . '" id="' . $id . '" cols="' . $col . '" rows="' . $row
diff --git a/plugins/editors/none/none.xml b/plugins/editors/none/none.xml
index 4751fd1d89911..b176a0686948a 100644
--- a/plugins/editors/none/none.xml
+++ b/plugins/editors/none/none.xml
@@ -6,7 +6,7 @@
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>PLG_NONE_XML_DESCRIPTION</description>
 	<files>
diff --git a/plugins/editors/tinymce/field/skins.php b/plugins/editors/tinymce/field/skins.php
index 43519069d9a8b..fa13462dfbcf4 100644
--- a/plugins/editors/tinymce/field/skins.php
+++ b/plugins/editors/tinymce/field/skins.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors.tinymce
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors/tinymce/field/tinymcebuilder.php b/plugins/editors/tinymce/field/tinymcebuilder.php
index ad3bbbd628af5..d8f8b08caaecc 100644
--- a/plugins/editors/tinymce/field/tinymcebuilder.php
+++ b/plugins/editors/tinymce/field/tinymcebuilder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors.tinymce
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors/tinymce/field/uploaddirs.php b/plugins/editors/tinymce/field/uploaddirs.php
index 1fc97ce6cb533..fe1d16c6d05e3 100644
--- a/plugins/editors/tinymce/field/uploaddirs.php
+++ b/plugins/editors/tinymce/field/uploaddirs.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors.tinymce
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index 97206e23fa9eb..7b151ac54c8e8 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors.tinymce
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/extension/finder/finder.php b/plugins/extension/finder/finder.php
new file mode 100644
index 0000000000000..93b94d9e4eff3
--- /dev/null
+++ b/plugins/extension/finder/finder.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Extension.Finder
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\String\StringHelper;
+
+/**
+ * Finder extension plugin
+ *
+ * @since  4.0.0
+ */
+class PlgExtensionFinder extends CMSPlugin
+{
+	/**
+	 * Add common words to finder after language got installed
+	 *
+	 * @param   JInstaller  $installer  Installer object
+	 * @param   integer     $eid        Extension Identifier
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function onExtensionAfterInstall($installer, $eid)
+	{
+		if (!$eid)
+		{
+			return;
+		}
+
+		$extension = $this->getLanguage($eid);
+
+		if ($extension)
+		{
+			$this->removeCommonWords($extension);
+			$this->addCommonWords($extension);
+		}
+	}
+
+	/**
+	 * Add common words to finder after language got updated
+	 *
+	 * @param   JInstaller  $installer  Installer object
+	 * @param   integer     $eid        Extension identifier
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function onExtensionAfterUpdate($installer, $eid)
+	{
+		$this->onExtensionAfterInstall($installer, $eid);
+	}
+
+	/**
+	 * Remove common words to finder after language got uninstalled
+	 *
+	 * @param   JInstaller  $installer  Installer instance
+	 * @param   integer     $eid        Extension id
+	 * @param   boolean     $removed    Installation result
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function onExtensionAfterUninstall($installer, $eid, $removed)
+	{
+		// Check that the language was successfully uninstalled.
+		if ($eid && $removed && $installer->extension->type === 'language')
+		{
+			$this->removeCommonWords($installer->extension);
+		}
+	}
+
+	/**
+	 * Get an object of information if the handled extension is a language
+	 * 
+	 * @param   integer  $eid  Extensuon id
+	 * 
+	 * @return  object
+	 * 
+	 * @since   4.0.0
+	 */
+	protected function getLanguage($eid)
+	{
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true)
+			->select('element, client_id')
+			->from('#__extensions')
+			->where('extension_id = ' . (int) $eid)
+			->where('type = ' . $db->quote('language'));
+		$db->setQuery($query);
+		$extension = $db->loadObject();
+
+		return $extension;
+	}
+
+	/**
+	 * Add common words from a txt file to com_finder
+	 * 
+	 * @param   object  $extension  Extension object
+	 * 
+	 * @return  void
+	 * 
+	 * @since   4.0.0
+	 */
+	protected function addCommonWords($extension)
+	{
+		if ($extension->client_id == 0)
+		{
+			$path = JPATH_SITE . '/language/' . $extension->element . '/' . $extension->element . '.com_finder.commonwords.txt';
+		}
+		else
+		{
+			$path = JPATH_ADMINISTRATOR . '/language/' . $extension->element . '/' . $extension->element . '.com_finder.commonwords.txt';
+		}
+
+		if (!file_exists($path))
+		{
+			return;
+		}
+
+		$file_content = file_get_contents($path);
+		$words = explode("\n", $file_content);
+		$words = array_map(
+			function ($word)
+			{
+				// Remove comments
+				if (StringHelper::strpos($word, ';') !== false)
+				{
+					$word = StringHelper::substr($word, 0, StringHelper::strpos($word, ';'));
+				}
+
+				return $word;
+			}, $words
+		);
+
+		$words = array_filter(array_map('trim', $words));
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+		require_once JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/helper.php';
+		$lang = \FinderIndexerHelper::getPrimaryLanguage($extension->element);
+		$query->insert('#__finder_terms_common')
+			->columns(array($db->qn('term'), $db->qn('language'), $db->qn('custom')));
+		$template = ',' . $db->q($lang) . ',0';
+
+		foreach ($words as $word)
+		{
+			$query->values($db->q($word) . $template);
+		}
+
+		try
+		{
+			$db->setQuery($query);
+			$db->execute();
+		}
+		catch (Exception $ex)
+		{
+			// It would be nice if the common word is stored to the DB, but it isn't super important
+		}
+	}
+
+	/**
+	 * Remove common words of a language from com_finder
+	 * 
+	 * @param   object  $extension  Extension object
+	 * 
+	 * @return  void
+	 * 
+	 * @since   4.0.0
+	 */
+	protected function removeCommonWords($extension)
+	{
+		$db = Factory::getDbo();
+		require_once JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/helper.php';
+		$lang = \FinderIndexerHelper::getPrimaryLanguage($extension->element);
+		$query = $db->getQuery(true)
+			->delete('#__finder_terms_common')
+			->where('language = ' . $db->quote($lang))
+			->where('custom = 0');
+		$db->setQuery($query);
+		$db->execute();
+	}
+}
diff --git a/plugins/extension/finder/finder.xml b/plugins/extension/finder/finder.xml
new file mode 100644
index 0000000000000..1124364204ca8
--- /dev/null
+++ b/plugins/extension/finder/finder.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="extension" method="upgrade">
+	<name>plg_extension_finder</name>
+	<author>Joomla! Project</author>
+	<creationDate>June 2018</creationDate>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>4.0.0</version>
+	<description>PLG_EXTENSION_FINDER_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="finder">finder.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_extension_finder.ini</language>
+		<language tag="en-GB">en-GB.plg_extension_finder.sys.ini</language>
+	</languages>
+</extension>
diff --git a/plugins/extension/joomla/joomla.php b/plugins/extension/joomla/joomla.php
index 5b744d5381801..0a6565db9ae0f 100644
--- a/plugins/extension/joomla/joomla.php
+++ b/plugins/extension/joomla/joomla.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Extension.Joomla
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/extension/joomla/joomla.xml b/plugins/extension/joomla/joomla.xml
index 12ad82057b26b..57baed3911116 100644
--- a/plugins/extension/joomla/joomla.xml
+++ b/plugins/extension/joomla/joomla.xml
@@ -3,7 +3,7 @@
 	<name>plg_extension_joomla</name>
 	<author>Joomla! Project</author>
 	<creationDate>May 2010</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/extension/namespacemap/namespacemap.php b/plugins/extension/namespacemap/namespacemap.php
index fca8d25785011..38da4e51ed6e1 100644
--- a/plugins/extension/namespacemap/namespacemap.php
+++ b/plugins/extension/namespacemap/namespacemap.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Extension.Joomla
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/extension/namespacemap/namespacemap.xml b/plugins/extension/namespacemap/namespacemap.xml
index b1e204f7a590a..9ecb779e4a745 100644
--- a/plugins/extension/namespacemap/namespacemap.xml
+++ b/plugins/extension/namespacemap/namespacemap.xml
@@ -3,7 +3,7 @@
 	<name>plg_extension_namespacemap</name>
 	<author>Joomla! Project</author>
 	<creationDate>May 2017</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/fields/calendar/calendar.php b/plugins/fields/calendar/calendar.php
index 0af089abcc9cc..10cec4c69ce28 100644
--- a/plugins/fields/calendar/calendar.php
+++ b/plugins/fields/calendar/calendar.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Calendar
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/calendar/calendar.xml b/plugins/fields/calendar/calendar.xml
index 892157e49dd39..179aff5821361 100644
--- a/plugins/fields/calendar/calendar.xml
+++ b/plugins/fields/calendar/calendar.xml
@@ -3,7 +3,7 @@
 	<name>plg_fields_calendar</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/fields/calendar/tmpl/calendar.php b/plugins/fields/calendar/tmpl/calendar.php
index 02aa6713f3b20..24cb85ae462d6 100644
--- a/plugins/fields/calendar/tmpl/calendar.php
+++ b/plugins/fields/calendar/tmpl/calendar.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Calendar
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/checkboxes/checkboxes.php b/plugins/fields/checkboxes/checkboxes.php
index 9f3827dc09ffb..0d6ce2ff3099d 100644
--- a/plugins/fields/checkboxes/checkboxes.php
+++ b/plugins/fields/checkboxes/checkboxes.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Checkboxes
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/checkboxes/checkboxes.xml b/plugins/fields/checkboxes/checkboxes.xml
index 284dec9db0b36..ebc1c6dc2f736 100644
--- a/plugins/fields/checkboxes/checkboxes.xml
+++ b/plugins/fields/checkboxes/checkboxes.xml
@@ -3,7 +3,7 @@
 	<name>plg_fields_checkboxes</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/fields/checkboxes/tmpl/checkboxes.php b/plugins/fields/checkboxes/tmpl/checkboxes.php
index 878bfc86ecea3..783054dd80fa8 100644
--- a/plugins/fields/checkboxes/tmpl/checkboxes.php
+++ b/plugins/fields/checkboxes/tmpl/checkboxes.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Checkboxes
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/plugins/fields/color/color.php b/plugins/fields/color/color.php
index 4fcd80086d03f..b938d86f3270a 100644
--- a/plugins/fields/color/color.php
+++ b/plugins/fields/color/color.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Color
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/color/color.xml b/plugins/fields/color/color.xml
index a70f27d2585fb..aa34b8a97f203 100644
--- a/plugins/fields/color/color.xml
+++ b/plugins/fields/color/color.xml
@@ -3,7 +3,7 @@
 	<name>plg_fields_color</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/fields/color/tmpl/color.php b/plugins/fields/color/tmpl/color.php
index 1d2b165351f52..3baf4b2476b1b 100644
--- a/plugins/fields/color/tmpl/color.php
+++ b/plugins/fields/color/tmpl/color.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Color
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/editor/editor.php b/plugins/fields/editor/editor.php
index 40a49394fbc79..82bbc49015c56 100644
--- a/plugins/fields/editor/editor.php
+++ b/plugins/fields/editor/editor.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Editor
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/editor/editor.xml b/plugins/fields/editor/editor.xml
index 1083c96ecc97a..74972f7357539 100644
--- a/plugins/fields/editor/editor.xml
+++ b/plugins/fields/editor/editor.xml
@@ -3,7 +3,7 @@
 	<name>plg_fields_editor</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/fields/editor/tmpl/editor.php b/plugins/fields/editor/tmpl/editor.php
index c58f9b5ef8cc6..e04d4f8fda33e 100644
--- a/plugins/fields/editor/tmpl/editor.php
+++ b/plugins/fields/editor/tmpl/editor.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Editor
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/plugins/fields/imagelist/imagelist.php b/plugins/fields/imagelist/imagelist.php
index 0b1d390819ec0..9bdb607856506 100644
--- a/plugins/fields/imagelist/imagelist.php
+++ b/plugins/fields/imagelist/imagelist.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Imagelist
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/imagelist/imagelist.xml b/plugins/fields/imagelist/imagelist.xml
index 406c8805de403..52939ff09616a 100644
--- a/plugins/fields/imagelist/imagelist.xml
+++ b/plugins/fields/imagelist/imagelist.xml
@@ -3,7 +3,7 @@
 	<name>plg_fields_imagelist</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/fields/imagelist/tmpl/imagelist.php b/plugins/fields/imagelist/tmpl/imagelist.php
index 8c956c7dbb6a8..c6b3dc4b9d7c8 100644
--- a/plugins/fields/imagelist/tmpl/imagelist.php
+++ b/plugins/fields/imagelist/tmpl/imagelist.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Imagelist
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/plugins/fields/integer/integer.php b/plugins/fields/integer/integer.php
index 6496bc2154b72..fead1cbb85203 100644
--- a/plugins/fields/integer/integer.php
+++ b/plugins/fields/integer/integer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Integer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/integer/integer.xml b/plugins/fields/integer/integer.xml
index 82ae2b89f939c..5e0d0055aa2f6 100644
--- a/plugins/fields/integer/integer.xml
+++ b/plugins/fields/integer/integer.xml
@@ -3,7 +3,7 @@
 	<name>plg_fields_integer</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/fields/integer/tmpl/integer.php b/plugins/fields/integer/tmpl/integer.php
index fce68668a683c..3857937e425e0 100644
--- a/plugins/fields/integer/tmpl/integer.php
+++ b/plugins/fields/integer/tmpl/integer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Integer
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/list/list.php b/plugins/fields/list/list.php
index 9c87d2a7994c4..11e284991a941 100644
--- a/plugins/fields/list/list.php
+++ b/plugins/fields/list/list.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.List
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/list/list.xml b/plugins/fields/list/list.xml
index 65b8661bc4611..a758454b8271f 100644
--- a/plugins/fields/list/list.xml
+++ b/plugins/fields/list/list.xml
@@ -3,7 +3,7 @@
 	<name>plg_fields_list</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/fields/list/tmpl/list.php b/plugins/fields/list/tmpl/list.php
index fc214c81bce37..51fbdffcd3226 100644
--- a/plugins/fields/list/tmpl/list.php
+++ b/plugins/fields/list/tmpl/list.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.List
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/plugins/fields/media/media.php b/plugins/fields/media/media.php
index ebcb587d03abf..ad9700a48532d 100644
--- a/plugins/fields/media/media.php
+++ b/plugins/fields/media/media.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/media/media.xml b/plugins/fields/media/media.xml
index 938b6891b54e9..00f4e27e835da 100644
--- a/plugins/fields/media/media.xml
+++ b/plugins/fields/media/media.xml
@@ -3,7 +3,7 @@
 	<name>plg_fields_media</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/fields/media/tmpl/media.php b/plugins/fields/media/tmpl/media.php
index bc3dc72745804..1707e09909506 100644
--- a/plugins/fields/media/tmpl/media.php
+++ b/plugins/fields/media/tmpl/media.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Media
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/plugins/fields/radio/radio.php b/plugins/fields/radio/radio.php
index 631752b37defd..f625ef3b23881 100644
--- a/plugins/fields/radio/radio.php
+++ b/plugins/fields/radio/radio.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Radio
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/radio/radio.xml b/plugins/fields/radio/radio.xml
index bec103ff36396..172f0bf916cc3 100644
--- a/plugins/fields/radio/radio.xml
+++ b/plugins/fields/radio/radio.xml
@@ -3,7 +3,7 @@
 	<name>plg_fields_radio</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/fields/radio/tmpl/radio.php b/plugins/fields/radio/tmpl/radio.php
index 0d1e2780f9762..84527a8605a1b 100644
--- a/plugins/fields/radio/tmpl/radio.php
+++ b/plugins/fields/radio/tmpl/radio.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Radio
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/plugins/fields/repeatable/params/repeatable.xml b/plugins/fields/repeatable/params/repeatable.xml
new file mode 100644
index 0000000000000..31b65933e28d4
--- /dev/null
+++ b/plugins/fields/repeatable/params/repeatable.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="fields"
+				type="subform"
+				label="PLG_FIELDS_REPEATABLE_PARAMS_FIELDS_LABEL"
+				description="PLG_FIELDS_REPEATABLE_PARAMS_FIELDS_DESC"
+				multiple="true">
+				<form>
+					<fields>
+						<fieldset>
+							<field
+								name="fieldname"
+								type="text"
+								label="PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_NAME_LABEL"
+								description="PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_NAME_DESC"
+								required="true"
+							/>
+							<field
+								name="fieldtype"
+								type="list"
+								label="PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_TYPE_LABEL"
+								description="PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_TYPE_DESC"
+								>
+								<option value="editor">PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_TYPE_EDITOR</option>
+								<option value="media">PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_TYPE_MEDIA</option>
+								<option value="number">PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_TYPE_NUMBER</option>
+								<option value="text">PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_TYPE_TEXT</option>
+								<option value="textarea">PLG_FIELDS_REPEATABLE_PARAMS_FIELDNAME_TYPE_TEXTAREA</option>
+							</field>
+						</fieldset>
+					</fields>
+				</form>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/fields/repeatable/repeatable.php b/plugins/fields/repeatable/repeatable.php
new file mode 100644
index 0000000000000..8697b1e8ed3a9
--- /dev/null
+++ b/plugins/fields/repeatable/repeatable.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Repeatable
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
+
+defined('_JEXEC') or die;
+
+JLoader::import('components.com_fields.libraries.fieldsplugin', JPATH_ADMINISTRATOR);
+
+/**
+ * Repeatable plugin.
+ *
+ * @since  3.9.0
+ */
+class PlgFieldsRepeatable extends FieldsPlugin
+{
+	/**
+	 * Transforms the field into a DOM XML element and appends it as a child on the given parent.
+	 *
+	 * @param   stdClass    $field   The field.
+	 * @param   DOMElement  $parent  The field node parent.
+	 * @param   JForm       $form    The form.
+	 *
+	 * @return  DOMElement
+	 *
+	 * @since   3.9.0
+	 */
+	public function onCustomFieldsPrepareDom($field, DOMElement $parent, JForm $form)
+	{
+		$fieldNode = parent::onCustomFieldsPrepareDom($field, $parent, $form);
+
+		if (!$fieldNode)
+		{
+			return $fieldNode;
+		}
+
+		$readonly = false;
+
+		if (!FieldsHelper::canEditFieldValue($field))
+		{
+			$readonly = true;
+		}
+
+		$fieldNode->setAttribute('type', 'subform');
+		$fieldNode->setAttribute('multiple', 'true');
+		$fieldNode->setAttribute('layout', 'joomla.form.field.subform.repeatable-table');
+
+		// Build the form source
+		$fieldsXml = new SimpleXMLElement('<form/>');
+		$fields    = $fieldsXml->addChild('fields');
+
+		// Get the form settings
+		$formFields = $field->fieldparams->get('fields');
+
+		// Add the fields to the form
+		foreach ($formFields as $index => $formField)
+		{
+			$child = $fields->addChild('field');
+			$child->addAttribute('name', $formField->fieldname);
+			$child->addAttribute('type', $formField->fieldtype);
+			$child->addAttribute('readonly', $readonly);
+		}
+
+		$fieldNode->setAttribute('formsource', $fieldsXml->asXML());
+
+		// Return the node
+		return $fieldNode;
+	}
+
+	/**
+	 * The save event.
+	 *
+	 * @param   string   $context  The context
+	 * @param   JTable   $item     The article data
+	 * @param   boolean  $isNew    Is new item
+	 * @param   array    $data     The validated data
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function onContentAfterSave($context, $item, $isNew, $data = array())
+	{
+		// Create correct context for category
+		if ($context == 'com_categories.category')
+		{
+			$context = $item->get('extension') . '.categories';
+
+			// Set the catid on the category to get only the fields which belong to this category
+			$item->set('catid', $item->get('id'));
+		}
+
+		// Check the context
+		$parts = FieldsHelper::extract($context, $item);
+
+		if (!$parts)
+		{
+			return true;
+		}
+
+		// Compile the right context for the fields
+		$context = $parts[0] . '.' . $parts[1];
+
+		// Loading the fields
+		$fields = FieldsHelper::getFields($context, $item);
+
+		if (!$fields)
+		{
+			return true;
+		}
+
+		// Get the fields data
+		$fieldsData = !empty($data['com_fields']) ? $data['com_fields'] : array();
+
+		// Loading the model
+		/** @var FieldsModelField $model */
+		$model = BaseDatabaseModel::getInstance('Field', 'FieldsModel', array('ignore_request' => true));
+
+		// Loop over the fields
+		foreach ($fields as $field)
+		{
+			// Find the field of this type repeatable
+			if ($field->type !== $this->_name)
+			{
+				continue;
+			}
+
+			// Determine the value if it is available from the data
+			$value = key_exists($field->name, $fieldsData) ? $fieldsData[$field->name] : null;
+
+			// Setting the value for the field and the item
+			$model->setFieldValue($field->id, $item->get('id'), json_encode($value));
+		}
+
+		return true;
+	}
+}
diff --git a/plugins/fields/repeatable/repeatable.xml b/plugins/fields/repeatable/repeatable.xml
new file mode 100644
index 0000000000000..2ff109d3cca93
--- /dev/null
+++ b/plugins/fields/repeatable/repeatable.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extension type="plugin" version="3.8.0" group="fields" method="upgrade">
+	<name>plg_fields_repeatable</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2018</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>PLG_FIELDS_REPEATABLE_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="repeatable">repeatable.php</filename>
+		<folder>params</folder>
+		<folder>tmpl</folder>
+	</files>
+	<languages folder="language">
+		<language tag="en-GB">en-GB/en-GB.plg_fields_repeatable.ini</language>
+		<language tag="en-GB">en-GB/en-GB.plg_fields_repeatable.sys.ini</language>
+	</languages>
+</extension>
diff --git a/plugins/fields/repeatable/tmpl/repeatable.php b/plugins/fields/repeatable/tmpl/repeatable.php
new file mode 100644
index 0000000000000..c05a04a94a6da
--- /dev/null
+++ b/plugins/fields/repeatable/tmpl/repeatable.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Repeatable
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$fieldValue = $field->value;
+
+if ($fieldValue === '')
+{
+	return;
+}
+
+// Get the values
+$fieldValues = json_decode($fieldValue, true);
+
+if (empty($fieldValues))
+{
+	return;
+}
+
+$html = '<ul>';
+
+foreach ($fieldValues as $value)
+{
+	$html .= '<li>' . implode(', ', $value) . '</li>';
+}
+
+$html .= '</ul>';
+
+echo $html;
diff --git a/plugins/fields/sql/sql.php b/plugins/fields/sql/sql.php
index 89ae9a0727d80..53b077631aba0 100644
--- a/plugins/fields/sql/sql.php
+++ b/plugins/fields/sql/sql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Sql
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/sql/sql.xml b/plugins/fields/sql/sql.xml
index 5ee52955004e9..b97b9afd59fa7 100644
--- a/plugins/fields/sql/sql.xml
+++ b/plugins/fields/sql/sql.xml
@@ -3,7 +3,7 @@
 	<name>plg_fields_sql</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/fields/sql/tmpl/sql.php b/plugins/fields/sql/tmpl/sql.php
index d696ad6b1ec3a..1b8de6136246f 100644
--- a/plugins/fields/sql/tmpl/sql.php
+++ b/plugins/fields/sql/tmpl/sql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Sql
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/plugins/fields/text/text.php b/plugins/fields/text/text.php
index 3b9f784cd99bb..c1309481565f8 100644
--- a/plugins/fields/text/text.php
+++ b/plugins/fields/text/text.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Text
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/text/text.xml b/plugins/fields/text/text.xml
index c409ef003389b..c70412d3de4fd 100644
--- a/plugins/fields/text/text.xml
+++ b/plugins/fields/text/text.xml
@@ -3,7 +3,7 @@
 	<name>plg_fields_text</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/fields/text/tmpl/text.php b/plugins/fields/text/tmpl/text.php
index 8ab4f25c04c62..b403b1228be2e 100644
--- a/plugins/fields/text/tmpl/text.php
+++ b/plugins/fields/text/tmpl/text.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Text
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/textarea/textarea.php b/plugins/fields/textarea/textarea.php
index f1a874640e28b..2100a9d4182b9 100644
--- a/plugins/fields/textarea/textarea.php
+++ b/plugins/fields/textarea/textarea.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Textarea
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/textarea/textarea.xml b/plugins/fields/textarea/textarea.xml
index aa4792b384c29..876fe6636fddf 100644
--- a/plugins/fields/textarea/textarea.xml
+++ b/plugins/fields/textarea/textarea.xml
@@ -3,7 +3,7 @@
 	<name>plg_fields_textarea</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/fields/textarea/tmpl/textarea.php b/plugins/fields/textarea/tmpl/textarea.php
index df5f678495177..947cf0ae603fd 100644
--- a/plugins/fields/textarea/tmpl/textarea.php
+++ b/plugins/fields/textarea/tmpl/textarea.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Textarea
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/plugins/fields/url/tmpl/url.php b/plugins/fields/url/tmpl/url.php
index dea3c54350eff..ca9d5f3b61581 100644
--- a/plugins/fields/url/tmpl/url.php
+++ b/plugins/fields/url/tmpl/url.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.URL
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/plugins/fields/url/url.php b/plugins/fields/url/url.php
index b48baa2e0fd6f..1ea632e9d0989 100644
--- a/plugins/fields/url/url.php
+++ b/plugins/fields/url/url.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.URL
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/url/url.xml b/plugins/fields/url/url.xml
index 699aaad6794dd..85eecb60e5e1d 100644
--- a/plugins/fields/url/url.xml
+++ b/plugins/fields/url/url.xml
@@ -3,7 +3,7 @@
 	<name>plg_fields_url</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/fields/user/tmpl/user.php b/plugins/fields/user/tmpl/user.php
index f5378bdad1f94..8d0e134991ca5 100644
--- a/plugins/fields/user/tmpl/user.php
+++ b/plugins/fields/user/tmpl/user.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.User
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/plugins/fields/user/user.php b/plugins/fields/user/user.php
index 3dfcc6b40b3a8..50661d69fc320 100644
--- a/plugins/fields/user/user.php
+++ b/plugins/fields/user/user.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.User
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/user/user.xml b/plugins/fields/user/user.xml
index 4a1c88d48edbf..92aea2946b9ee 100644
--- a/plugins/fields/user/user.xml
+++ b/plugins/fields/user/user.xml
@@ -3,7 +3,7 @@
 	<name>plg_fields_user</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/fields/usergrouplist/tmpl/usergrouplist.php b/plugins/fields/usergrouplist/tmpl/usergrouplist.php
index 6c7040c7a6d62..51dc7a1c4e760 100644
--- a/plugins/fields/usergrouplist/tmpl/usergrouplist.php
+++ b/plugins/fields/usergrouplist/tmpl/usergrouplist.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Usergrouplist
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/plugins/fields/usergrouplist/usergrouplist.php b/plugins/fields/usergrouplist/usergrouplist.php
index 907386ad73416..6a770d72a0181 100644
--- a/plugins/fields/usergrouplist/usergrouplist.php
+++ b/plugins/fields/usergrouplist/usergrouplist.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Fields.Usergrouplist
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/fields/usergrouplist/usergrouplist.xml b/plugins/fields/usergrouplist/usergrouplist.xml
index 24bb8867f45bf..ad145538d59b2 100644
--- a/plugins/fields/usergrouplist/usergrouplist.xml
+++ b/plugins/fields/usergrouplist/usergrouplist.xml
@@ -3,7 +3,7 @@
 	<name>plg_fields_usergrouplist</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/filesystem/local/Adapter/LocalAdapter.php b/plugins/filesystem/local/Adapter/LocalAdapter.php
index 58c9fd985b09c..444f6eb18ae13 100644
--- a/plugins/filesystem/local/Adapter/LocalAdapter.php
+++ b/plugins/filesystem/local/Adapter/LocalAdapter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Filesystem.Local
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,6 +17,7 @@
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Helper\MediaHelper;
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\String\PunycodeHelper;
 use Joomla\CMS\Uri\Uri;
@@ -344,9 +345,9 @@ private function getPathInformation(string $path): \stdClass
 
 		// Dates
 		$obj->create_date             = $createDate->format('c', true);
-		$obj->create_date_formatted   = $createDate->format(Text::_('DATE_FORMAT_LC5'), true);
+		$obj->create_date_formatted   = HTMLHelper::_('date', $createDate, Text::_('DATE_FORMAT_LC5'));
 		$obj->modified_date           = $modifiedDate->format('c', true);
-		$obj->modified_date_formatted = $modifiedDate->format(Text::_('DATE_FORMAT_LC5'), true);
+		$obj->modified_date_formatted = HTMLHelper::_('date', $modifiedDate, Text::_('DATE_FORMAT_LC5'));
 
 		if (MediaHelper::isImage($obj->name))
 		{
diff --git a/plugins/filesystem/local/local.php b/plugins/filesystem/local/local.php
index eb2841eb741ef..13697a7c04228 100644
--- a/plugins/filesystem/local/local.php
+++ b/plugins/filesystem/local/local.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  FileSystem.Local
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/filesystem/local/local.xml b/plugins/filesystem/local/local.xml
index 413e6bc14c06f..bb1ef520496f8 100644
--- a/plugins/filesystem/local/local.xml
+++ b/plugins/filesystem/local/local.xml
@@ -3,7 +3,7 @@
 	<name>plg_filesystem_local</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2017</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
@@ -30,7 +30,7 @@
 					multiple="true"
 					layout="joomla.form.field.subform.repeatable-table"
 					buttons="add,remove,move"
-					default='[{"directory":{"directory": "images"}}]'
+					default='{"directories0":{"directory":"images"}}'
 				>
 					<form>
 						<field
diff --git a/plugins/finder/categories/categories.php b/plugins/finder/categories/categories.php
index d5fb608143976..bff9347c27abe 100644
--- a/plugins/finder/categories/categories.php
+++ b/plugins/finder/categories/categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Finder.Categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/finder/categories/categories.xml b/plugins/finder/categories/categories.xml
index 6b9290334ecee..8fb711cc8cf3c 100644
--- a/plugins/finder/categories/categories.xml
+++ b/plugins/finder/categories/categories.xml
@@ -3,7 +3,7 @@
 	<name>plg_finder_categories</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2011</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/finder/contacts/contacts.php b/plugins/finder/contacts/contacts.php
index 7f3c1daabcfa4..ea6a1cefca069 100644
--- a/plugins/finder/contacts/contacts.php
+++ b/plugins/finder/contacts/contacts.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Finder.Contacts
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -357,7 +357,9 @@ protected function index(FinderIndexerResult $item, $format = 'html')
 		$item->addTaxonomy('Type', 'Contact');
 
 		// Add the category taxonomy data.
-		$item->addTaxonomy('Category', $item->category, $item->cat_state, $item->cat_access);
+		$categories = JCategories::getInstance('com_contact');
+		$category = $categories->get($item->catid);
+		$item->addNestedTaxonomy('Category', $category, $category->published, $category->access, $category->language);
 
 		// Add the language taxonomy data.
 		$item->addTaxonomy('Language', $item->language);
diff --git a/plugins/finder/contacts/contacts.xml b/plugins/finder/contacts/contacts.xml
index f7d37c6b9f68e..aba215c95f98f 100644
--- a/plugins/finder/contacts/contacts.xml
+++ b/plugins/finder/contacts/contacts.xml
@@ -3,7 +3,7 @@
 	<name>plg_finder_contacts</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2011</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/finder/content/content.php b/plugins/finder/content/content.php
index e926e44ba42a7..51cb1c0ce276a 100644
--- a/plugins/finder/content/content.php
+++ b/plugins/finder/content/content.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Finder.Content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -305,7 +305,9 @@ protected function index(FinderIndexerResult $item, $format = 'html')
 		}
 
 		// Add the category taxonomy data.
-		$item->addTaxonomy('Category', $item->category, $item->cat_state, $item->cat_access);
+		$categories = JCategories::getInstance('com_content');
+		$category = $categories->get($item->catid);
+		$item->addNestedTaxonomy('Category', $category, $category->published, $category->access, $category->language);
 
 		// Add the language taxonomy data.
 		$item->addTaxonomy('Language', $item->language);
diff --git a/plugins/finder/content/content.xml b/plugins/finder/content/content.xml
index f64a5bffe5525..e8c381604a728 100644
--- a/plugins/finder/content/content.xml
+++ b/plugins/finder/content/content.xml
@@ -3,7 +3,7 @@
 	<name>plg_finder_content</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2011</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/finder/newsfeeds/newsfeeds.php b/plugins/finder/newsfeeds/newsfeeds.php
index 38ba280d75e51..a62a1cc425165 100644
--- a/plugins/finder/newsfeeds/newsfeeds.php
+++ b/plugins/finder/newsfeeds/newsfeeds.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Finder.Newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -293,7 +293,9 @@ protected function index(FinderIndexerResult $item, $format = 'html')
 		$item->addTaxonomy('Type', 'News Feed');
 
 		// Add the category taxonomy data.
-		$item->addTaxonomy('Category', $item->category, $item->cat_state, $item->cat_access);
+		$categories = JCategories::getInstance('com_newsfeeds');
+		$category = $categories->get($item->catid);
+		$item->addNestedTaxonomy('Category', $category, $category->published, $category->access, $category->language);
 
 		// Add the language taxonomy data.
 		$item->addTaxonomy('Language', $item->language);
diff --git a/plugins/finder/newsfeeds/newsfeeds.xml b/plugins/finder/newsfeeds/newsfeeds.xml
index b3949955a9f2b..1bc4c02d55e8f 100644
--- a/plugins/finder/newsfeeds/newsfeeds.xml
+++ b/plugins/finder/newsfeeds/newsfeeds.xml
@@ -3,7 +3,7 @@
 	<name>plg_finder_newsfeeds</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2011</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/finder/tags/tags.php b/plugins/finder/tags/tags.php
index 908ace91e3ded..d289b4a9dfd61 100644
--- a/plugins/finder/tags/tags.php
+++ b/plugins/finder/tags/tags.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Finder.Tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/finder/tags/tags.xml b/plugins/finder/tags/tags.xml
index f60c2732683a8..23d7eabf2ec09 100644
--- a/plugins/finder/tags/tags.xml
+++ b/plugins/finder/tags/tags.xml
@@ -3,7 +3,7 @@
 	<name>plg_finder_tags</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2013</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/installer/folderinstaller/folderinstaller.php b/plugins/installer/folderinstaller/folderinstaller.php
index 3e805b49db123..7e4a2d27eb1f6 100644
--- a/plugins/installer/folderinstaller/folderinstaller.php
+++ b/plugins/installer/folderinstaller/folderinstaller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Installer.folderInstaller
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/plugins/installer/folderinstaller/folderinstaller.xml b/plugins/installer/folderinstaller/folderinstaller.xml
index c30a776d04cda..f45ff2390827e 100644
--- a/plugins/installer/folderinstaller/folderinstaller.xml
+++ b/plugins/installer/folderinstaller/folderinstaller.xml
@@ -3,7 +3,7 @@
 	<name>plg_installer_folderinstaller</name>
 	<author>Joomla! Project</author>
 	<creationDate>May 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/installer/folderinstaller/tmpl/default.php b/plugins/installer/folderinstaller/tmpl/default.php
index 6a29b7998a808..ac6c57e99666d 100644
--- a/plugins/installer/folderinstaller/tmpl/default.php
+++ b/plugins/installer/folderinstaller/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Installer.folderinstaller
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/installer/override/override.php b/plugins/installer/override/override.php
index a1e3c39c6f980..c1e4e9cbf31c4 100644
--- a/plugins/installer/override/override.php
+++ b/plugins/installer/override/override.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Installer.override
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/installer/override/override.xml b/plugins/installer/override/override.xml
index 3f4f155966b45..0b75670f6dc88 100644
--- a/plugins/installer/override/override.xml
+++ b/plugins/installer/override/override.xml
@@ -3,7 +3,7 @@
 	<name>plg_installer_override</name>
 	<author>Joomla! Project</author>
 	<creationDate>June 2018</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/installer/packageinstaller/packageinstaller.php b/plugins/installer/packageinstaller/packageinstaller.php
index 7b99b16cb5b9d..18e60797a580a 100644
--- a/plugins/installer/packageinstaller/packageinstaller.php
+++ b/plugins/installer/packageinstaller/packageinstaller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Installer.packageInstaller
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/installer/packageinstaller/packageinstaller.xml b/plugins/installer/packageinstaller/packageinstaller.xml
index 112a712878318..4b7bf62c81fbe 100644
--- a/plugins/installer/packageinstaller/packageinstaller.xml
+++ b/plugins/installer/packageinstaller/packageinstaller.xml
@@ -3,7 +3,7 @@
 	<name>plg_installer_packageinstaller</name>
 	<author>Joomla! Project</author>
 	<creationDate>May 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/installer/packageinstaller/tmpl/default.php b/plugins/installer/packageinstaller/tmpl/default.php
index eff89b17744f4..520c3570fdae2 100644
--- a/plugins/installer/packageinstaller/tmpl/default.php
+++ b/plugins/installer/packageinstaller/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Installer.packageinstaller
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/installer/urlinstaller/tmpl/default.php b/plugins/installer/urlinstaller/tmpl/default.php
index 35015887262e7..7baa299b39291 100644
--- a/plugins/installer/urlinstaller/tmpl/default.php
+++ b/plugins/installer/urlinstaller/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Installer.urlinstaller
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/installer/urlinstaller/urlinstaller.php b/plugins/installer/urlinstaller/urlinstaller.php
index 8ae4942dcacd0..7fd1810cb499c 100644
--- a/plugins/installer/urlinstaller/urlinstaller.php
+++ b/plugins/installer/urlinstaller/urlinstaller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Installer.urlinstaller
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/plugins/installer/urlinstaller/urlinstaller.xml b/plugins/installer/urlinstaller/urlinstaller.xml
index b763e30e4ad3b..e5c6742e782c2 100644
--- a/plugins/installer/urlinstaller/urlinstaller.xml
+++ b/plugins/installer/urlinstaller/urlinstaller.xml
@@ -3,7 +3,7 @@
 	<name>plg_installer_urlinstaller</name>
 	<author>Joomla! Project</author>
 	<creationDate>May 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/installer/webinstaller/tmpl/default.php b/plugins/installer/webinstaller/tmpl/default.php
index 4eb5e5a6e9b0c..b6df01977dd89 100644
--- a/plugins/installer/webinstaller/tmpl/default.php
+++ b/plugins/installer/webinstaller/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Installer.Webinstaller
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/installer/webinstaller/webinstaller.php b/plugins/installer/webinstaller/webinstaller.php
index e2866cf7ab546..430d2fdc622c8 100644
--- a/plugins/installer/webinstaller/webinstaller.php
+++ b/plugins/installer/webinstaller/webinstaller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Installer.webinstaller
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/media-action/crop/crop.php b/plugins/media-action/crop/crop.php
index 2cd3e19593b31..e3e524debbc78 100644
--- a/plugins/media-action/crop/crop.php
+++ b/plugins/media-action/crop/crop.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Media-Action.crop
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/media-action/crop/crop.xml b/plugins/media-action/crop/crop.xml
index dc7420e1de514..e7125b9ac3947 100644
--- a/plugins/media-action/crop/crop.xml
+++ b/plugins/media-action/crop/crop.xml
@@ -3,7 +3,7 @@
 	<name>plg_media-action_crop</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2017</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/media-action/resize/resize.php b/plugins/media-action/resize/resize.php
index af7a56a7f0261..aac0cc92cb087 100644
--- a/plugins/media-action/resize/resize.php
+++ b/plugins/media-action/resize/resize.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Media-Action.resize
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/media-action/resize/resize.xml b/plugins/media-action/resize/resize.xml
index 48a6a7eaf63bf..6e2e47e09e9de 100644
--- a/plugins/media-action/resize/resize.xml
+++ b/plugins/media-action/resize/resize.xml
@@ -3,7 +3,7 @@
 	<name>plg_media-action_resize</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2017</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/media-action/rotate/rotate.php b/plugins/media-action/rotate/rotate.php
index 48f397cb67f11..25ee30db30098 100644
--- a/plugins/media-action/rotate/rotate.php
+++ b/plugins/media-action/rotate/rotate.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Media-Action.rotate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/media-action/rotate/rotate.xml b/plugins/media-action/rotate/rotate.xml
index ac922e6c535c9..c4acde5148dd5 100644
--- a/plugins/media-action/rotate/rotate.xml
+++ b/plugins/media-action/rotate/rotate.xml
@@ -3,7 +3,7 @@
 	<name>plg_media-action_rotate</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2017</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/privacy/actionlogs/actionlogs.php b/plugins/privacy/actionlogs/actionlogs.php
new file mode 100644
index 0000000000000..6da940991da7d
--- /dev/null
+++ b/plugins/privacy/actionlogs/actionlogs.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Privacy.actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ActionlogsHelper', JPATH_ADMINISTRATOR . '/components/com_actionlogs/helpers/actionlogs.php');
+JLoader::register('PrivacyPlugin', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/plugin.php');
+JLoader::register('PrivacyTableRequest', JPATH_ADMINISTRATOR . '/components/com_privacy/tables/request.php');
+
+/**
+ * Privacy plugin managing Joomla actionlogs data
+ *
+ * @since  3.9.0
+ */
+class PlgPrivacyActionlogs extends PrivacyPlugin
+{
+	/**
+	 * Processes an export request for Joomla core actionlog data
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 * @param   JUser                $user     The user account associated with this request if available
+	 *
+	 * @return  PrivacyExportDomain[]
+	 *
+	 * @since   3.9.0
+	 */
+	public function onPrivacyExportRequest(PrivacyTableRequest $request, JUser $user = null)
+	{
+		if (!$user)
+		{
+			return array();
+		}
+
+		$domain = $this->createDomain('user_action_logs', 'joomla_user_action_logs_data');
+
+		$query = $this->db->getQuery(true)
+			->select('a.*, u.name')
+			->from('#__action_logs AS a')
+			->innerJoin('#__users AS u ON a.user_id = u.id')
+			->where($this->db->quoteName('a.user_id') . ' = ' . $user->id);
+
+		$this->db->setQuery($query);
+
+		$data = $this->db->loadObjectList();
+
+		if (!count($data))
+		{
+			return array();
+		}
+
+		$data    = ActionlogsHelper::getCsvData($data);
+		$isFirst = true;
+
+		foreach ($data as $item)
+		{
+			if ($isFirst)
+			{
+				$isFirst = false;
+
+				continue;
+			}
+
+			$domain->addItem($this->createItemFromArray($item));
+		}
+
+		return array($domain);
+	}
+}
diff --git a/plugins/privacy/actionlogs/actionlogs.xml b/plugins/privacy/actionlogs/actionlogs.xml
new file mode 100644
index 0000000000000..f37879f35e81b
--- /dev/null
+++ b/plugins/privacy/actionlogs/actionlogs.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="privacy" method="upgrade">
+	<name>plg_privacy_actionlogs</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2018</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>PLG_PRIVACY_ACTIONLOGS_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="actionlogs">actionlogs.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_privacy_actionlogs.ini</language>
+		<language tag="en-GB">en-GB.plg_privacy_actionlogs.sys.ini</language>
+	</languages>
+</extension>
diff --git a/plugins/privacy/consents/consents.php b/plugins/privacy/consents/consents.php
new file mode 100644
index 0000000000000..de3819e230fe4
--- /dev/null
+++ b/plugins/privacy/consents/consents.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Privacy.consents
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('PrivacyPlugin', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/plugin.php');
+
+/**
+ * Privacy plugin managing Joomla user consent data
+ *
+ * @since  3.9.0
+ */
+class PlgPrivacyConsents extends PrivacyPlugin
+{
+	/**
+	 * Processes an export request for Joomla core user consent data
+	 *
+	 * This event will collect data for the core `#__privacy_consents` table
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 * @param   JUser                $user     The user account associated with this request if available
+	 *
+	 * @return  PrivacyExportDomain[]
+	 *
+	 * @since   3.9.0
+	 */
+	public function onPrivacyExportRequest(PrivacyTableRequest $request, JUser $user = null)
+	{
+		if (!$user)
+		{
+			return array();
+		}
+
+		$domain    = $this->createDomain('consents', 'joomla_consent_data');
+
+		$query = $this->db->getQuery(true)
+			->select('*')
+			->from($this->db->quoteName('#__privacy_consents'))
+			->where($this->db->quoteName('user_id') . ' = ' . (int) $user->id)
+			->order($this->db->quoteName('created') . ' ASC');
+
+		$items = $this->db->setQuery($query)->loadAssocList();
+
+		foreach ($items as $item)
+		{
+			$domain->addItem($this->createItemFromArray($item));
+		}
+
+		return array($domain);
+	}
+}
diff --git a/plugins/privacy/consents/consents.xml b/plugins/privacy/consents/consents.xml
new file mode 100644
index 0000000000000..b245d3f3e80d8
--- /dev/null
+++ b/plugins/privacy/consents/consents.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.9" type="plugin" group="privacy" method="upgrade">
+	<name>plg_privacy_consents</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2018</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>PLG_PRIVACY_CONSENTS_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="consents">consents.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_privacy_consents.ini</language>
+		<language tag="en-GB">en-GB.plg_privacy_consents.sys.ini</language>
+	</languages>
+</extension>
diff --git a/plugins/privacy/contact/contact.php b/plugins/privacy/contact/contact.php
new file mode 100644
index 0000000000000..ee72051987605
--- /dev/null
+++ b/plugins/privacy/contact/contact.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Privacy.contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('PrivacyPlugin', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/plugin.php');
+JLoader::register('PrivacyTableRequest', JPATH_ADMINISTRATOR . '/components/com_privacy/tables/request.php');
+
+/**
+ * Privacy plugin managing Joomla user contact data
+ *
+ * @since  3.9.0
+ */
+class PlgPrivacyContact extends PrivacyPlugin
+{
+	/**
+	 * Processes an export request for Joomla core user contact data
+	 *
+	 * This event will collect data for the contact core tables:
+	 *
+	 * - Contact custom fields
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 * @param   JUser                $user     The user account associated with this request if available
+	 *
+	 * @return  PrivacyExportDomain[]
+	 *
+	 * @since   3.9.0
+	 */
+	public function onPrivacyExportRequest(PrivacyTableRequest $request, JUser $user = null)
+	{
+		if (!$user && !$request->email)
+		{
+			return array();
+		}
+
+		$domains   = array();
+		$domain    = $this->createDomain('user_contact', 'joomla_user_contact_data');
+		$domains[] = $domain;
+
+		$query = $this->db->getQuery(true)
+			->select('*')
+			->from($this->db->quoteName('#__contact_details'))
+			->order($this->db->quoteName('ordering') . ' ASC');
+
+		if ($user)
+		{
+			$query->where($this->db->quoteName('user_id') . ' = ' . (int) $user->id);
+		}
+		else
+		{
+			$query->where($this->db->quoteName('email_to') . ' = ' . $this->db->quote($request->email));
+		}
+
+		$items = $this->db->setQuery($query)->loadObjectList();
+
+		foreach ($items as $item)
+		{
+			$domain->addItem($this->createItemFromArray((array) $item));
+		}
+
+		$domains[] = $this->createCustomFieldsDomain('com_contact.contact', $items);
+
+		return $domains;
+	}
+}
diff --git a/plugins/privacy/contact/contact.xml b/plugins/privacy/contact/contact.xml
new file mode 100644
index 0000000000000..2de5eed47f655
--- /dev/null
+++ b/plugins/privacy/contact/contact.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.9" type="plugin" group="privacy" method="upgrade">
+	<name>plg_privacy_contact</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2018</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>PLG_PRIVACY_CONTACT_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="contact">contact.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_privacy_contact.ini</language>
+		<language tag="en-GB">en-GB.plg_privacy_contact.sys.ini</language>
+	</languages>
+</extension>
diff --git a/plugins/privacy/content/content.php b/plugins/privacy/content/content.php
new file mode 100644
index 0000000000000..3a9ec5c305eb0
--- /dev/null
+++ b/plugins/privacy/content/content.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Privacy.uscontenter
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('PrivacyPlugin', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/plugin.php');
+JLoader::register('PrivacyTableRequest', JPATH_ADMINISTRATOR . '/components/com_privacy/tables/request.php');
+
+/**
+ * Privacy plugin managing Joomla user content data
+ *
+ * @since  3.9.0
+ */
+class PlgPrivacyContent extends PrivacyPlugin
+{
+	/**
+	 * Processes an export request for Joomla core user content data
+	 *
+	 * This event will collect data for the content core table
+	 *
+	 * - Content custom fields
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 * @param   JUser                $user     The user account associated with this request if available
+	 *
+	 * @return  PrivacyExportDomain[]
+	 *
+	 * @since   3.9.0
+	 */
+	public function onPrivacyExportRequest(PrivacyTableRequest $request, JUser $user = null)
+	{
+		if (!$user)
+		{
+			return array();
+		}
+
+		$domains   = array();
+		$domain    = $this->createDomain('user_content', 'joomla_user_content_data');
+		$domains[] = $domain;
+
+		$query = $this->db->getQuery(true)
+			->select('*')
+			->from($this->db->quoteName('#__content'))
+			->where($this->db->quoteName('created_by') . ' = ' . (int) $user->id)
+			->order($this->db->quoteName('ordering') . ' ASC');
+
+		$items = $this->db->setQuery($query)->loadObjectList();
+
+		foreach ($items as $item)
+		{
+			$domain->addItem($this->createItemFromArray((array) $item));
+		}
+
+		$domains[] = $this->createCustomFieldsDomain('com_content.article', $items);
+
+		return $domains;
+	}
+}
diff --git a/plugins/privacy/content/content.xml b/plugins/privacy/content/content.xml
new file mode 100644
index 0000000000000..a2114f106c31c
--- /dev/null
+++ b/plugins/privacy/content/content.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.9" type="plugin" group="privacy" method="upgrade">
+	<name>plg_privacy_content</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2018</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>PLG_PRIVACY_CONTENT_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="content">content.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_privacy_content.ini</language>
+		<language tag="en-GB">en-GB.plg_privacy_content.sys.ini</language>
+	</languages>
+</extension>
diff --git a/plugins/privacy/message/message.php b/plugins/privacy/message/message.php
new file mode 100644
index 0000000000000..cdcd5d2f258b3
--- /dev/null
+++ b/plugins/privacy/message/message.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Privacy.message
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('PrivacyPlugin', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/plugin.php');
+JLoader::register('PrivacyTableRequest', JPATH_ADMINISTRATOR . '/components/com_privacy/tables/request.php');
+
+/**
+ * Privacy plugin managing Joomla user messages
+ *
+ * @since  3.9.0
+ */
+class PlgPrivacyMessage extends PrivacyPlugin
+{
+	/**
+	 * Processes an export request for Joomla core user message
+	 *
+	 * This event will collect data for the message table
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 * @param   JUser                $user     The user account associated with this request if available
+	 *
+	 * @return  PrivacyExportDomain[]
+	 *
+	 * @since   3.9.0
+	 */
+	public function onPrivacyExportRequest(PrivacyTableRequest $request, JUser $user = null)
+	{
+		if (!$user)
+		{
+			return array();
+		}
+
+		$domain = $this->createDomain('user_messages', 'joomla_user_messages_data');
+
+		$query = $this->db->getQuery(true)
+			->select('*')
+			->from($this->db->quoteName('#__messages'))
+			->where($this->db->quoteName('user_id_from') . ' = ' . (int) $user->id)
+			->orWhere($this->db->quoteName('user_id_to') . ' = ' . (int) $user->id)
+			->order($this->db->quoteName('date_time') . ' ASC');
+
+		$items = $this->db->setQuery($query)->loadAssocList();
+
+		foreach ($items as $item)
+		{
+			$domain->addItem($this->createItemFromArray($item));
+		}
+
+		return array($domain);
+	}
+}
diff --git a/plugins/privacy/message/message.xml b/plugins/privacy/message/message.xml
new file mode 100644
index 0000000000000..9a7f19f6f1548
--- /dev/null
+++ b/plugins/privacy/message/message.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.9" type="plugin" group="privacy" method="upgrade">
+	<name>plg_privacy_message</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2018</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>PLG_PRIVACY_MESSAGE_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="message">message.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_privacy_message.ini</language>
+		<language tag="en-GB">en-GB.plg_privacy_message.sys.ini</language>
+	</languages>
+</extension>
diff --git a/plugins/privacy/user/user.php b/plugins/privacy/user/user.php
new file mode 100644
index 0000000000000..5bc2475fd2058
--- /dev/null
+++ b/plugins/privacy/user/user.php
@@ -0,0 +1,259 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Privacy.user
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('PrivacyPlugin', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/plugin.php');
+JLoader::register('PrivacyRemovalStatus', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/removal/status.php');
+JLoader::register('PrivacyTableRequest', JPATH_ADMINISTRATOR . '/components/com_privacy/tables/request.php');
+
+/**
+ * Privacy plugin managing Joomla user data
+ *
+ * @since  3.9.0
+ */
+class PlgPrivacyUser extends PrivacyPlugin
+{
+	/**
+	 * Performs validation to determine if the data associated with a remove information request can be processed
+	 *
+	 * This event will not allow a super user account to be removed
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 * @param   JUser                $user     The user account associated with this request if available
+	 *
+	 * @return  PrivacyRemovalStatus
+	 *
+	 * @since   3.9.0
+	 */
+	public function onPrivacyCanRemoveData(PrivacyTableRequest $request, JUser $user = null)
+	{
+		$status = new PrivacyRemovalStatus;
+
+		if (!$user)
+		{
+			return $status;
+		}
+
+		if ($user->authorise('core.admin'))
+		{
+			$status->canRemove = false;
+			$status->reason    = JText::_('PLG_PRIVACY_USER_ERROR_CANNOT_REMOVE_SUPER_USER');
+		}
+
+		return $status;
+	}
+
+	/**
+	 * Processes an export request for Joomla core user data
+	 *
+	 * This event will collect data for the following core tables:
+	 *
+	 * - #__users (excluding the password, otpKey, and otep columns)
+	 * - #__user_notes
+	 * - #__user_profiles
+	 * - User custom fields
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 * @param   JUser                $user     The user account associated with this request if available
+	 *
+	 * @return  PrivacyExportDomain[]
+	 *
+	 * @since   3.9.0
+	 */
+	public function onPrivacyExportRequest(PrivacyTableRequest $request, JUser $user = null)
+	{
+		if (!$user)
+		{
+			return array();
+		}
+
+		/** @var JTableUser $userTable */
+		$userTable = JUser::getTable();
+		$userTable->load($user->id);
+
+		$domains = array();
+		$domains[] = $this->createUserDomain($userTable);
+		$domains[] = $this->createNotesDomain($userTable);
+		$domains[] = $this->createProfileDomain($userTable);
+		$domains[] = $this->createCustomFieldsDomain('com_users.user', array($userTable));
+
+		return $domains;
+	}
+
+	/**
+	 * Removes the data associated with a remove information request
+	 *
+	 * This event will pseudoanonymise the user account
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 * @param   JUser                $user     The user account associated with this request if available
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onPrivacyRemoveData(PrivacyTableRequest $request, JUser $user = null)
+	{
+		// This plugin only processes data for registered user accounts
+		if (!$user)
+		{
+			return;
+		}
+
+		$pseudoanonymisedData = array(
+			'name'      => 'User ID ' . $user->id,
+			'username'  => bin2hex(random_bytes(12)),
+			'email'     => 'UserID' . $user->id . 'removed@email.invalid',
+			'block'     => true,
+		);
+
+		$user->bind($pseudoanonymisedData);
+
+		$user->save();
+
+		// Destroy all sessions for the user account
+		$sessionIds = $this->db->setQuery(
+			$this->db->getQuery(true)
+				->select($this->db->quoteName('session_id'))
+				->from($this->db->quoteName('#__session'))
+				->where($this->db->quoteName('userid') . ' = ' . (int) $user->id)
+		)->loadColumn();
+
+		// If there aren't any active sessions then there's nothing to do here
+		if (empty($sessionIds))
+		{
+			return;
+		}
+
+		$storeName = JFactory::getConfig()->get('session_handler', 'none');
+		$store     = JSessionStorage::getInstance($storeName);
+		$quotedIds = array();
+
+		// Destroy the sessions and quote the IDs to purge the session table
+		foreach ($sessionIds as $sessionId)
+		{
+			$store->destroy($sessionId);
+			$quotedIds[] = $this->db->quote($sessionId);
+		}
+
+		$this->db->setQuery(
+			$this->db->getQuery(true)
+				->delete($this->db->quoteName('#__session'))
+				->where($this->db->quoteName('session_id') . ' IN (' . implode(', ', $quotedIds) . ')')
+		)->execute();
+	}
+
+	/**
+	 * Create the domain for the user notes data
+	 *
+	 * @param   JTableUser  $user  The JTableUser object to process
+	 *
+	 * @return  PrivacyExportDomain
+	 *
+	 * @since   3.9.0
+	 */
+	private function createNotesDomain(JTableUser $user)
+	{
+		$domain = $this->createDomain('user_notes', 'joomla_user_notes_data');
+
+		$query = $this->db->getQuery(true)
+			->select('*')
+			->from($this->db->quoteName('#__user_notes'))
+			->where($this->db->quoteName('user_id') . ' = ' . $this->db->quote($user->id));
+
+		$items = $this->db->setQuery($query)->loadAssocList();
+
+		// Remove user ID columns
+		foreach (array('user_id', 'created_user_id', 'modified_user_id') as $column)
+		{
+			$items = ArrayHelper::dropColumn($items, $column);
+		}
+
+		foreach ($items as $item)
+		{
+			$domain->addItem($this->createItemFromArray($item, $item['id']));
+		}
+
+		return $domain;
+	}
+
+	/**
+	 * Create the domain for the user profile data
+	 *
+	 * @param   JTableUser  $user  The JTableUser object to process
+	 *
+	 * @return  PrivacyExportDomain
+	 *
+	 * @since   3.9.0
+	 */
+	private function createProfileDomain(JTableUser $user)
+	{
+		$domain = $this->createDomain('user_profile', 'joomla_user_profile_data');
+
+		$query = $this->db->getQuery(true)
+			->select('*')
+			->from($this->db->quoteName('#__user_profiles'))
+			->where($this->db->quoteName('user_id') . ' = ' . $this->db->quote($user->id))
+			->order($this->db->quoteName('ordering') . ' ASC');
+
+		$items = $this->db->setQuery($query)->loadAssocList();
+
+		foreach ($items as $item)
+		{
+			$domain->addItem($this->createItemFromArray($item));
+		}
+
+		return $domain;
+	}
+
+	/**
+	 * Create the domain for the user record
+	 *
+	 * @param   JTableUser  $user  The JTableUser object to process
+	 *
+	 * @return  PrivacyExportDomain
+	 *
+	 * @since   3.9.0
+	 */
+	private function createUserDomain(JTableUser $user)
+	{
+		$domain = $this->createDomain('users', 'joomla_users_data');
+		$domain->addItem($this->createItemForUserTable($user));
+
+		return $domain;
+	}
+
+	/**
+	 * Create an item object for a JTableUser object
+	 *
+	 * @param   JTableUser  $user  The JTableUser object to convert
+	 *
+	 * @return  PrivacyExportItem
+	 *
+	 * @since   3.9.0
+	 */
+	private function createItemForUserTable(JTableUser $user)
+	{
+		$data    = array();
+		$exclude = array('password', 'otpKey', 'otep');
+
+		foreach (array_keys($user->getFields()) as $fieldName)
+		{
+			if (!in_array($fieldName, $exclude))
+			{
+				$data[$fieldName] = $user->$fieldName;
+			}
+		}
+
+		return $this->createItemFromArray($data, $user->id);
+	}
+}
diff --git a/plugins/privacy/user/user.xml b/plugins/privacy/user/user.xml
new file mode 100644
index 0000000000000..06277aad43f93
--- /dev/null
+++ b/plugins/privacy/user/user.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="privacy" method="upgrade">
+	<name>plg_privacy_user</name>
+	<author>Joomla! Project</author>
+	<creationDate>May 2018</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>PLG_PRIVACY_USER_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="user">user.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_privacy_user.ini</language>
+		<language tag="en-GB">en-GB.plg_privacy_user.sys.ini</language>
+	</languages>
+</extension>
diff --git a/plugins/quickicon/extensionupdate/extensionupdate.php b/plugins/quickicon/extensionupdate/extensionupdate.php
index c34f53f1ca4bb..01da4ffb15ff6 100644
--- a/plugins/quickicon/extensionupdate/extensionupdate.php
+++ b/plugins/quickicon/extensionupdate/extensionupdate.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Quickicon.Extensionupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/quickicon/extensionupdate/extensionupdate.xml b/plugins/quickicon/extensionupdate/extensionupdate.xml
index 357e364e58b4b..acc8d4792509d 100644
--- a/plugins/quickicon/extensionupdate/extensionupdate.xml
+++ b/plugins/quickicon/extensionupdate/extensionupdate.xml
@@ -3,7 +3,7 @@
 	<name>plg_quickicon_extensionupdate</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2011</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/quickicon/joomlaupdate/joomlaupdate.php b/plugins/quickicon/joomlaupdate/joomlaupdate.php
index ff4d999050b58..4ae3dec63e974 100644
--- a/plugins/quickicon/joomlaupdate/joomlaupdate.php
+++ b/plugins/quickicon/joomlaupdate/joomlaupdate.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Quickicon.Joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/quickicon/joomlaupdate/joomlaupdate.xml b/plugins/quickicon/joomlaupdate/joomlaupdate.xml
index 3796508be9dde..ac73a140f9a7a 100644
--- a/plugins/quickicon/joomlaupdate/joomlaupdate.xml
+++ b/plugins/quickicon/joomlaupdate/joomlaupdate.xml
@@ -3,7 +3,7 @@
 	<name>plg_quickicon_joomlaupdate</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2011</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/quickicon/overridecheck/overridecheck.php b/plugins/quickicon/overridecheck/overridecheck.php
index d1b81114070be..3479f5f502c0f 100644
--- a/plugins/quickicon/overridecheck/overridecheck.php
+++ b/plugins/quickicon/overridecheck/overridecheck.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Quickicon.Overridecheck
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/quickicon/overridecheck/overridecheck.xml b/plugins/quickicon/overridecheck/overridecheck.xml
index 1aa1b500b7cf1..cf1b6da1b70ef 100644
--- a/plugins/quickicon/overridecheck/overridecheck.xml
+++ b/plugins/quickicon/overridecheck/overridecheck.xml
@@ -3,7 +3,7 @@
 	<name>plg_quickicon_overridecheck</name>
 	<author>Joomla! Project</author>
 	<creationDate>June 2018</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/quickicon/phpversioncheck/phpversioncheck.php b/plugins/quickicon/phpversioncheck/phpversioncheck.php
index 0ab3bb7299810..4f309bcace507 100644
--- a/plugins/quickicon/phpversioncheck/phpversioncheck.php
+++ b/plugins/quickicon/phpversioncheck/phpversioncheck.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Quickicon.phpversioncheck
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -171,10 +171,10 @@ private function getPhpSupport()
 			}
 
 			// If the version is still supported, check if it has reached eol minus 3 month
-			$interval = new DateInterval('P3M');
-			$phpEndOfSupport->sub($interval);
+			$securityWarningDate = clone $phpEndOfSupport;
+			$securityWarningDate->sub(new DateInterval('P3M'));
 
-			if (!$phpNotSupported && $today > $phpEndOfSupport)
+			if (!$phpNotSupported && $today > $securityWarningDate)
 			{
 				$supportStatus['status']  = self::PHP_SECURITY_ONLY;
 				$supportStatus['message'] = Text::sprintf(
diff --git a/plugins/quickicon/phpversioncheck/phpversioncheck.xml b/plugins/quickicon/phpversioncheck/phpversioncheck.xml
index 7131843e5ebaa..679f6cfae8add 100644
--- a/plugins/quickicon/phpversioncheck/phpversioncheck.xml
+++ b/plugins/quickicon/phpversioncheck/phpversioncheck.xml
@@ -3,7 +3,7 @@
 	<name>plg_quickicon_phpversioncheck</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/quickicon/privacycheck/privacycheck.php b/plugins/quickicon/privacycheck/privacycheck.php
new file mode 100644
index 0000000000000..d50f68455118a
--- /dev/null
+++ b/plugins/quickicon/privacycheck/privacycheck.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Quickicon.privacycheck
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Uri\Uri;
+
+/**
+ * Plugin to check privacy requests older than 14 days
+ *
+ * @since  3.9.0
+ */
+class PlgQuickiconPrivacyCheck extends JPlugin
+{
+	/**
+	 * Load plugin language files automatically
+	 *
+	 * @var    boolean
+	 * @since  3.9.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Check privacy requests older than 14 days.
+	 *
+	 * @param   string  $context  The calling context
+	 *
+	 * @return  array   A list of icon definition associative arrays
+	 *
+	 * @since   3.9.0
+	 */
+	public function onGetIcons($context)
+	{
+		if ($context !== $this->params->get('context', 'mod_quickicon') || !Factory::getUser()->authorise('core.admin'))
+		{
+			return;
+		}
+
+		JHtml::_('jquery.framework');
+
+		$token    = Session::getFormToken() . '=' . 1;
+		$privacy  = 'index.php?option=com_privacy';
+
+		$options  = array(
+			'plg_quickicon_privacycheck_url'      => Uri::base() . $privacy . '&view=requests&filter[status]=1&list[fullordering]=a.requested_at ASC',
+			'plg_quickicon_privacycheck_ajax_url' => Uri::base() . $privacy . '&task=getNumberUrgentRequests&' . $token,
+			'plg_quickicon_privacycheck_text'     => array(
+				"NOREQUEST"            => Text::_('PLG_QUICKICON_PRIVACYCHECK_NOREQUEST'),
+				"REQUESTFOUND"         => Text::_('PLG_QUICKICON_PRIVACYCHECK_REQUESTFOUND'),
+				"REQUESTFOUND_MESSAGE" => Text::_('PLG_QUICKICON_PRIVACYCHECK_REQUESTFOUND_MESSAGE'),
+				"REQUESTFOUND_BUTTON"  => Text::_('PLG_QUICKICON_PRIVACYCHECK_REQUESTFOUND_BUTTON'),
+				"ERROR"                => Text::_('PLG_QUICKICON_PRIVACYCHECK_ERROR'),
+			)
+		);
+
+		Factory::getDocument()->addScriptOptions('js-privacy-check', $options);
+
+		JHtml::_('script', 'plg_quickicon_privacycheck/privacycheck.js', array('version' => 'auto', 'relative' => true));
+
+		return array(
+			array(
+				'link'  => $privacy . '&view=requests&filter[status]=1&list[fullordering]=a.requested_at ASC',
+				'image' => 'users',
+				'icon'  => 'header/icon-48-user.png',
+				'text'  => Text::_('PLG_QUICKICON_PRIVACYCHECK_CHECKING'),
+				'id'    => 'plg_quickicon_privacycheck',
+				'group' => 'MOD_QUICKICON_USERS'
+			)
+		);
+	}
+}
diff --git a/plugins/quickicon/privacycheck/privacycheck.xml b/plugins/quickicon/privacycheck/privacycheck.xml
new file mode 100644
index 0000000000000..4825bf588eaa5
--- /dev/null
+++ b/plugins/quickicon/privacycheck/privacycheck.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.9" type="plugin" group="quickicon" method="upgrade">
+	<name>plg_quickicon_privacycheck</name>
+	<author>Joomla! Project</author>
+	<creationDate>June 2018</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>PLG_QUICKICON_PRIVACYCHECK_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="privacycheck">privacycheck.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_quickicon_privacycheck.ini</language>
+		<language tag="en-GB">en-GB.plg_quickicon_privacycheck.sys.ini</language>
+	</languages>
+</extension>
diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php
index aa77a9a889482..9c92796f43adf 100644
--- a/plugins/sampledata/blog/blog.php
+++ b/plugins/sampledata/blog/blog.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Sampledata.Blog
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -274,6 +274,9 @@ public function onAjaxSampledataApplyStep1()
 				$article['access'] = $access;
 			}
 
+			// Publish
+			$article['transition'] = 2;
+
 			if (!$articleModel->save($article))
 			{
 				Factory::getLanguage()->load('com_content');
@@ -342,11 +345,16 @@ public function onAjaxSampledataApplyStep2()
 
 			$menu['menutype'] = $i . $type;
 
-			$menuTable->load();
-			$menuTable->bind($menu);
-
 			try
 			{
+				$menuTable->load();
+				$menuTable->bind($menu);
+
+				if (!$menuTable->check())
+				{
+					throw new Exception($menuTable->getError());
+				}
+
 				$menuTable->store();
 			}
 			catch (Exception $e)
diff --git a/plugins/sampledata/blog/blog.xml b/plugins/sampledata/blog/blog.xml
index a8f960d80925b..1557d14e151ae 100644
--- a/plugins/sampledata/blog/blog.xml
+++ b/plugins/sampledata/blog/blog.xml
@@ -3,7 +3,7 @@
 	<name>plg_sampledata_blog</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2017</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/sampledata/multilang/multilang.php b/plugins/sampledata/multilang/multilang.php
index 361cc059095f0..6834565ea7d86 100644
--- a/plugins/sampledata/multilang/multilang.php
+++ b/plugins/sampledata/multilang/multilang.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Sampledata.Multilang
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -761,8 +761,8 @@ private function addAllCategoriesMenuItem($itemLanguage)
 				. '"show_empty_categories_cat":"","show_subcat_desc_cat":"","show_cat_num_articles_cat":"",'
 				. '"show_category_title":"","show_description":"","show_description_image":"","maxLevel":"",'
 				. '"show_empty_categories":"","show_no_articles":"","show_subcat_desc":"","show_cat_num_articles":"",'
-				. '"num_leading_articles":"","num_intro_articles":"","num_columns":"","num_links":"",'
-				. '"multi_column_order":"","show_subcategory_content":"","orderby_pri":"","orderby_sec":"",'
+				. '"num_leading_articles":"","num_intro_articles":"","num_links":"",'
+				. '"show_subcategory_content":"","orderby_pri":"","orderby_sec":"",'
 				. '"order_date":"","show_pagination_limit":"","filter_field":"","show_headings":"",'
 				. '"list_show_date":"","date_format":"","list_show_hits":"","list_show_author":"","display_num":"10",'
 				. '"show_pagination":"","show_pagination_results":"","show_title":"","link_titles":"",'
@@ -842,8 +842,8 @@ private function addBlogMenuItem($itemLanguage, $categoryId)
 			'params'       => '{"layout_type":"blog","show_category_heading_title_text":"","show_category_title":"",'
 				. '"show_description":"","show_description_image":"","maxLevel":"","show_empty_categories":"",'
 				. '"show_no_articles":"","show_subcat_desc":"","show_cat_num_articles":"","show_cat_tags":"",'
-				. '"page_subheading":"","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3",'
-				. '"num_links":"0","multi_column_order":"1","show_subcategory_content":"","orderby_pri":"",'
+				. '"page_subheading":"","num_leading_articles":"1","num_intro_articles":"3",'
+				. '"num_links":"0","show_subcategory_content":"","orderby_pri":"",'
 				. '"orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1",'
 				. '"show_featured":"","show_title":"","link_titles":"","show_intro":"","info_block_position":"",'
 				. '"info_block_show_title":"","show_category":"","link_category":"","show_parent_category":"",'
diff --git a/plugins/sampledata/multilang/multilang.xml b/plugins/sampledata/multilang/multilang.xml
index 15ad7fa7cf5b4..30ee65ca56579 100644
--- a/plugins/sampledata/multilang/multilang.xml
+++ b/plugins/sampledata/multilang/multilang.xml
@@ -3,7 +3,7 @@
 	<name>plg_sampledata_multilang</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2018</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/search/categories/categories.php b/plugins/search/categories/categories.php
index 177815d377235..4a7a70c1b1df8 100644
--- a/plugins/search/categories/categories.php
+++ b/plugins/search/categories/categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Search.categories
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/search/categories/categories.xml b/plugins/search/categories/categories.xml
index 14fb011b3c551..543726a39c640 100644
--- a/plugins/search/categories/categories.xml
+++ b/plugins/search/categories/categories.xml
@@ -3,7 +3,7 @@
 	<name>plg_search_categories</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/search/contacts/contacts.php b/plugins/search/contacts/contacts.php
index 7ee7cd13c460e..4f43899a4f86a 100644
--- a/plugins/search/contacts/contacts.php
+++ b/plugins/search/contacts/contacts.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Search.contacts
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/search/contacts/contacts.xml b/plugins/search/contacts/contacts.xml
index 0df3e4b69b0f0..98788753e38df 100644
--- a/plugins/search/contacts/contacts.xml
+++ b/plugins/search/contacts/contacts.xml
@@ -3,7 +3,7 @@
 	<name>plg_search_contacts</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/search/content/content.php b/plugins/search/content/content.php
index 8f82a57fef36f..cebddd5067fe1 100644
--- a/plugins/search/content/content.php
+++ b/plugins/search/content/content.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Search.content
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/search/content/content.xml b/plugins/search/content/content.xml
index 7eb0f22e03977..c0c21a1336eb1 100644
--- a/plugins/search/content/content.xml
+++ b/plugins/search/content/content.xml
@@ -3,7 +3,7 @@
 	<name>plg_search_content</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/search/newsfeeds/newsfeeds.php b/plugins/search/newsfeeds/newsfeeds.php
index e31e08f62d001..cba25589b1bdc 100644
--- a/plugins/search/newsfeeds/newsfeeds.php
+++ b/plugins/search/newsfeeds/newsfeeds.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Search.newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/search/newsfeeds/newsfeeds.xml b/plugins/search/newsfeeds/newsfeeds.xml
index 0a59b3276938d..aad74a086104f 100644
--- a/plugins/search/newsfeeds/newsfeeds.xml
+++ b/plugins/search/newsfeeds/newsfeeds.xml
@@ -3,7 +3,7 @@
 	<name>plg_search_newsfeeds</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/search/tags/tags.php b/plugins/search/tags/tags.php
index e2b6630d522e1..bf304ded5533d 100644
--- a/plugins/search/tags/tags.php
+++ b/plugins/search/tags/tags.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Search.tags
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/plugins/search/tags/tags.xml b/plugins/search/tags/tags.xml
index 24cb0f60e68fb..351e89c310b5b 100644
--- a/plugins/search/tags/tags.xml
+++ b/plugins/search/tags/tags.xml
@@ -3,7 +3,7 @@
 	<name>plg_search_tags</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2014</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/actionlogs/actionlogs.php b/plugins/system/actionlogs/actionlogs.php
new file mode 100644
index 0000000000000..67d0e603f6e12
--- /dev/null
+++ b/plugins/system/actionlogs/actionlogs.php
@@ -0,0 +1,445 @@
+<?php
+/**
+ * @package     Joomla.Plugins
+ * @subpackage  System.actionlogs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! Users Actions Logging Plugin.
+ *
+ * @since  3.9.0
+ */
+class PlgSystemActionLogs extends JPlugin
+{
+	/**
+	 * Application object.
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.9.0
+	 */
+	protected $app;
+
+	/**
+	 * Database object.
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.9.0
+	 */
+	protected $db;
+
+	/**
+	 * Load plugin language file automatically so that it can be used inside component
+	 *
+	 * @var    boolean
+	 * @since  3.9.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   object  &$subject  The object to observe.
+	 * @param   array   $config    An optional associative array of configuration settings.
+	 *
+	 * @since   3.9.0
+	 */
+	public function __construct(&$subject, $config)
+	{
+		parent::__construct($subject, $config);
+
+		// Import actionlog plugin group so that these plugins will be triggered for events
+		JPluginHelper::importPlugin('actionlog');
+	}
+
+	/**
+	 * Adds additional fields to the user editing form for logs e-mail notifications
+	 *
+	 * @param   JForm  $form  The form to be altered.
+	 * @param   mixed  $data  The associated data for the form.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function onContentPrepareForm($form, $data)
+	{
+		if (!$form instanceof JForm)
+		{
+			$this->subject->setError('JERROR_NOT_A_FORM');
+
+			return false;
+		}
+
+		$formName = $form->getName();
+
+		$allowedFormNames = array(
+			'com_users.profile',
+			'com_admin.profile',
+			'com_users.user',
+		);
+
+		if (!in_array($formName, $allowedFormNames))
+		{
+			return true;
+		}
+
+		/**
+		 * We only allow users who has Super User permission change this setting for himself or for other users
+		 * who has same Super User permission
+		 */
+
+		$user = JFactory::getUser();
+
+		if (!$user->authorise('core.admin'))
+		{
+			return true;
+		}
+
+		// If we are on the save command, no data is passed to $data variable, we need to get it directly from request
+		$jformData = $this->app->input->get('jform', array(), 'array');
+
+		if ($jformData && !$data)
+		{
+			$data = $jformData;
+		}
+
+		if (is_array($data))
+		{
+			$data = (object) $data;
+		}
+
+		if (empty($data->id) || !JUser::getInstance($data->id)->authorise('core.admin'))
+		{
+			return true;
+		}
+
+		JForm::addFormPath(dirname(__FILE__) . '/forms');
+		$form->loadFile('actionlogs', false);
+	}
+
+	/**
+	 * Runs on content preparation
+	 *
+	 * @param   string  $context  The context for the data
+	 * @param   object  $data     An object containing the data for the form.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function onContentPrepareData($context, $data)
+	{
+		if (!in_array($context, array('com_users.profile', 'com_admin.profile', 'com_users.user')))
+		{
+			return true;
+		}
+
+		if (is_array($data))
+		{
+			$data = (object) $data;
+		}
+
+		if (!JUser::getInstance($data->id)->authorise('core.admin'))
+		{
+			return true;
+		}
+
+		$query = $this->db->getQuery(true)
+			->select($this->db->quoteName(array('notify', 'extensions')))
+			->from($this->db->quoteName('#__action_logs_users'))
+			->where($this->db->quoteName('user_id') . ' = ' . (int) $data->id);
+
+		try
+		{
+			$values = $this->db->setQuery($query)->loadObject();
+		}
+		catch (JDatabaseExceptionExecuting $e)
+		{
+			return false;
+		}
+
+		if (!$values)
+		{
+			return true;
+		}
+
+		$data->actionlogs                       = new StdClass;
+		$data->actionlogs->actionlogsNotify     = $values->notify;
+		$data->actionlogs->actionlogsExtensions = $values->extensions;
+
+		return true;
+	}
+
+	/**
+	 * Runs after the HTTP response has been sent to the client and delete log records older than certain days
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onAfterRespond()
+	{
+		$daysToDeleteAfter = (int) $this->params->get('logDeletePeriod', 0);
+
+		if ($daysToDeleteAfter <= 0)
+		{
+			return;
+		}
+
+		// The delete frequency will be once per day
+		$deleteFrequency = 3600 * 24;
+
+		// Do we need to run? Compare the last run timestamp stored in the plugin's options with the current
+		// timestamp. If the difference is greater than the cache timeout we shall not execute again.
+		$now  = time();
+		$last = (int) $this->params->get('lastrun', 0);
+
+		if (abs($now - $last) < $deleteFrequency)
+		{
+			return;
+		}
+
+		// Update last run status
+		$this->params->set('lastrun', $now);
+
+		$db    = $this->db;
+		$query = $db->getQuery(true)
+			->update($db->qn('#__extensions'))
+			->set($db->qn('params') . ' = ' . $db->q($this->params->toString('JSON')))
+			->where($db->qn('type') . ' = ' . $db->q('plugin'))
+			->where($db->qn('folder') . ' = ' . $db->q('system'))
+			->where($db->qn('element') . ' = ' . $db->q('actionlogs'));
+
+		try
+		{
+			// Lock the tables to prevent multiple plugin executions causing a race condition
+			$db->lockTable('#__extensions');
+		}
+		catch (Exception $e)
+		{
+			// If we can't lock the tables it's too risky to continue execution
+			return;
+		}
+
+		try
+		{
+			// Update the plugin parameters
+			$result = $db->setQuery($query)->execute();
+
+			$this->clearCacheGroups(array('com_plugins'), array(0, 1));
+		}
+		catch (Exception $exc)
+		{
+			// If we failed to execite
+			$db->unlockTables();
+			$result = false;
+		}
+
+		try
+		{
+			// Unlock the tables after writing
+			$db->unlockTables();
+		}
+		catch (Exception $e)
+		{
+			// If we can't lock the tables assume we have somehow failed
+			$result = false;
+		}
+
+		// Abort on failure
+		if (!$result)
+		{
+			return;
+		}
+
+		$daysToDeleteAfter = (int) $this->params->get('logDeletePeriod', 0);
+		$now = $db->quote(JFactory::getDate()->toSql());
+
+		if ($daysToDeleteAfter > 0)
+		{
+			$conditions = array($db->quoteName('log_date') . ' < ' . $query->dateAdd($now, -1 * $daysToDeleteAfter, ' DAY'));
+
+			$query->clear()
+				->delete($db->quoteName('#__action_logs'))->where($conditions);
+			$db->setQuery($query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				// Ignore it
+				return;
+			}
+		}
+	}
+
+	/**
+	 * Utility method to act on a user after it has been saved.
+	 *
+	 * @param   array    $user     Holds the new user data.
+	 * @param   boolean  $isNew    True if a new user is stored.
+	 * @param   boolean  $success  True if user was successfully stored in the database.
+	 * @param   string   $msg      Message.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function onUserAfterSave($user, $isNew, $success, $msg)
+	{
+		if (!$success)
+		{
+			return false;
+		}
+
+		// Clear access rights in case user groups were changed.
+		$userObject = JFactory::getUser($user['id']);
+		$userObject->clearAccessRights();
+		$authorised = $userObject->authorise('core.admin');
+
+		$query = $this->db->getQuery(true)
+			->select('COUNT(*)')
+			->from($this->db->quoteName('#__action_logs_users'))
+			->where($this->db->quoteName('user_id') . ' = ' . (int) $user['id']);
+
+		try
+		{
+			$exists = (bool) $this->db->setQuery($query)->loadResult();
+		}
+		catch (JDatabaseExceptionExecuting $e)
+		{
+			return false;
+		}
+
+		// If preferences don't exist, insert.
+		if (!$exists && $authorised && isset($user['actionlogs']))
+		{
+			$values  = array((int) $user['id'], (int) $user['actionlogs']['actionlogsNotify']);
+			$columns = array('user_id', 'notify');
+
+			if (isset($user['actionlogs']['actionlogsExtensions']))
+			{
+				$values[]  = $this->db->quote(json_encode($user['actionlogs']['actionlogsExtensions']));
+				$columns[] = 'extensions';
+			}
+
+			$query = $this->db->getQuery(true)
+				->insert($this->db->quoteName('#__action_logs_users'))
+				->columns($this->db->quoteName($columns))
+				->values(implode(',', $values));
+		}
+		elseif ($exists && $authorised && isset($user['actionlogs']))
+		{
+			// Update preferences.
+			$values = array($this->db->quoteName('notify') . ' = ' . (int) $user['actionlogs']['actionlogsNotify']);
+
+			if (isset($user['actionlogs']['actionlogsExtensions']))
+			{
+				$values[] = $this->db->quoteName('extensions') . ' = ' . $this->db->quote(json_encode($user['actionlogs']['actionlogsExtensions']));
+			}
+
+			$query = $this->db->getQuery(true)
+				->update($this->db->quoteName('#__action_logs_users'))
+				->set($values)
+				->where($this->db->quoteName('user_id') . ' = ' . (int) $user['id']);
+		}
+		elseif ($exists && !$authorised)
+		{
+			// Remove preferences if user is not authorised.
+			$query = $this->db->getQuery(true)
+				->delete($this->db->quoteName('#__action_logs_users'))
+				->where($this->db->quoteName('user_id') . ' = ' . (int) $user['id']);
+		}
+
+		try
+		{
+			$this->db->setQuery($query)->execute();
+		}
+		catch (JDatabaseExceptionExecuting $e)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Removes user preferences
+	 *
+	 * Method is called after user data is deleted from the database
+	 *
+	 * @param   array    $user     Holds the user data
+	 * @param   boolean  $success  True if user was successfully stored in the database
+	 * @param   string   $msg      Message
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function onUserAfterDelete($user, $success, $msg)
+	{
+		if (!$success)
+		{
+			return false;
+		}
+
+		$query = $this->db->getQuery(true)
+			->delete($this->db->quoteName('#__action_logs_users'))
+			->where($this->db->quoteName('user_id') . ' = ' . (int) $user['id']);
+
+		try
+		{
+			$this->db->setQuery($query)->execute();
+		}
+		catch (JDatabaseExceptionExecuting $e)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Clears cache groups. We use it to clear the plugins cache after we update the last run timestamp.
+	 *
+	 * @param   array  $clearGroups   The cache groups to clean
+	 * @param   array  $cacheClients  The cache clients (site, admin) to clean
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	private function clearCacheGroups(array $clearGroups, array $cacheClients = array(0, 1))
+	{
+		$conf = JFactory::getConfig();
+
+		foreach ($clearGroups as $group)
+		{
+			foreach ($cacheClients as $clientId)
+			{
+				try
+				{
+					$options = array(
+						'defaultgroup' => $group,
+						'cachebase'    => $clientId ? JPATH_ADMINISTRATOR . '/cache' :
+							$conf->get('cache_path', JPATH_SITE . '/cache')
+					);
+
+					$cache = JCache::getInstance('callback', $options);
+					$cache->clean();
+				}
+				catch (Exception $e)
+				{
+					// Ignore it
+				}
+			}
+		}
+	}
+}
diff --git a/plugins/system/actionlogs/actionlogs.xml b/plugins/system/actionlogs/actionlogs.xml
new file mode 100644
index 0000000000000..d69bae3524cb4
--- /dev/null
+++ b/plugins/system/actionlogs/actionlogs.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension version="3.9" type="plugin" group="system" method="upgrade">
+	<name>PLG_SYSTEM_ACTIONLOGS</name>
+	<author>Joomla! Project</author>
+	<creationDate>May 2018</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>PLG_SYSTEM_ACTIONLOGS_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="actionlogs">actionlogs.php</filename>
+		<folder>forms</folder>
+	</files>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="logDeletePeriod"
+					type="number"
+					label="PLG_SYSTEM_ACTIONLOGS_LOG_DELETE_PERIOD"
+					description="PLG_SYSTEM_ACTIONLOGS_LOG_DELETE_PERIOD_DESC"
+					default="0"
+					min="0"
+					max="30"
+					step="5"
+					filter="int"
+					validate="number"
+				/>
+				<field
+					name="lastrun"
+					type="hidden"
+					default="0"
+					filter="integer"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/plugins/system/actionlogs/forms/actionlogs.xml b/plugins/system/actionlogs/forms/actionlogs.xml
new file mode 100644
index 0000000000000..00d19546a2f71
--- /dev/null
+++ b/plugins/system/actionlogs/forms/actionlogs.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fieldset name="actionlogs" label="PLG_SYSTEM_ACTIONLOGS_OPTIONS" addfieldpath="/administrator/components/com_actionlogs/models/fields">
+		<fields name="actionlogs">
+			<field
+				name="actionlogsNotify"
+				type="radio"
+				label="PLG_SYSTEM_ACTIONLOGS_NOTIFICATIONS"
+				description="PLG_SYSTEM_ACTIONLOGS_NOTIFICATIONS_DESC"
+				class="btn-group btn-group-yesno"
+				default="0"
+				filter="integer"
+				required="true"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+			<field
+				name="actionlogsExtensions"
+				type="logtype"
+				label="PLG_SYSTEM_ACTIONLOGS_EXTENSIONS_NOTIFICATIONS"
+				description="PLG_SYSTEM_ACTIONLOGS_EXTENSIONS_NOTIFICATIONS_DESC"
+				multiple="true"
+				validate="options"
+				showon="actionlogsNotify:1"
+			/>
+		</fields>
+	</fieldset>
+</form>
diff --git a/plugins/system/cache/cache.php b/plugins/system/cache/cache.php
index 1217c8c8d45a0..bd7fa485afd07 100644
--- a/plugins/system/cache/cache.php
+++ b/plugins/system/cache/cache.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.cache
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -59,20 +59,22 @@ public function __construct(& $subject, $config)
 	{
 		parent::__construct($subject, $config);
 
-		// Set the language in the class.
+		// Get the application if not done by JPlugin. This may happen during upgrades from Joomla 2.5.
+		if (!isset($this->app))
+		{
+			$this->app = JFactory::getApplication();
+		}
+
+		// Set the cache options.
 		$options = array(
 			'defaultgroup' => 'page',
 			'browsercache' => $this->params->get('browsercache', 0),
 			'caching'      => false,
 		);
 
-		// Get the application if not done by JPlugin. This may happen during upgrades from Joomla 2.5.
-		if (!$this->app)
-		{
-			$this->app = Factory::getApplication();
-		}
-
-		$this->_cache = Cache::getInstance('page', $options);
+		// Instantiate cache with previous options and create the cache key identifier.
+		$this->_cache     = Cache::getInstance('page', $options);
+		$this->_cache_key = Uri::getInstance()->toString();
 	}
 
 	/**
@@ -100,7 +102,8 @@ protected function getCacheKey()
 	}
 
 	/**
-	 * Converting the site URL to fit to the HTTP request.
+	 * After Initialise Event.
+	 * Checks if URL exists in cache, if so dumps it directly and closes.
 	 *
 	 * @return  void
 	 *
@@ -108,15 +111,7 @@ protected function getCacheKey()
 	 */
 	public function onAfterInitialise()
 	{
-		$app  = $this->app;
-		$user = Factory::getUser();
-
-		if ($app->isClient('administrator'))
-		{
-			return;
-		}
-
-		if (count($app->getMessageQueue()))
+		if ($this->app->isClient('administrator') || $this->app->get('offline', '0') || count($this->app->getMessageQueue()))
 		{
 			return;
 		}
@@ -126,56 +121,78 @@ public function onAfterInitialise()
 
 		$results = $this->app->triggerEvent('onPageCacheSetCaching');
 		$caching = !in_array(false, $results, true);
+		$user    = JFactory::getUser();
 
-		if ($caching && $user->get('guest') && $app->input->getMethod() === 'GET')
+		if ($caching && $user->get('guest') && $this->app->input->getMethod() == 'GET')
 		{
 			$this->_cache->setCaching(true);
 		}
 
 		$data = $this->_cache->get($this->getCacheKey());
 
+		// If page exist in cache, show cached page.
 		if ($data !== false)
 		{
-			// Set cached body.
-			$app->setBody($data);
+			// Set HTML page from cache.
+			$this->app->setBody($data);
 
-			echo $app->toString();
+			// Dumps HTML page.
+			echo $this->app->toString();
 
+			// Mark afterCache in debug and run debug onAfterRespond events.
+			// e.g., show Joomla Debug Console if debug is active.
 			if (JDEBUG)
 			{
 				Profiler::getInstance('Application')->mark('afterCache');
+				$this->app->triggerEvent('onAfterRespond');
 			}
 
-			$app->close();
+			// Closes the application.
+			$this->app->close();
 		}
 	}
 
 	/**
-	 * After render.
+	 * After Route Event.
+	 * Verify if current page is not excluded from cache.
 	 *
 	 * @return   void
 	 *
-	 * @since   1.5
+	 * @since   3.9.0
 	 */
-	public function onAfterRespond()
+	public function onAfterRoute()
 	{
-		$app = $this->app;
-
-		if ($app->isClient('administrator'))
+		if ($this->app->isClient('administrator') || $this->app->get('offline', '0') || count($this->app->getMessageQueue()))
 		{
 			return;
 		}
 
-		if (count($app->getMessageQueue()))
+		// Page is excluded if excluded in plugin settings.
+		if ($this->isExcluded())
 		{
-			return;
+			$this->_cache->setCaching(false);
 		}
+	}
 
-		$user = Factory::getUser();
+	/**
+	 * After Respond Event.
+	 * Stores page in cache.
+	 *
+	 * @return   void
+	 *
+	 * @since   1.5
+	 */
+	public function onAfterRespond()
+	{
+		if ($this->app->isClient('administrator') || $this->app->get('offline', '0') || count($this->app->getMessageQueue()))
+		{
+			return;
+		}
 
-		if ($user->get('guest') && !$this->isExcluded())
+		// We need to check if user is guest again here, because auto-login plugins have not been fired before the first aid check.
+		if (Factory::getUser()->get('guest'))
 		{
-			// We need to check again here, because auto-login plugins have not been fired before the first aid check.
+			// Saves current page in cache.
 			$this->_cache->store(null, $this->getCacheKey());
 		}
 	}
@@ -189,10 +206,10 @@ public function onAfterRespond()
 	 */
 	protected function isExcluded()
 	{
-		// Check if menu items have been excluded
+		// Check if menu items have been excluded.
 		if ($exclusions = $this->params->get('exclude_menu_items', array()))
 		{
-			// Get the current menu item
+			// Get the current menu item.
 			$active = $this->app->getMenu()->getActive();
 
 			if ($active && $active->id && in_array((int) $active->id, (array) $exclusions))
@@ -201,19 +218,19 @@ protected function isExcluded()
 			}
 		}
 
-		// Check if regular expressions are being used
+		// Check if regular expressions are being used.
 		if ($exclusions = $this->params->get('exclude', ''))
 		{
-			// Normalize line endings
+			// Normalize line endings.
 			$exclusions = str_replace(array("\r\n", "\r"), "\n", $exclusions);
 
-			// Split them
+			// Split them.
 			$exclusions = explode("\n", $exclusions);
 
-			// Get current path to match against
-			$path = Uri::getInstance()->toString(array('path', 'query', 'fragment'));
+			// Gets internal URI.
+			$internal_uri	= '/index.php?' . Uri::getInstance()->buildQuery($this->app->getRouter()->getVars());
 
-			// Loop through each pattern
+			// Loop through each pattern.
 			if ($exclusions)
 			{
 				foreach ($exclusions as $exclusion)
@@ -221,7 +238,8 @@ protected function isExcluded()
 					// Make sure the exclusion has some content
 					if ($exclusion !== '')
 					{
-						if (preg_match('/' . $exclusion . '/is', $path, $match))
+						// Test both external and internal URI
+						if (preg_match('#' . $exclusion . '#i', $this->_cache_key . ' ' . $internal_uri, $match))
 						{
 							return true;
 						}
diff --git a/plugins/system/cache/cache.xml b/plugins/system/cache/cache.xml
index ad808b238bec0..56798604e492a 100644
--- a/plugins/system/cache/cache.xml
+++ b/plugins/system/cache/cache.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_cache</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2007</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php
index 354b6818c6be3..c3f2b437053b4 100644
--- a/plugins/system/debug/debug.php
+++ b/plugins/system/debug/debug.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.Debug
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -196,8 +196,13 @@ public function __construct(&$subject, $config)
 	public function onAfterDispatch()
 	{
 		// Only if debugging or language debug is enabled.
-		if ((JDEBUG || $this->debugLang) && $this->isAuthorisedDisplayDebug())
+		if ((JDEBUG || $this->debugLang) && $this->isAuthorisedDisplayDebug() && strtolower($this->app->getDocument()->getType()) === 'html')
 		{
+			// Use our own jQuery and font-awesome instead of the debug bar shipped version
+			$assetManager = $this->app->getDocument()->getWebAssetManager();
+			$assetManager->enableAsset('jquery-noconflict');
+			$assetManager->enableAsset('font-awesome');
+
 			HTMLHelper::_('stylesheet', 'plg_system_debug/debug.css', array('version' => 'auto', 'relative' => true));
 			HTMLHelper::_('script', 'plg_system_debug/debug.min.js', array('version' => 'auto', 'relative' => true));
 		}
@@ -219,7 +224,7 @@ public function onAfterDispatch()
 	public function onAfterRespond()
 	{
 		// Do not render if debugging or language debug is not enabled.
-		if (!JDEBUG && !$this->debugLang || $this->isAjax)
+		if (!JDEBUG && !$this->debugLang || $this->isAjax || strtolower($this->app->getDocument()->getType()) !== 'html')
 		{
 			return;
 		}
@@ -284,14 +289,17 @@ public function onAfterRespond()
 		$debugBarRenderer->setOpenHandlerUrl($openHandlerUrl);
 		$debugBarRenderer->setBaseUrl(JUri::root(true) . '/media/vendor/debugbar/');
 
-		// Use our own jQuery and font-awesome instead of the debug bar shipped version
-		$assetManager = $this->app->getDocument()->getWebAssetManager();
-		$assetManager->enableAsset('jquery-noconflict');
-		$assetManager->enableAsset('font-awesome');
 		$debugBarRenderer->disableVendor('jquery');
 		$debugBarRenderer->setEnableJqueryNoConflict(false);
 		$debugBarRenderer->disableVendor('fontawesome');
 
+		/**
+		 * @todo disable highlightjs from the DebugBar, import it through NPM
+		 *       and deliver it through Joomla's API
+		 *       Also every DebuBar script and stylesheet needs to use Joomla's API
+		 *       $debugBarRenderer->disableVendor('highlightjs');
+		 */
+
 		// Only render for HTML output.
 		if (Factory::getDocument()->getType() !== 'html')
 		{
@@ -318,9 +326,7 @@ public function onAfterRespond()
 			return;
 		}
 
-		$contents = str_replace('</head>', $debugBarRenderer->renderHead() . '</head>', $contents);
-
-		echo str_replace('</body>', $debugBarRenderer->render() . '</body>', $contents);
+		echo str_replace('</body>', $debugBarRenderer->renderHead() . $debugBarRenderer->render() . '</body>', $contents);
 	}
 
 	/**
diff --git a/plugins/system/debug/debug.xml b/plugins/system/debug/debug.xml
index 92947fdeb27c7..de8afac562afa 100644
--- a/plugins/system/debug/debug.xml
+++ b/plugins/system/debug/debug.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_debug</name>
 	<author>Joomla! Project</author>
 	<creationDate>December 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/fields/fields.php b/plugins/system/fields/fields.php
index d60f05ec6a7e0..9b49f7ace97d1 100644
--- a/plugins/system/fields/fields.php
+++ b/plugins/system/fields/fields.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.Fields
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/fields/fields.xml b/plugins/system/fields/fields.xml
index 0ed586f733f09..df48827f64666 100644
--- a/plugins/system/fields/fields.xml
+++ b/plugins/system/fields/fields.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_fields</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2016</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/highlight/highlight.php b/plugins/system/highlight/highlight.php
index 66a8c0482629d..b8e5deabc49b5 100644
--- a/plugins/system/highlight/highlight.php
+++ b/plugins/system/highlight/highlight.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.Highlight
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/highlight/highlight.xml b/plugins/system/highlight/highlight.xml
index e3e077b66f65c..da112e26e926d 100644
--- a/plugins/system/highlight/highlight.xml
+++ b/plugins/system/highlight/highlight.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_highlight</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2011</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/httpheaders/httpheaders.php b/plugins/system/httpheaders/httpheaders.php
index c16cbfa5fe718..214fbe9015a7e 100644
--- a/plugins/system/httpheaders/httpheaders.php
+++ b/plugins/system/httpheaders/httpheaders.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.HttpHeader
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/httpheaders/httpheaders.xml b/plugins/system/httpheaders/httpheaders.xml
index a89e2edcaf485..d2788755571a0 100644
--- a/plugins/system/httpheaders/httpheaders.xml
+++ b/plugins/system/httpheaders/httpheaders.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_httpheaders</name>
 	<author>Joomla! Project</author>
 	<creationDate>October 2017</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/httpheaders/postinstall/introduction.php b/plugins/system/httpheaders/postinstall/introduction.php
index 956cb5a686642..fc250f92de12e 100644
--- a/plugins/system/httpheaders/postinstall/introduction.php
+++ b/plugins/system/httpheaders/postinstall/introduction.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.HttpHeaders
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.ini b/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.ini
index 95fdcfb174f79..ddbf62d73eff5 100644
--- a/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.ini
+++ b/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.sys.ini b/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.sys.ini
index b671d2ee0cb26..ae1e539df1050 100644
--- a/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.sys.ini
+++ b/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/plugins/system/languagecode/languagecode.php b/plugins/system/languagecode/languagecode.php
index ff03efc8b04cc..da1dd87e221dd 100644
--- a/plugins/system/languagecode/languagecode.php
+++ b/plugins/system/languagecode/languagecode.php
@@ -3,13 +3,12 @@
  * @package     Joomla.Plugin
  * @subpackage  System.languagecode
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
@@ -22,6 +21,14 @@
  */
 class PlgSystemLanguagecode extends CMSPlugin
 {
+	/**
+	 * Application object
+	 *
+	 * @var    \Joomla\CMS\Application\CMSApplication
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $app;	
+
 	/**
 	 * Plugin that changes the language code used in the <html /> tag.
 	 *
@@ -31,16 +38,14 @@ class PlgSystemLanguagecode extends CMSPlugin
 	 */
 	public function onAfterRender()
 	{
-		$app = Factory::getApplication();
-
 		// Use this plugin only in site application.
-		if ($app->isClient('site'))
+		if ($this->app->isClient('site'))
 		{
 			// Get the response body.
-			$body = $app->getBody();
+			$body = $this->app->getBody();
 
 			// Get the current language code.
-			$code = Factory::getDocument()->getLanguage();
+			$code = $this->app->getDocument()->getLanguage();
 
 			// Get the new code.
 			$new_code  = $this->params->get($code);
@@ -65,7 +70,7 @@ public function onAfterRender()
 			}
 
 			// Replace codes in <link hreflang="" /> attributes.
-			preg_match_all(chr(1) . '(<link.*\s+hreflang=")([0-9a-z\-]*)(".*\s+rel="alternate".*/>)' . chr(1) . 'i', $body, $matches);
+			preg_match_all(chr(1) . '(<link.*\s+hreflang=")([0-9a-z\-]*)(".*\s+rel="alternate".*>)' . chr(1) . 'i', $body, $matches);
 
 			foreach ($matches[2] as $match)
 			{
@@ -73,12 +78,12 @@ public function onAfterRender()
 
 				if ($new_code)
 				{
-					$patterns[] = chr(1) . '(<link.*\s+hreflang=")(' . $match . ')(".*\s+rel="alternate".*/>)' . chr(1) . 'i';
+					$patterns[] = chr(1) . '(<link.*\s+hreflang=")(' . $match . ')(".*\s+rel="alternate".*>)' . chr(1) . 'i';
 					$replace[] = '${1}' . $new_code . '${3}';
 				}
 			}
 
-			preg_match_all(chr(1) . '(<link.*\s+rel="alternate".*\s+hreflang=")([0-9A-Za-z\-]*)(".*/>)' . chr(1) . 'i', $body, $matches);
+			preg_match_all(chr(1) . '(<link.*\s+rel="alternate".*\s+hreflang=")([0-9A-Za-z\-]*)(".*>)' . chr(1) . 'i', $body, $matches);
 
 			foreach ($matches[2] as $match)
 			{
@@ -86,13 +91,13 @@ public function onAfterRender()
 
 				if ($new_code)
 				{
-					$patterns[] = chr(1) . '(<link.*\s+rel="alternate".*\s+hreflang=")(' . $match . ')(".*/>)' . chr(1) . 'i';
+					$patterns[] = chr(1) . '(<link.*\s+rel="alternate".*\s+hreflang=")(' . $match . ')(".*>)' . chr(1) . 'i';
 					$replace[] = '${1}' . $new_code . '${3}';
 				}
 			}
 
 			// Replace codes in itemprop content
-			preg_match_all(chr(1) . '(<meta.*\s+itemprop="inLanguage".*\s+content=")([0-9A-Za-z\-]*)(".*/>)' . chr(1) . 'i', $body, $matches);
+			preg_match_all(chr(1) . '(<meta.*\s+itemprop="inLanguage".*\s+content=")([0-9A-Za-z\-]*)(".*>)' . chr(1) . 'i', $body, $matches);
 
 			foreach ($matches[2] as $match)
 			{
@@ -100,12 +105,12 @@ public function onAfterRender()
 
 				if ($new_code)
 				{
-					$patterns[] = chr(1) . '(<meta.*\s+itemprop="inLanguage".*\s+content=")(' . $match . ')(".*/>)' . chr(1) . 'i';
+					$patterns[] = chr(1) . '(<meta.*\s+itemprop="inLanguage".*\s+content=")(' . $match . ')(".*>)' . chr(1) . 'i';
 					$replace[] = '${1}' . $new_code . '${3}';
 				}
 			}
 
-			$app->setBody(preg_replace($patterns, $replace, $body));
+			$this->app->setBody(preg_replace($patterns, $replace, $body));
 		}
 	}
 
diff --git a/plugins/system/languagecode/languagecode.xml b/plugins/system/languagecode/languagecode.xml
index 8203f5ffd4e97..0fb59d76c68af 100644
--- a/plugins/system/languagecode/languagecode.xml
+++ b/plugins/system/languagecode/languagecode.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_languagecode</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2011</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/languagefilter/languagefilter.php b/plugins/system/languagefilter/languagefilter.php
index 3a222f70fced4..965fda13c03c9 100644
--- a/plugins/system/languagefilter/languagefilter.php
+++ b/plugins/system/languagefilter/languagefilter.php
@@ -3,13 +3,14 @@
  * @package     Joomla.Plugin
  * @subpackage  System.languagefilter
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Association\AssociationServiceInterface;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Event\BeforeExecuteEvent;
@@ -104,14 +105,15 @@ public function __construct(&$subject, $config)
 
 		$this->app = Factory::getApplication();
 
+		// Setup language data.
+		$this->mode_sef     = $this->app->get('sef', 0);
+		$this->sefs         = LanguageHelper::getLanguages('sef');
+		$this->lang_codes   = LanguageHelper::getLanguages('lang_code');
+		$this->default_lang = ComponentHelper::getParams('com_languages')->get('site', 'en-GB');
+
+		// If language filter plugin is executed in a site page.
 		if ($this->app->isClient('site'))
 		{
-			// Setup language data.
-			$this->mode_sef     = $this->app->get('sef', 0);
-			$this->sefs         = LanguageHelper::getLanguages('sef');
-			$this->lang_codes   = LanguageHelper::getLanguages('lang_code');
-			$this->default_lang = ComponentHelper::getParams('com_languages')->get('site', 'en-GB');
-
 			$levels = Factory::getUser()->getAuthorisedViewLevels();
 
 			foreach ($this->sefs as $sef => $language)
@@ -125,6 +127,21 @@ public function __construct(&$subject, $config)
 				}
 			}
 		}
+		// If language filter plugin is executed in a admin page (ex: JRoute site).
+		else
+		{
+			// Set current language to default site language, fallback to en-GB if there is no content language for the default site language.
+			$this->current_lang = isset($this->lang_codes[$this->default_lang]) ? $this->default_lang : 'en-GB';
+
+			foreach ($this->sefs as $sef => $language)
+			{
+				if (!array_key_exists($language->lang_code, JLanguageHelper::getInstalledLanguages(0)))
+				{
+					unset($this->lang_codes[$language->lang_code]);
+					unset($this->sefs[$language->sef]);
+				}
+			}
+		}
 	}
 
 	/**
@@ -138,26 +155,24 @@ public function onAfterInitialise()
 	{
 		$this->app->item_associations = $this->params->get('item_associations', 0);
 
-		if ($this->app->isClient('site'))
-		{
-			$router = $this->app->getRouter();
-
-			// Attach build rules for language SEF.
-			$router->attachBuildRule(array($this, 'preprocessBuildRule'), Router::PROCESS_BEFORE);
-			$router->attachBuildRule(array($this, 'buildRule'), Router::PROCESS_BEFORE);
+		// We need to make sure we are always using the site router, even if the language plugin is executed in admin app.
+		$router = CMSApplication::getInstance('site')->getRouter('site');
 
-			if ($this->mode_sef)
-			{
-				$router->attachBuildRule(array($this, 'postprocessSEFBuildRule'), Router::PROCESS_AFTER);
-			}
-			else
-			{
-				$router->attachBuildRule(array($this, 'postprocessNonSEFBuildRule'), Router::PROCESS_AFTER);
-			}
+		// Attach build rules for language SEF.
+		$router->attachBuildRule(array($this, 'preprocessBuildRule'), Router::PROCESS_BEFORE);
+		$router->attachBuildRule(array($this, 'buildRule'), Router::PROCESS_BEFORE);
 
-			// Attach parse rules for language SEF.
-			$router->attachParseRule(array($this, 'parseRule'), Router::PROCESS_BEFORE);
+		if ($this->mode_sef)
+		{
+			$router->attachBuildRule(array($this, 'postprocessSEFBuildRule'), Router::PROCESS_AFTER);
 		}
+		else
+		{
+			$router->attachBuildRule(array($this, 'postprocessNonSEFBuildRule'), Router::PROCESS_AFTER);
+		}
+
+		// Attach parse rule.
+		$router->attachParseRule(array($this, 'parseRule'), Router::PROCESS_BEFORE);
 	}
 
 	/**
@@ -170,7 +185,7 @@ public function onAfterInitialise()
 	public function onAfterRoute()
 	{
 		// Add custom site name.
-		if (isset($this->lang_codes[$this->current_lang]) && $this->lang_codes[$this->current_lang]->sitename)
+		if ($this->app->isClient('site') && isset($this->lang_codes[$this->current_lang]) && $this->lang_codes[$this->current_lang]->sitename)
 		{
 			$this->app->set('sitename', $this->lang_codes[$this->current_lang]->sitename);
 		}
@@ -187,7 +202,7 @@ public function onAfterRoute()
 	 */
 	public function onBeforeExecute(BeforeExecuteEvent $event)
 	{
-		/** @var JApplicationCms $app */
+		/** @var \Joomla\CMS\Application\SiteApplication $app */
 		$app = $event->getApplication();
 
 		if (!$app->isClient('site'))
@@ -408,9 +423,10 @@ public function parseRule(&$router, &$uri)
 			$lang_code = $this->sefs[$lang]->lang_code;
 		}
 
-		// We are called via POST. We don't care about the language
+		// We are called via POST or the nolangfilter url parameter was set. We don't care about the language
 		// and simply set the default language as our current language.
 		if ($this->app->input->getMethod() === 'POST'
+			|| $this->app->input->get('nolangfilter', 0) == 1
 			|| count($this->app->input->post) > 0
 			|| count($this->app->input->files) > 0)
 		{
@@ -541,6 +557,24 @@ public function parseRule(&$router, &$uri)
 		return $array;
 	}
 
+	/**
+	 * Reports the privacy related capabilities for this plugin to site administrators.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.9.0
+	 */
+	public function onPrivacyCollectAdminCapabilities()
+	{
+		$this->loadLanguage();
+
+		return array(
+			JText::_('PLG_SYSTEM_LANGUAGEFILTER') => array(
+				JText::_('PLG_SYSTEM_LANGUAGEFILTER_PRIVACY_CAPABILITY_LANGUAGE_COOKIE'),
+			)
+		);
+	}
+
 	/**
 	 * Before store user method.
 	 *
diff --git a/plugins/system/languagefilter/languagefilter.xml b/plugins/system/languagefilter/languagefilter.xml
index c82286a540ccd..fea021cbea836 100644
--- a/plugins/system/languagefilter/languagefilter.xml
+++ b/plugins/system/languagefilter/languagefilter.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_languagefilter</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2010</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/log/log.php b/plugins/system/log/log.php
index 15e0825ea3d16..680ad579f6b55 100644
--- a/plugins/system/log/log.php
+++ b/plugins/system/log/log.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.log
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/log/log.xml b/plugins/system/log/log.xml
index 136641ce3996a..d2407cf111192 100644
--- a/plugins/system/log/log.xml
+++ b/plugins/system/log/log.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_log</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2007</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/logout/logout.php b/plugins/system/logout/logout.php
index 20de4923c0fc7..2ca2909498622 100644
--- a/plugins/system/logout/logout.php
+++ b/plugins/system/logout/logout.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.logout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/logout/logout.xml b/plugins/system/logout/logout.xml
index b41c99138aed2..0c4d262a40a80 100644
--- a/plugins/system/logout/logout.xml
+++ b/plugins/system/logout/logout.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_logout</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2009</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/logrotation/logrotation.php b/plugins/system/logrotation/logrotation.php
new file mode 100644
index 0000000000000..b9bba6a021296
--- /dev/null
+++ b/plugins/system/logrotation/logrotation.php
@@ -0,0 +1,274 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.logrotation
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Filesystem\File;
+use Joomla\Filesystem\Folder;
+use Joomla\Filesystem\Path;
+
+/**
+ * Joomla! Log Rotation plugin
+ *
+ * Rotate the log files created by Joomla core
+ *
+ * @since  3.9.0
+ */
+class PlgSystemLogrotation extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.9.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Application object.
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.9.0
+	 */
+	protected $app;
+
+	/**
+	 * Database object.
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.9.0
+	 */
+	protected $db;
+
+	/**
+	 * The log check and rotation code is triggered after the page has fully rendered.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onAfterRender()
+	{
+		// Get the timeout as configured in plugin parameters
+
+		/** @var \Joomla\Registry\Registry $params */
+		$cache_timeout = (int) $this->params->get('cachetimeout', 30);
+		$cache_timeout = 24 * 3600 * $cache_timeout;
+		$logsToKeep    = (int) $this->params->get('logstokeep', 1);
+
+		// Do we need to run? Compare the last run timestamp stored in the plugin's options with the current
+		// timestamp. If the difference is greater than the cache timeout we shall not execute again.
+		$now  = time();
+		$last = (int) $this->params->get('lastrun', 0);
+
+		if ((abs($now - $last) < $cache_timeout))
+		{
+			return;
+		}
+
+		// Update last run status
+		$this->params->set('lastrun', $now);
+
+		$db    = $this->db;
+		$query = $db->getQuery(true)
+			->update($db->qn('#__extensions'))
+			->set($db->qn('params') . ' = ' . $db->q($this->params->toString('JSON')))
+			->where($db->qn('type') . ' = ' . $db->q('plugin'))
+			->where($db->qn('folder') . ' = ' . $db->q('system'))
+			->where($db->qn('element') . ' = ' . $db->q('logrotation'));
+
+		try
+		{
+			// Lock the tables to prevent multiple plugin executions causing a race condition
+			$db->lockTable('#__extensions');
+		}
+		catch (Exception $e)
+		{
+			// If we can't lock the tables it's too risky to continue execution
+			return;
+		}
+
+		try
+		{
+			// Update the plugin parameters
+			$result = $db->setQuery($query)->execute();
+
+			$this->clearCacheGroups(array('com_plugins'), array(0, 1));
+		}
+		catch (Exception $exc)
+		{
+			// If we failed to execite
+			$db->unlockTables();
+			$result = false;
+		}
+
+		try
+		{
+			// Unlock the tables after writing
+			$db->unlockTables();
+		}
+		catch (Exception $e)
+		{
+			// If we can't lock the tables assume we have somehow failed
+			$result = false;
+		}
+
+		// Abort on failure
+		if (!$result)
+		{
+			return;
+		}
+
+		// Get the log path
+		$logPath = Path::clean($this->app->get('log_path'));
+
+		// Invalid path, stop processing further
+		if (!is_dir($logPath))
+		{
+			return;
+		}
+
+		$logFiles = $this->getLogFiles($logPath);
+
+		// Sort log files by version number in reserve order
+		krsort($logFiles, SORT_NUMERIC);
+
+		foreach ($logFiles as $version => $files)
+		{
+			if ($version >= $logsToKeep)
+			{
+				// Delete files which has version greater than or equals $logsToKeep
+				foreach ($files as $file)
+				{
+					File::delete($logPath . '/' . $file);
+				}
+			}
+			else
+			{
+				// For files which has version smaller than $logsToKeep, rotate (increase version number)
+				foreach ($files as $file)
+				{
+					$this->rotate($logPath, $file, $version);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get log files from log folder
+	 *
+	 * @param   string  $path  The folder to get log files
+	 *
+	 * @return  array   The log files in the given path grouped by version number (not rotated files has number 0)
+	 *
+	 * @since   3.9.0
+	 */
+	private function getLogFiles($path)
+	{
+		$logFiles = array();
+		$files    = Folder::files($path, '\.php$');
+
+		foreach ($files as $file)
+		{
+			$parts    = explode('.', $file);
+
+			/*
+			 * Rotated log file has this filename format [VERSION].[FILENAME].php. So if $parts has at least 3 elements
+			 * and the first element is a number, we know that it's a rotated file and can get it's current version
+			 */
+			if (count($parts) >= 3 && is_numeric($parts[0]))
+			{
+				$version = (int) $parts[0];
+			}
+			else
+			{
+				$version = 0;
+			}
+
+			if (!isset($logFiles[$version]))
+			{
+				$logFiles[$version] = array();
+			}
+
+			$logFiles[$version][] = $file;
+		}
+
+		return $logFiles;
+	}
+
+	/**
+	 * Method to rotate (increase version) of a log file
+	 *
+	 * @param   string  $path            Path to file to rotate
+	 * @param   string  $filename        Name of file to rotate
+	 * @param   int     $currentVersion  The current version number
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	private function rotate($path, $filename, $currentVersion)
+	{
+		if ($currentVersion === 0)
+		{
+			$rotatedFile = $path . '/1.' . $filename;
+		}
+		else
+		{
+			/*
+			 * Rotated log file has this filename format [VERSION].[FILENAME].php. To rotate it, we just need to explode
+			 * the filename into an array, increase value of first element (keep version) and implode it back to get the
+			 * rotated file name
+			 */
+			$parts    = explode('.', $filename);
+			$parts[0] = $currentVersion + 1;
+
+			$rotatedFile = $path . '/' . implode('.', $parts);
+		}
+
+		File::move($path . '/' . $filename, $rotatedFile);
+	}
+
+	/**
+	 * Clears cache groups. We use it to clear the plugins cache after we update the last run timestamp.
+	 *
+	 * @param   array  $clearGroups   The cache groups to clean
+	 * @param   array  $cacheClients  The cache clients (site, admin) to clean
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	private function clearCacheGroups(array $clearGroups, array $cacheClients = array(0, 1))
+	{
+		$conf = JFactory::getConfig();
+
+		foreach ($clearGroups as $group)
+		{
+			foreach ($cacheClients as $client_id)
+			{
+				try
+				{
+					$options = array(
+						'defaultgroup' => $group,
+						'cachebase'    => $client_id ? JPATH_ADMINISTRATOR . '/cache' :
+							$conf->get('cache_path', JPATH_SITE . '/cache')
+					);
+
+					$cache = JCache::getInstance('callback', $options);
+					$cache->clean();
+				}
+				catch (Exception $e)
+				{
+					// Ignore it
+				}
+			}
+		}
+	}
+}
diff --git a/plugins/system/logrotation/logrotation.xml b/plugins/system/logrotation/logrotation.xml
new file mode 100644
index 0000000000000..6b826a8d800f7
--- /dev/null
+++ b/plugins/system/logrotation/logrotation.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.9" type="plugin" group="system" method="upgrade">
+	<name>plg_system_logrotation</name>
+	<author>Joomla! Project</author>
+	<creationDate>May 2018</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>PLG_SYSTEM_LOGROTATION_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="logrotation">logrotation.php</filename>
+	</files>
+	<languages folder="language">
+		<language tag="en-GB">en-GB.plg_system_logrotation.ini</language>
+		<language tag="en-GB">en-GB.plg_system_logrotation.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="cachetimeout"
+					type="integer"
+					label="PLG_SYSTEM_LOGROTATION_CACHETIMEOUT_LABEL"
+					description="PLG_SYSTEM_LOGROTATION_CACHETIMEOUT_DESC"
+					first="0"
+					last="120"
+					step="1"
+					default="30"
+					filter="int"
+					validate="number"
+				/>
+
+				<field
+					name="logstokeep"
+					type="integer"
+					label="PLG_SYSTEM_LOGROTATION_LOGSTOKEEP_LABEL"
+					description="PLG_SYSTEM_LOGROTATION_LOGSTOKEEP_DESC"
+					first="1"
+					last="10"
+					step="1"
+					default="1"
+					filter="int"
+					validate="number"
+				/>
+
+				<field
+					name="lastrun"
+					type="hidden"
+					default="0"
+					filter="integer"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/plugins/system/privacyconsent/field/privacy.php b/plugins/system/privacyconsent/field/privacy.php
new file mode 100644
index 0000000000000..f9fe6391664cf
--- /dev/null
+++ b/plugins/system/privacyconsent/field/privacy.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.privacyconsent
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+
+JFormHelper::loadFieldClass('radio');
+
+/**
+ * Provides input for privacy
+ *
+ * @since  3.9.0
+ */
+class JFormFieldprivacy extends JFormFieldRadio
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	protected $type = 'privacy';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string   The field input markup.
+	 *
+	 * @since   3.9.0
+	 */
+	protected function getInput()
+	{
+		$privacynote = !empty($this->element['note']) ? $this->element['note'] : Text::_('PLG_SYSTEM_PRIVACYCONSENT_NOTE_FIELD_DEFAULT');
+
+		echo '<div class="alert alert-info">' . $privacynote . '</div>';
+
+		return parent::getInput();
+	}
+
+	/**
+	 * Method to get the field label markup.
+	 *
+	 * @return  string  The field label markup.
+	 *
+	 * @since   3.9.0
+	 */
+	protected function getLabel()
+	{
+		if ($this->hidden)
+		{
+			return '';
+		}
+
+		// Get the label text from the XML element, defaulting to the element name.
+		$text = $this->element['label'] ? (string) $this->element['label'] : (string) $this->element['name'];
+		$text = $this->translateLabel ? Text::_($text) : $text;
+
+		// Set required to true as this field is not displayed at all if not required.
+		$this->required = true;
+
+		JHtml::_('behavior.modal');
+
+		// Build the class for the label.
+		$class = !empty($this->description) ? 'hasPopover' : '';
+		$class = $class . ' required';
+		$class = !empty($this->labelClass) ? $class . ' ' . $this->labelClass : $class;
+
+		// Add the opening label tag and main attributes.
+		$label = '<label id="' . $this->id . '-lbl" for="' . $this->id . '" class="' . $class . '"';
+
+		// If a description is specified, use it to build a tooltip.
+		if (!empty($this->description))
+		{
+			$label .= ' title="' . htmlspecialchars(trim($text, ':'), ENT_COMPAT, 'UTF-8') . '"';
+			$label .= ' data-content="' . htmlspecialchars(
+				$this->translateDescription ? Text::_($this->description) : $this->description,
+				ENT_COMPAT,
+				'UTF-8'
+			) . '"';
+		}
+
+		if (Factory::getLanguage()->isRtl())
+		{
+			$label .= ' data-placement="left"';
+		}
+
+		$privacyArticle = $this->element['article'] > 0 ? (int) $this->element['article'] : 0;
+
+		if ($privacyArticle && Factory::getApplication()->isClient('site'))
+		{
+			JLoader::register('ContentHelperRoute', JPATH_BASE . '/components/com_content/helpers/route.php');
+
+			$attribs          = array();
+			$attribs['class'] = 'modal';
+			$attribs['rel']   = '{handler: \'iframe\', size: {x:800, y:500}}';
+
+			$db    = Factory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName(array('id', 'alias', 'catid', 'language')))
+				->from($db->quoteName('#__content'))
+				->where($db->quoteName('id') . ' = ' . (int) $privacyArticle);
+			$db->setQuery($query);
+			$article = $db->loadObject();
+
+			$slug = $article->alias ? ($article->id . ':' . $article->alias) : $article->id;
+			$url  = ContentHelperRoute::getArticleRoute($slug, $article->catid, $article->language);
+			$link = JHtml::_('link', JRoute::_($url . '&tmpl=component'), $text, $attribs);
+		}
+		else
+		{
+			$link = $text;
+		}
+
+		// Add the label text and closing tag.
+		$label .= '>' . $link . '<span class="star">&#160;*</span></label>';
+
+		return $label;
+	}
+}
diff --git a/plugins/system/privacyconsent/privacyconsent.php b/plugins/system/privacyconsent/privacyconsent.php
new file mode 100644
index 0000000000000..3cbd42b84d601
--- /dev/null
+++ b/plugins/system/privacyconsent/privacyconsent.php
@@ -0,0 +1,744 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.privacyconsent
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * An example custom privacyconsent plugin.
+ *
+ * @since  3.9.0
+ */
+class PlgSystemPrivacyconsent extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.9.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Application object.
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.9.0
+	 */
+	protected $app;
+
+	/**
+	 * Database object.
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.9.0
+	 */
+	protected $db;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   object  &$subject  The object to observe
+	 * @param   array   $config    An array that holds the plugin configuration
+	 *
+	 * @since   3.9.0
+	 */
+	public function __construct(&$subject, $config)
+	{
+		parent::__construct($subject, $config);
+
+		JFormHelper::addFieldPath(__DIR__ . '/field');
+	}
+
+	/**
+	 * Adds additional fields to the user editing form
+	 *
+	 * @param   JForm  $form  The form to be altered.
+	 * @param   mixed  $data  The associated data for the form.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function onContentPrepareForm($form, $data)
+	{
+		if (!($form instanceof JForm))
+		{
+			$this->_subject->setError('JERROR_NOT_A_FORM');
+
+			return false;
+		}
+
+		// Check we are manipulating a valid form - we only display this on user registration form and user profile form.
+		$name = $form->getName();
+
+		if (!in_array($name, array('com_users.profile', 'com_users.registration')))
+		{
+			return true;
+		}
+
+		// We only display this if user has not consented before
+		if (is_object($data))
+		{
+			$userId = isset($data->id) ? $data->id : 0;
+
+			if ($userId > 0 && $this->isUserConsented($userId))
+			{
+				return true;
+			}
+		}
+
+		// Add the privacy policy fields to the form.
+		JForm::addFormPath(__DIR__ . '/privacyconsent');
+		$form->loadFile('privacyconsent');
+
+		$privacyArticleId = $this->getPrivacyArticleId();
+		$privacynote      = $this->params->get('privacy_note');
+
+		// Push the privacy article ID into the privacy field.
+		$form->setFieldAttribute('privacy', 'article', $privacyArticleId, 'privacyconsent');
+		$form->setFieldAttribute('privacy', 'note', $privacynote, 'privacyconsent');
+	}
+
+	/**
+	 * Method is called before user data is stored in the database
+	 *
+	 * @param   array    $user   Holds the old user data.
+	 * @param   boolean  $isNew  True if a new user is stored.
+	 * @param   array    $data   Holds the new user data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 * @throws  InvalidArgumentException on missing required data.
+	 */
+	public function onUserBeforeSave($user, $isNew, $data)
+	{
+		// // Only check for front-end user creation/update profile
+		if ($this->app->isClient('administrator'))
+		{
+			return true;
+		}
+
+		$userId = ArrayHelper::getValue($user, 'id', 0, 'int');
+
+		// User already consented before, no need to check it further
+		if ($userId > 0 && $this->isUserConsented($userId))
+		{
+			return true;
+		}
+
+		// Check that the privacy is checked if required ie only in registration from frontend.
+		$option = $this->app->input->getCmd('option');
+		$task   = $this->app->input->get->getCmd('task');
+		$form   = $this->app->input->post->get('jform', array(), 'array');
+
+		if ($option == 'com_users' && in_array($task, array('registration.register', 'profile.save'))
+			&& empty($form['privacyconsent']['privacy']))
+		{
+			throw new InvalidArgumentException(Text::_('PLG_SYSTEM_PRIVACYCONSENT_FIELD_ERROR'));
+		}
+
+		return true;
+	}
+
+	/**
+	 * Saves user privacy confirmation
+	 *
+	 * @param   array    $data    entered user data
+	 * @param   boolean  $isNew   true if this is a new user
+	 * @param   boolean  $result  true if saving the user worked
+	 * @param   string   $error   error message
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function onUserAfterSave($data, $isNew, $result, $error)
+	{
+		// Only create an entry on front-end user creation/update profile
+		if ($this->app->isClient('administrator'))
+		{
+			return true;
+		}
+
+		// Get the user's ID
+		$userId = ArrayHelper::getValue($data, 'id', 0, 'int');
+
+		// If user already consented before, no need to check it further
+		if ($userId > 0 && $this->isUserConsented($userId))
+		{
+			return true;
+		}
+
+		$option = $this->app->input->getCmd('option');
+		$task   = $this->app->input->get->getCmd('task');
+		$form   = $this->app->input->post->get('jform', array(), 'array');
+
+		if ($option == 'com_users'
+			&&in_array($task, array('registration.register', 'profile.save'))
+			&& !empty($form['privacyconsent']['privacy']))
+		{
+			$userId = ArrayHelper::getValue($data, 'id', 0, 'int');
+
+			// Get the user's IP address
+			$ip = $this->app->input->server->get('REMOTE_ADDR', '', 'string');
+
+			// Get the user agent string
+			$userAgent = $this->app->input->server->get('HTTP_USER_AGENT', '', 'string');
+
+			// Create the user note
+			$userNote = (object) array(
+				'user_id' => $userId,
+				'subject' => 'PLG_SYSTEM_PRIVACYCONSENT_SUBJECT',
+				'body'    => Text::sprintf('PLG_SYSTEM_PRIVACYCONSENT_BODY', $ip, $userAgent),
+				'created' => Factory::getDate()->toSql(),
+			);
+
+			try
+			{
+				$this->db->insertObject('#__privacy_consents', $userNote);
+			}
+			catch (Exception $e)
+			{
+				// Do nothing if the save fails
+			}
+
+			$userId = ArrayHelper::getValue($data, 'id', 0, 'int');
+
+			$message = array(
+				'action'      => 'consent',
+				'id'          => $userId,
+				'title'       => $data['name'],
+				'itemlink'    => 'index.php?option=com_users&task=user.edit&id=' . $userId,
+				'userid'      => $userId,
+				'username'    => $data['username'],
+				'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $userId,
+			);
+
+			JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_actionlogs/models', 'ActionlogsModel');
+
+			/* @var ActionlogsModelActionlog $model */
+			$model = JModelLegacy::getInstance('Actionlog', 'ActionlogsModel');
+			$model->addLog(array($message), 'PLG_SYSTEM_PRIVACYCONSENT_CONSENT', 'plg_system_privacyconsent', $userId);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Remove all user privacy consent information for the given user ID
+	 *
+	 * Method is called after user data is deleted from the database
+	 *
+	 * @param   array    $user     Holds the user data
+	 * @param   boolean  $success  True if user was succesfully stored in the database
+	 * @param   string   $msg      Message
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function onUserAfterDelete($user, $success, $msg)
+	{
+		if (!$success)
+		{
+			return false;
+		}
+
+		$userId = ArrayHelper::getValue($user, 'id', 0, 'int');
+
+		if ($userId)
+		{
+			// Remove user's consent
+			try
+			{
+				$query = $this->db->getQuery(true)
+					->delete($this->db->quoteName('#__privacy_consents'))
+					->where($this->db->quoteName('user_id') . ' = ' . (int) $userId);
+				$this->db->setQuery($query);
+				$this->db->execute();
+			}
+			catch (Exception $e)
+			{
+				$this->_subject->setError($e->getMessage());
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * If logged in users haven't agreed to privacy consent, redirect them to profile edit page, ask them to agree to
+	 * privacy consent before allowing access to any other pages
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onAfterRoute()
+	{
+		// Run this in frontend only
+		if ($this->app->isClient('administrator'))
+		{
+			return;
+		}
+
+		$userId = Factory::getUser()->id;
+
+		// Check to see whether user already consented, if not, redirect to user profile page
+		if ($userId > 0)
+		{
+			// If user consented before, no need to check it further
+			if ($this->isUserConsented($userId))
+			{
+				return;
+			}
+
+			$option = $this->app->input->getCmd('option');
+			$task   = $this->app->input->get('task');
+			$view   = $this->app->input->getString('view', '');
+			$layout = $this->app->input->getString('layout', '');
+			$id     = $this->app->input->getInt('id');
+
+			$privacyArticleId = $this->getPrivacyArticleId();
+
+			/*
+			 * If user is already on edit profile screen or view privacy article
+			 * or press update/apply button, or logout, do nothing to avoid infinite redirect
+			 */
+			if ($option == 'com_users' && in_array($task, array('profile.save', 'profile.apply', 'user.logout'))
+				|| ($option == 'com_content' && $view == 'article' && $id == $privacyArticleId)
+				|| ($option == 'com_users' && $view == 'profile' && $layout == 'edit'))
+			{
+				return;
+			}
+
+			// Redirect to com_users profile edit
+			$this->app->enqueueMessage($this->getRedirectMessage(), 'notice');
+			$link = 'index.php?option=com_users&view=profile&layout=edit';
+			$this->app->redirect(\JRoute::_($link, false));
+		}
+	}
+
+	/**
+	 * Event to specify whether a privacy policy has been published.
+	 *
+	 * @param   array  &$policy  The privacy policy status data, passed by reference, with keys "published", "editLink" and "articlePublished".
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onPrivacyCheckPrivacyPolicyPublished(&$policy)
+	{
+		// If another plugin has already indicated a policy is published, we won't change anything here
+		if ($policy['published'])
+		{
+			return;
+		}
+
+		$articleId = $this->params->get('privacy_article');
+
+		if (!$articleId)
+		{
+			return;
+		}
+
+		// Check if the article exists in database and is published
+		$query = $this->db->getQuery(true)
+			->select($this->db->quoteName(array('id', 'state')))
+			->from($this->db->quoteName('#__content'))
+			->where($this->db->quoteName('id') . ' = ' . (int) $articleId);
+		$this->db->setQuery($query);
+
+		$article = $this->db->loadObject();
+
+		// Check if the article exists
+		if (!$article)
+		{
+			return;
+		}
+
+		// Check if the article is published
+		if ($article->state == 1)
+		{
+			$policy['articlePublished'] = true;
+		}
+
+		$policy['published'] = true;
+		$policy['editLink']  = JRoute::_('index.php?option=com_content&task=article.edit&id=' . $articleId);
+	}
+
+	/**
+	 * Returns the configured redirect message and falls back to the default version.
+	 *
+	 * @return  string  redirect message
+	 *
+	 * @since   3.9.0
+	 */
+	private function getRedirectMessage()
+	{
+		$messageOnRedirect = trim($this->params->get('messageOnRedirect', ''));
+
+		if (empty($messageOnRedirect))
+		{
+			return Text::_('PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_DEFAULT');
+		}
+
+		return $messageOnRedirect;
+	}
+
+	/**
+	 * Method to check if the given user has consented yet
+	 *
+	 * @param   integer  $userId  ID of uer to check
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	private function isUserConsented($userId)
+	{
+		$query = $this->db->getQuery(true);
+		$query->select('COUNT(*)')
+			->from('#__privacy_consents')
+			->where('user_id = ' . (int) $userId)
+			->where('subject = ' . $this->db->quote('PLG_SYSTEM_PRIVACYCONSENT_SUBJECT'))
+			->where('state = 1');
+		$this->db->setQuery($query);
+
+		return (int) $this->db->loadResult() > 0;
+	}
+
+	/**
+	 * Get privacy article ID. If the site is a multilingual website and there is associated article for the
+	 * current language, ID of the associlated article will be returned
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.9.0
+	 */
+	private function getPrivacyArticleId()
+	{
+		$privacyArticleId = $this->params->get('privacy_article');
+
+		if ($privacyArticleId > 0 && JLanguageAssociations::isEnabled())
+		{
+			$privacyAssociated = JLanguageAssociations::getAssociations('com_content', '#__content', 'com_content.item', $privacyArticleId);
+			$currentLang = JFactory::getLanguage()->getTag();
+
+			if (isset($privacyAssociated[$currentLang]))
+			{
+				$privacyArticleId = $privacyAssociated[$currentLang]->id;
+			}
+		}
+
+		return $privacyArticleId;
+	}
+
+	/**
+	 * The privacy consent expiration check code is triggered after the page has fully rendered.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.9.0
+	 */
+	public function onAfterRender()
+	{
+		if (!$this->params->get('enabled', 0))
+		{
+			return;
+		}
+
+		$cacheTimeout = (int) $this->params->get('cachetimeout', 30);
+		$cacheTimeout = 24 * 3600 * $cacheTimeout;
+
+		// Do we need to run? Compare the last run timestamp stored in the plugin's options with the current
+		// timestamp. If the difference is greater than the cache timeout we shall not execute again.
+		$now  = time();
+		$last = (int) $this->params->get('lastrun', 0);
+
+		if ((abs($now - $last) < $cacheTimeout))
+		{
+			return;
+		}
+
+		// Update last run status
+		$this->params->set('lastrun', $now);
+		$db    = $this->db;
+		$query = $db->getQuery(true)
+			->update($db->quoteName('#__extensions'))
+			->set($db->quoteName('params') . ' = ' . $db->quote($this->params->toString('JSON')))
+			->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
+			->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
+			->where($db->quoteName('element') . ' = ' . $db->quote('privacyconsent'));
+
+		try
+		{
+			// Lock the tables to prevent multiple plugin executions causing a race condition
+			$db->lockTable('#__extensions');
+		}
+		catch (Exception $e)
+		{
+			// If we can't lock the tables it's too risky to continue execution
+			return;
+		}
+
+		try
+		{
+			// Update the plugin parameters
+			$result = $db->setQuery($query)->execute();
+			$this->clearCacheGroups(array('com_plugins'), array(0, 1));
+		}
+		catch (Exception $exc)
+		{
+			// If we failed to execute
+			$db->unlockTables();
+			$result = false;
+		}
+
+		try
+		{
+			// Unlock the tables after writing
+			$db->unlockTables();
+		}
+		catch (Exception $e)
+		{
+			// If we can't lock the tables assume we have somehow failed
+			$result = false;
+		}
+
+		// Abort on failure
+		if (!$result)
+		{
+			return;
+		}
+
+		// Delete the expired privacy consents
+		$this->invalidateExpiredConsents();
+
+		// Remind for privacy consents near to expire
+		$this->remindExpiringConsents();
+
+	}
+
+	/**
+	 * Method to send the remind for privacy consents renew
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.9.0
+	 */
+	private function remindExpiringConsents()
+	{
+		// Load the parameters.
+		$expire = (int) $this->params->get('consentexpiration', 365);
+		$remind = (int) $this->params->get('remind', 30);
+		$now    = JFactory::getDate()->toSql();
+		$period = '-' . ($expire - $remind);
+
+		$db    = $this->db;
+		$query = $db->getQuery(true)
+			->select($db->quoteName(array('r.id', 'r.user_id', 'u.email')))
+			->from($db->quoteName('#__privacy_consents', 'r'))
+			->leftJoin($db->quoteName('#__users', 'u') . ' ON u.id = r.user_id')
+			->where($db->quoteName('subject') . ' = ' . $db->quote('PLG_SYSTEM_PRIVACYCONSENT_SUBJECT'))
+			->where($db->quoteName('remind') . ' = 0');
+		$query->where($query->dateAdd($db->quote($now), $period, 'DAY') . ' > ' . $db->quoteName('created'));
+
+		try
+		{
+			$users = $db->setQuery($query)->loadObjectList();
+		}
+		catch (JDatabaseException $exception)
+		{
+			return false;
+		}
+
+		$app      = JFactory::getApplication();
+		$linkMode = $app->get('force_ssl', 0) == 2 ? 1 : -1;
+
+		foreach ($users as $user)
+		{
+			$token       = JApplicationHelper::getHash(JUserHelper::genRandomPassword());
+			$hashedToken = JUserHelper::hashPassword($token);
+
+			// The mail
+			try
+			{
+				$substitutions = array(
+					'[SITENAME]' => $app->get('sitename'),
+					'[URL]'      => JUri::root(),
+					'[TOKENURL]' => JRoute::link('site', 'index.php?option=com_privacy&view=remind&remind_token=' . $token, false, $linkMode),
+					'[FORMURL]'  => JRoute::link('site', 'index.php?option=com_privacy&view=remind', false, $linkMode),
+					'[TOKEN]'    => $token,
+					'\\n'        => "\n",
+				);
+
+				$emailSubject = JText::_('PLG_SYSTEM_PRIVACYCONSENT_EMAIL_REMIND_SUBJECT');
+				$emailBody = JText::_('PLG_SYSTEM_PRIVACYCONSENT_EMAIL_REMIND_BODY');
+
+				foreach ($substitutions as $k => $v)
+				{
+					$emailSubject = str_replace($k, $v, $emailSubject);
+					$emailBody    = str_replace($k, $v, $emailBody);
+				}
+
+				$mailer = JFactory::getMailer();
+				$mailer->setSubject($emailSubject);
+				$mailer->setBody($emailBody);
+				$mailer->addRecipient($user->email);
+
+				$mailResult = $mailer->Send();
+
+				if ($mailResult instanceof JException)
+				{
+					return false;
+				}
+				elseif ($mailResult === false)
+				{
+					return false;
+				}
+
+				// Update the privacy_consents item to not send the reminder again
+				$query->clear()
+					->update($db->quoteName('#__privacy_consents'))
+					->set($db->quoteName('remind') . ' = 1 ')
+					->set($db->quoteName('token') . ' = ' . $db->quote($hashedToken))
+					->where($db->quoteName('id') . ' = ' . (int) $user->id);
+				$db->setQuery($query);
+
+				try
+				{
+					$db->execute();
+				}
+				catch (RuntimeException $e)
+				{
+					return false;
+				}
+			}
+			catch (phpmailerException $exception)
+			{
+				return false;
+			}
+		}
+	}
+
+	/**
+	 * Method to delete the expired privacy consents
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	private function invalidateExpiredConsents()
+	{
+		// Load the parameters.
+		$expire = (int) $this->params->get('consentexpiration', 365);
+		$now    = JFactory::getDate()->toSql();
+		$period = '-' . $expire;
+
+		$db    = $this->db;
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('id', 'user_id')))
+			->from($db->quoteName('#__privacy_consents'))
+			->where($query->dateAdd($db->quote($now), $period, 'DAY') . ' > ' . $db->quoteName('created'))
+			->where($db->quoteName('subject') . ' = ' . $db->quote('PLG_SYSTEM_PRIVACYCONSENT_SUBJECT'))
+			->where($db->quoteName('state') . ' = 1');
+		$db->setQuery($query);
+
+		try
+		{
+			$users = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			return false;
+		}
+
+		// Do not process further if no expired consents found
+		if (empty($users))
+		{
+			return true;
+		}
+
+		// Push a notification to the site's super users
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_messages/models', 'MessagesModel');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_messages/tables');
+		/** @var MessagesModelMessage $messageModel */
+		$messageModel = JModelLegacy::getInstance('Message', 'MessagesModel');
+
+		foreach ($users as $user)
+		{
+			$query = $db->getQuery(true)
+				->update($db->quoteName('#__privacy_consents'))
+				->set('state = 0')
+				->where($db->quoteName('id') . ' = ' . (int) $user->id);
+			$db->setQuery($query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				return false;
+			}
+
+			$messageModel->notifySuperUsers(
+				JText::_('PLG_SYSTEM_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_SUBJECT'),
+				JText::sprintf('PLG_SYSTEM_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_MESSAGE', $user->user_id)
+			);
+		}
+
+		return true;
+	}
+	/**
+	 * Clears cache groups. We use it to clear the plugins cache after we update the last run timestamp.
+	 *
+	 * @param   array  $clearGroups   The cache groups to clean
+	 * @param   array  $cacheClients  The cache clients (site, admin) to clean
+	 *
+	 * @return  void
+	 *
+	 * @since    3.9.0
+	 */
+	private function clearCacheGroups(array $clearGroups, array $cacheClients = array(0, 1))
+	{
+		$conf = JFactory::getConfig();
+
+		foreach ($clearGroups as $group)
+		{
+			foreach ($cacheClients as $client_id)
+			{
+				try
+				{
+					$options = array(
+						'defaultgroup' => $group,
+						'cachebase'    => $client_id ? JPATH_ADMINISTRATOR . '/cache' :
+							$conf->get('cache_path', JPATH_SITE . '/cache')
+					);
+
+					$cache = JCache::getInstance('callback', $options);
+					$cache->clean();
+				}
+				catch (Exception $e)
+				{
+					// Ignore it
+				}
+			}
+		}
+	}
+}
diff --git a/plugins/system/privacyconsent/privacyconsent.xml b/plugins/system/privacyconsent/privacyconsent.xml
new file mode 100644
index 0000000000000..f995ddc8686b2
--- /dev/null
+++ b/plugins/system/privacyconsent/privacyconsent.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.9" type="plugin" group="user" method="upgrade">
+	<name>plg_system_privacyconsent</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2018</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>PLG_SYSTEM_PRIVACYCONSENT_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="privacyconsent">privacyconsent.php</filename>
+		<folder>privacyconsent</folder>
+		<folder>field</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_system_privacyconsent.ini</language>
+		<language tag="en-GB">en-GB.plg_system_privacyconsent.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic" addfieldpath="/administrator/components/com_content/models/fields">
+				<field
+					name="privacy_note"
+					type="textarea"
+					label="PLG_SYSTEM_PRIVACYCONSENT_NOTE_FIELD_LABEL"
+					description="PLG_SYSTEM_PRIVACYCONSENT_NOTE_FIELD_DESC"
+					hint="PLG_SYSTEM_PRIVACYCONSENT_NOTE_FIELD_DEFAULT"
+					class="span12"
+					rows="7"
+					cols="20"
+					filter="html"
+				/>
+				<field
+					name="privacy_article"
+					type="modal_article"
+					label="PLG_SYSTEM_PRIVACYCONSENT_FIELD_ARTICLE_LABEL"
+					description="PLG_SYSTEM_PRIVACYCONSENT_FIELD_ARTICLE_DESC"
+					select="true"
+					new="true"
+					edit="true"
+					clear="true"
+					filter="integer"
+				/>
+				<field
+					name="messageOnRedirect"
+					type="textarea"
+					label="PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_LABEL"
+					description="PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_DESC"
+					hint="PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_DEFAULT"
+					class="span12"
+					rows="7"
+					cols="20"
+					filter="html"
+				/>
+			</fieldset>
+			<fieldset
+				name="expiration"
+				label="PLG_SYSTEM_PRIVACYCONSENT_EXPIRATION_FIELDSET_LABEL"
+			>
+				<field
+					name="enabled"
+					type="radio"
+					label="PLG_SYSTEM_PRIVACYCONSENT_FIELD_ENABLED_LABEL"
+					description="PLG_SYSTEM_PRIVACYCONSENT_FIELD_ENABLED_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+				<field
+					name="cachetimeout"
+					type="integer"
+					label="PLG_SYSTEM_PRIVACYCONSENT_CACHETIMEOUT_LABEL"
+					description="PLG_SYSTEM_PRIVACYCONSENT_CACHETIMEOUT_DESC"
+					first="0"
+					last="120"
+					step="1"
+					default="30"
+					filter="int"
+					validate="number"
+				/>
+				<field
+					name="consentexpiration"
+					type="integer"
+					label="PLG_SYSTEM_PRIVACYCONSENT_CONSENTEXPIRATION_LABEL"
+					description="PLG_SYSTEM_PRIVACYCONSENT_CONSENTEXPIRATION_DESC"
+					first="180"
+					last="720"
+					step="30"
+					default="360"
+					filter="int"
+					validate="number"
+				/>
+				<field
+					name="remind"
+					type="integer"
+					label="PLG_SYSTEM_PRIVACYCONSENT_REMINDBEFORE_LABEL"
+					description="PLG_SYSTEM_PRIVACYCONSENT_REMINDBEFORE_DESC"
+					first="0"
+					last="120"
+					step="1"
+					default="30"
+					filter="int"
+					validate="number"
+				/>
+				<field
+					name="lastrun"
+					type="hidden"
+					default="0"
+					filter="integer"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/plugins/system/privacyconsent/privacyconsent/privacyconsent.xml b/plugins/system/privacyconsent/privacyconsent/privacyconsent.xml
new file mode 100644
index 0000000000000..b1da176e5e121
--- /dev/null
+++ b/plugins/system/privacyconsent/privacyconsent/privacyconsent.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="privacyconsent">
+		<fieldset
+			name="privacyconsent"
+			label="PLG_SYSTEM_PRIVACYCONSENT_LABEL"
+		>
+			<field
+				name="privacy"
+				type="privacy"
+				label="PLG_SYSTEM_PRIVACYCONSENT_FIELD_LABEL"
+				description="PLG_SYSTEM_PRIVACYCONSENT_FIELD_DESC"
+				default="0"
+				filter="integer"
+				required="true"
+				>
+				<option value="1">PLG_SYSTEM_PRIVACYCONSENT_OPTION_AGREE</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/system/redirect/redirect.php b/plugins/system/redirect/redirect.php
index 6723e1a6c1ac2..f430028881cf9 100644
--- a/plugins/system/redirect/redirect.php
+++ b/plugins/system/redirect/redirect.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.redirect
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/redirect/redirect.xml b/plugins/system/redirect/redirect.xml
index 1168a8cca11f7..107f4ba59c27a 100644
--- a/plugins/system/redirect/redirect.xml
+++ b/plugins/system/redirect/redirect.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_redirect</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2009</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/remember/remember.php b/plugins/system/remember/remember.php
index f3b0126d8cc52..ebfb6c9f8a2ca 100644
--- a/plugins/system/remember/remember.php
+++ b/plugins/system/remember/remember.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.remember
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/remember/remember.xml b/plugins/system/remember/remember.xml
index f43aead4bb509..c8ba705dec609 100644
--- a/plugins/system/remember/remember.xml
+++ b/plugins/system/remember/remember.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_remember</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2007</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/sef/sef.php b/plugins/system/sef/sef.php
index 7240149be4f5d..f16531be73291 100644
--- a/plugins/system/sef/sef.php
+++ b/plugins/system/sef/sef.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.sef
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/sef/sef.xml b/plugins/system/sef/sef.xml
index be0f436819800..2b064708de2e2 100644
--- a/plugins/system/sef/sef.xml
+++ b/plugins/system/sef/sef.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_sef</name>
 	<author>Joomla! Project</author>
 	<creationDate>December 2007</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/sessiongc/sessiongc.php b/plugins/system/sessiongc/sessiongc.php
index 6ce4f15d9076f..a35d8b81917ea 100644
--- a/plugins/system/sessiongc/sessiongc.php
+++ b/plugins/system/sessiongc/sessiongc.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.sessiongc
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/sessiongc/sessiongc.xml b/plugins/system/sessiongc/sessiongc.xml
index ac4df63a93b45..ed33c91b2a30d 100644
--- a/plugins/system/sessiongc/sessiongc.xml
+++ b/plugins/system/sessiongc/sessiongc.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_sessiongc</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2018</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/skipto/skipto.php b/plugins/system/skipto/skipto.php
new file mode 100644
index 0000000000000..601c49e34b793
--- /dev/null
+++ b/plugins/system/skipto/skipto.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.skipto
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Plugin\CMSPlugin;
+
+/**
+ * Skipto plugin to add accessible keyboard navigation to the site and administrator templates.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class PlgSystemSkipto extends CMSPlugin
+{
+	/**
+	 * If true, language files will be loaded automatically.
+	 *
+	 * @var    boolean
+	 * @since  4.0.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Application object.
+	 *
+	 * @var    JApplicationCms
+	 * @since  4.0.0
+	 */
+	protected $app;
+
+	/**
+	 * Add the css and javascript for the skipto navigation menu.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function onBeforeCompileHead()
+	{
+		$section         = (int) $this->params->get('section_skipto', 2);
+		$current_section = 0;
+
+		try
+		{
+			$app = $this->app;
+
+			if ($this->app->isClient('administrator'))
+			{
+				$current_section = 2;
+			}
+			elseif ($this->app->isClient('site'))
+			{
+				$current_section = 1;
+			}
+		}
+		catch (Exception $exc)
+		{
+			$current_section = 0;
+		}
+
+		if (!($current_section && $section))
+		{
+			return;
+		}
+
+		// TODO remove this line when bug is fixed
+		$this->loadLanguage();
+
+		// Get the document object.
+		$document = $this->app->getDocument();
+
+		// Add strings for translations in Javascript.
+		$document->addScriptOptions(
+			'skipto-settings',
+				[
+					'settings' => [
+						'skipTo' => [
+							'buttonDivRole'		=> 'navigation',
+							'buttonDivLabel'	=> Text::_('PLG_SYSTEM_SKIPTO_SKIP_TO_KEYBOARD'),
+							'buttonLabel'		=> Text::_('PLG_SYSTEM_SKIPTO_SKIP_TO'),
+							'buttonDivTitle' 	=> '',
+							'menuLabel'		=> Text::_('PLG_SYSTEM_SKIPTO_SKIP_TO_AND_PAGE_OUTLINE'),
+							'landmarksLabel'	=> Text::_('PLG_SYSTEM_SKIPTO_SKIP_TO'),
+							'headingsLabel'		=> Text::_('PLG_SYSTEM_SKIPTO_PAGE_OUTLINE'),
+							'contentLabel'		=> Text::_('PLG_SYSTEM_SKIPTO_CONTENT'),
+						]
+					]
+				]
+		);
+
+		HTMLHelper::_('script', 'vendor/skipto/dropMenu.js', ['version' => 'auto', 'relative' => true], ['defer' => true]);
+		HTMLHelper::_('script', 'vendor/skipto/skipTo.js', ['version' => 'auto', 'relative' => true], ['defer' => true]);
+		HTMLHelper::_('stylesheet', 'vendor/skipto/SkipTo.css', ['version' => 'auto', 'relative' => true]);
+
+		$document->addScriptDeclaration("document.addEventListener('DOMContentLoaded', function() {
+			window.SkipToConfig = Joomla.getOptions('skipto-settings');
+			window.skipToMenuInit();
+		});");
+	}
+}
diff --git a/plugins/system/skipto/skipto.xml b/plugins/system/skipto/skipto.xml
new file mode 100644
index 0000000000000..261dd395609bd
--- /dev/null
+++ b/plugins/system/skipto/skipto.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="4.0" type="plugin" group="system" method="upgrade">
+	<name>plg_system_skipto</name>
+	<author>Joomla! Project</author>
+	<creationDate>2019-2-27</creationDate>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>4.0.0</version>
+	<description>PLG_SYSTEM_SKIPTO_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="skipto">skipto.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.plg_system_skipto.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.plg_system_skipto.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="section_skipto"
+					type="list"
+					label="PLG_SYSTEM_SKIPTO_SECTION"
+					default="2"
+					filter="integer"
+					>
+					<option value="1">PLG_SYSTEM_SKIPTO_SECTION_SITE</option>
+					<option value="2">PLG_SYSTEM_SKIPTO_SECTION_ADMIN</option>
+					<option value="3">PLG_SYSTEM_SKIPTO_SECTION_BOTH</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
\ No newline at end of file
diff --git a/plugins/system/stats/Field/AbstractStatsField.php b/plugins/system/stats/Field/AbstractStatsField.php
index 3ed04ea384478..a948760f9309d 100644
--- a/plugins/system/stats/Field/AbstractStatsField.php
+++ b/plugins/system/stats/Field/AbstractStatsField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.stats
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/stats/Field/DataField.php b/plugins/system/stats/Field/DataField.php
index d2b8ea7f31ad3..1540558541300 100644
--- a/plugins/system/stats/Field/DataField.php
+++ b/plugins/system/stats/Field/DataField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.stats
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/stats/Field/UniqueidField.php b/plugins/system/stats/Field/UniqueidField.php
index 52b7e63990928..c8910c5c8cb9d 100644
--- a/plugins/system/stats/Field/UniqueidField.php
+++ b/plugins/system/stats/Field/UniqueidField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.stats
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/stats/layouts/field/data.php b/plugins/system/stats/layouts/field/data.php
index a6451724656be..5fb85c0439b06 100644
--- a/plugins/system/stats/layouts/field/data.php
+++ b/plugins/system/stats/layouts/field/data.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.stats
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/stats/layouts/field/uniqueid.php b/plugins/system/stats/layouts/field/uniqueid.php
index d48a7fd72288a..c12cf621830af 100644
--- a/plugins/system/stats/layouts/field/uniqueid.php
+++ b/plugins/system/stats/layouts/field/uniqueid.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.stats
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/stats/layouts/message.php b/plugins/system/stats/layouts/message.php
index 7f71ed0a04e9f..268c2b9227c91 100644
--- a/plugins/system/stats/layouts/message.php
+++ b/plugins/system/stats/layouts/message.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.stats
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/stats/layouts/stats.php b/plugins/system/stats/layouts/stats.php
index a7f9751b849ba..3c9de9f3ea59e 100644
--- a/plugins/system/stats/layouts/stats.php
+++ b/plugins/system/stats/layouts/stats.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.stats
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/stats/stats.php b/plugins/system/stats/stats.php
index cd8c34c8cb8e9..16b8e2aad7c3f 100644
--- a/plugins/system/stats/stats.php
+++ b/plugins/system/stats/stats.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.stats
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -106,6 +106,36 @@ public function onAfterInitialise()
 
 		// Load plugin language files only when needed (ex: they are not needed in site client).
 		$this->loadLanguage();
+	}
+
+	/**
+	 * Listener for the `onAfterDispatch` event
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function onAfterDispatch()
+	{
+		if (!$this->app->isClient('administrator') || !$this->isAllowedUser())
+		{
+			return;
+		}
+
+		if (!$this->isDebugEnabled() && !$this->isUpdateRequired())
+		{
+			return;
+		}
+
+		if (Uri::getInstance()->getVar('tmpl') === 'component')
+		{
+			return;
+		}
+
+		if ($this->app->getDocument()->getType() !== 'html')
+		{
+			return;
+		}
 
 		HTMLHelper::_('script', 'plg_system_stats/stats-message.js', array('version' => 'auto', 'relative' => true));
 	}
@@ -450,11 +480,11 @@ private function saveParams()
 		$this->params->set('interval', $interval ?: 12);
 
 		$query = $this->db->getQuery(true)
-				->update($this->db->quoteName('#__extensions'))
-				->set($this->db->quoteName('params') . ' = ' . $this->db->quote($this->params->toString('JSON')))
-				->where($this->db->quoteName('type') . ' = ' . $this->db->quote('plugin'))
-				->where($this->db->quoteName('folder') . ' = ' . $this->db->quote('system'))
-				->where($this->db->quoteName('element') . ' = ' . $this->db->quote('stats'));
+			->update($this->db->quoteName('#__extensions'))
+			->set($this->db->quoteName('params') . ' = ' . $this->db->quote($this->params->toString('JSON')))
+			->where($this->db->quoteName('type') . ' = ' . $this->db->quote('plugin'))
+			->where($this->db->quoteName('folder') . ' = ' . $this->db->quote('system'))
+			->where($this->db->quoteName('element') . ' = ' . $this->db->quote('stats'));
 
 		try
 		{
diff --git a/plugins/system/stats/stats.xml b/plugins/system/stats/stats.xml
index f16356b0734e8..26b05202468ab 100644
--- a/plugins/system/stats/stats.xml
+++ b/plugins/system/stats/stats.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_stats</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2013</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/updatenotification/postinstall/updatecachetime.php b/plugins/system/updatenotification/postinstall/updatecachetime.php
index 3dab71c928989..4b290a3cd681e 100644
--- a/plugins/system/updatenotification/postinstall/updatecachetime.php
+++ b/plugins/system/updatenotification/postinstall/updatecachetime.php
@@ -3,10 +3,12 @@
  * @package     Joomla.Plugin
  * @subpackage  System.updatenotification
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+use Joomla\CMS\Factory;
+
 /**
  * Checks if the com_installer config for the cache Hours are eq 0 and the updatenotification Plugin is enabled
  *
@@ -50,6 +52,6 @@ function updatecachetime_postinstall_action()
 	if (!$table->store())
 	{
 		// If there is an error show it to the admin
-		JFactory::getApplication()->enqueueMessage($table->getError(), 'error');
+		Factory::getApplication()->enqueueMessage($table->getError(), 'error');
 	}
 }
diff --git a/plugins/system/updatenotification/updatenotification.php b/plugins/system/updatenotification/updatenotification.php
index 65a025996673d..82e711b2eebf4 100644
--- a/plugins/system/updatenotification/updatenotification.php
+++ b/plugins/system/updatenotification/updatenotification.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.updatenotification
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/system/updatenotification/updatenotification.xml b/plugins/system/updatenotification/updatenotification.xml
index fc9e17a011239..8b83ad0a507fd 100644
--- a/plugins/system/updatenotification/updatenotification.xml
+++ b/plugins/system/updatenotification/updatenotification.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_updatenotification</name>
 	<author>Joomla! Project</author>
 	<creationDate>May 2015</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/twofactorauth/totp/postinstall/actions.php b/plugins/twofactorauth/totp/postinstall/actions.php
index a0ecde2685c59..ed265022eecbd 100644
--- a/plugins/twofactorauth/totp/postinstall/actions.php
+++ b/plugins/twofactorauth/totp/postinstall/actions.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Twofactorauth.totp
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
  * This file contains the functions used by the com_postinstall code to deliver
@@ -11,6 +11,8 @@
  * two-factor authentication code.
  */
 
+use Joomla\CMS\Factory;
+
 /**
  * Checks if the plugin is enabled. If not it returns true, meaning that the
  * message concerning two factor authentication should be displayed.
@@ -21,7 +23,7 @@
  */
 function twofactorauth_postinstall_condition()
 {
-	$db = JFactory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+	$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
 
 	$query = $db->getQuery(true)
 		->select('*')
@@ -47,7 +49,7 @@ function twofactorauth_postinstall_condition()
 function twofactorauth_postinstall_action()
 {
 	// Enable the plugin
-	$db = JFactory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+	$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
 
 	$query = $db->getQuery(true)
 		->update($db->quoteName('#__extensions'))
@@ -58,6 +60,6 @@ function twofactorauth_postinstall_action()
 	$db->execute();
 
 	// Redirect the user to their profile editor page
-	$url = 'index.php?option=com_users&task=user.edit&id=' . JFactory::getUser()->id;
-	JFactory::getApplication()->redirect($url);
+	$url = 'index.php?option=com_users&task=user.edit&id=' . Factory::getUser()->id;
+	Factory::getApplication()->redirect($url);
 }
diff --git a/plugins/twofactorauth/totp/tmpl/form.php b/plugins/twofactorauth/totp/tmpl/form.php
index aacea57a0068b..15e4a88d0835d 100644
--- a/plugins/twofactorauth/totp/tmpl/form.php
+++ b/plugins/twofactorauth/totp/tmpl/form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Twofactorauth.totp.tmpl
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/twofactorauth/totp/totp.php b/plugins/twofactorauth/totp/totp.php
index a0878f5d40d7c..1cbc62506b6b9 100644
--- a/plugins/twofactorauth/totp/totp.php
+++ b/plugins/twofactorauth/totp/totp.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Twofactorauth.totp
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/twofactorauth/totp/totp.xml b/plugins/twofactorauth/totp/totp.xml
index 8a66a3bfa8932..f975387636828 100644
--- a/plugins/twofactorauth/totp/totp.xml
+++ b/plugins/twofactorauth/totp/totp.xml
@@ -3,7 +3,7 @@
 	<name>plg_twofactorauth_totp</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2013</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/twofactorauth/yubikey/tmpl/form.php b/plugins/twofactorauth/yubikey/tmpl/form.php
index dca4adc873008..7b4eef7d96b43 100644
--- a/plugins/twofactorauth/yubikey/tmpl/form.php
+++ b/plugins/twofactorauth/yubikey/tmpl/form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Twofactorauth.yubikey.tmpl
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/twofactorauth/yubikey/yubikey.php b/plugins/twofactorauth/yubikey/yubikey.php
index 9ad9e4549a9fc..f6e51056e8092 100644
--- a/plugins/twofactorauth/yubikey/yubikey.php
+++ b/plugins/twofactorauth/yubikey/yubikey.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Twofactorauth.yubikey
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/twofactorauth/yubikey/yubikey.xml b/plugins/twofactorauth/yubikey/yubikey.xml
index 5cfb63d353a85..e6f5f3ce65416 100644
--- a/plugins/twofactorauth/yubikey/yubikey.xml
+++ b/plugins/twofactorauth/yubikey/yubikey.xml
@@ -3,7 +3,7 @@
 	<name>plg_twofactorauth_yubikey</name>
 	<author>Joomla! Project</author>
 	<creationDate>September 2013</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/user/contactcreator/contactcreator.php b/plugins/user/contactcreator/contactcreator.php
index dc9bee68b736c..2a78a1b840826 100644
--- a/plugins/user/contactcreator/contactcreator.php
+++ b/plugins/user/contactcreator/contactcreator.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  User.contactcreator
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/user/contactcreator/contactcreator.xml b/plugins/user/contactcreator/contactcreator.xml
index e3186c9bdf852..7a230532affdf 100644
--- a/plugins/user/contactcreator/contactcreator.xml
+++ b/plugins/user/contactcreator/contactcreator.xml
@@ -3,7 +3,7 @@
 	<name>plg_user_contactcreator</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2009</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/user/joomla/joomla.php b/plugins/user/joomla/joomla.php
index eb22626779048..1fd09e0044a43 100644
--- a/plugins/user/joomla/joomla.php
+++ b/plugins/user/joomla/joomla.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  User.joomla
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/user/joomla/joomla.xml b/plugins/user/joomla/joomla.xml
index d82a632bcda5f..01b57d96130bd 100644
--- a/plugins/user/joomla/joomla.xml
+++ b/plugins/user/joomla/joomla.xml
@@ -3,7 +3,7 @@
 	<name>plg_user_joomla</name>
 	<author>Joomla! Project</author>
 	<creationDate>December 2006</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/user/profile/field/dob.php b/plugins/user/profile/field/dob.php
index 90972790a330c..9a13637ea1b49 100644
--- a/plugins/user/profile/field/dob.php
+++ b/plugins/user/profile/field/dob.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  User.profile
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/user/profile/field/tos.php b/plugins/user/profile/field/tos.php
index 805157e074ae7..18c3fa801e5e9 100644
--- a/plugins/user/profile/field/tos.php
+++ b/plugins/user/profile/field/tos.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  User.profile
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -53,8 +53,6 @@ protected function getLabel()
 		// Set required to true as this field is not displayed at all if not required.
 		$this->required = true;
 
-		HTMLHelper::_('behavior.modal');
-
 		// Build the class for the label.
 		$class = !empty($this->description) ? 'hasPopover' : '';
 		$class = $class . ' required';
@@ -66,18 +64,23 @@ protected function getLabel()
 		// If a description is specified, use it to build a tooltip.
 		if (!empty($this->description))
 		{
-			$label .= ' title="' . htmlspecialchars(trim($text, ':'), ENT_COMPAT, 'UTF-8') . '"';
 			$label .= ' data-content="' . htmlspecialchars(
 				$this->translateDescription ? Text::_($this->description) : $this->description,
 				ENT_COMPAT,
 				'UTF-8'
 			) . '"';
+
+			if (Factory::getLanguage()->isRtl())
+			{
+				$label .= ' data-placement="left"';
+			}
 		}
 
 		$tosArticle = $this->element['article'] > 0 ? (int) $this->element['article'] : 0;
 
 		if ($tosArticle)
 		{
+			HTMLHelper::_('behavior.modal');
 			JLoader::register('ContentHelperRoute', JPATH_BASE . '/components/com_content/helpers/route.php');
 
 			$attribs          = array();
diff --git a/plugins/user/profile/profile.php b/plugins/user/profile/profile.php
index ed29b6fbc73bb..5ba1b7b0feb55 100644
--- a/plugins/user/profile/profile.php
+++ b/plugins/user/profile/profile.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  User.profile
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/user/profile/profile.xml b/plugins/user/profile/profile.xml
index ef5636304eff9..09904c9d9171f 100644
--- a/plugins/user/profile/profile.xml
+++ b/plugins/user/profile/profile.xml
@@ -3,7 +3,7 @@
 	<name>plg_user_profile</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2008</creationDate>
-	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/user/terms/field/terms.php b/plugins/user/terms/field/terms.php
new file mode 100644
index 0000000000000..9ea9fc8435ba6
--- /dev/null
+++ b/plugins/user/terms/field/terms.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  User.terms
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+
+JFormHelper::loadFieldClass('radio');
+
+/**
+ * Provides input for privacyterms
+ *
+ * @since  3.9.0
+ */
+class JFormFieldterms extends JFormFieldRadio
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.9.0
+	 */
+	protected $type = 'terms';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string   The field input markup.
+	 *
+	 * @since   3.9.0
+	 */
+	protected function getInput()
+	{
+		$termsnote = !empty($this->element['note']) ? $this->element['note'] : Text::_('PLG_USER_TERMS_NOTE_FIELD_DEFAULT');
+
+		echo '<div class="alert alert-info">' . $termsnote . '</div>';
+
+		return parent::getInput();
+	}
+
+	/**
+	 * Method to get the field label markup.
+	 *
+	 * @return  string  The field label markup.
+	 *
+	 * @since   3.9.0
+	 */
+	protected function getLabel()
+	{
+		if ($this->hidden)
+		{
+			return '';
+		}
+
+		// Get the label text from the XML element, defaulting to the element name.
+		$text = $this->element['label'] ? (string) $this->element['label'] : (string) $this->element['name'];
+		$text = $this->translateLabel ? Text::_($text) : $text;
+
+		// Set required to true
+		$this->required = true;
+
+		JHtml::_('behavior.modal');
+
+		// Build the class for the label.
+		$class = !empty($this->description) ? 'hasPopover' : '';
+		$class = $class . ' required';
+		$class = !empty($this->labelClass) ? $class . ' ' . $this->labelClass : $class;
+
+		// Add the opening label tag and main attributes.
+		$label = '<label id="' . $this->id . '-lbl" for="' . $this->id . '" class="' . $class . '"';
+
+		// If a description is specified, use it to build a tooltip.
+		if (!empty($this->description))
+		{
+			$label .= ' title="' . htmlspecialchars(trim($text, ':'), ENT_COMPAT, 'UTF-8') . '"';
+			$label .= ' data-content="' . htmlspecialchars(
+				$this->translateDescription ? Text::_($this->description) : $this->description,
+				ENT_COMPAT,
+				'UTF-8'
+			) . '"';
+		}
+
+		if (Factory::getLanguage()->isRtl())
+		{
+			$label .= ' data-placement="left"';
+		}
+
+		$termsArticle = $this->element['article'] > 0 ? (int) $this->element['article'] : 0;
+
+		if ($termsArticle && Factory::getApplication()->isClient('site'))
+		{
+			JLoader::register('ContentHelperRoute', JPATH_BASE . '/components/com_content/helpers/route.php');
+
+			$attribs          = array();
+			$attribs['class'] = 'modal';
+			$attribs['rel']   = '{handler: \'iframe\', size: {x:800, y:500}}';
+
+			$db    = Factory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName(array('id', 'alias', 'catid', 'language')))
+				->from($db->quoteName('#__content'))
+				->where($db->quoteName('id') . ' = ' . (int) $termsArticle);
+			$db->setQuery($query);
+			$article = $db->loadObject();
+
+			if (JLanguageAssociations::isEnabled())
+			{
+				$termsAssociated = JLanguageAssociations::getAssociations('com_content', '#__content', 'com_content.item', $termsArticle);
+			}
+
+			$currentLang = Factory::getLanguage()->getTag();
+
+			if (isset($termsAssociated) && $currentLang !== $article->language && array_key_exists($currentLang, $termsAssociated))
+			{
+				$url  = ContentHelperRoute::getArticleRoute(
+					$termsAssociated[$currentLang]->id,
+					$termsAssociated[$currentLang]->catid,
+					$termsAssociated[$currentLang]->language
+				);
+				$link = JHtml::_('link', JRoute::_($url . '&tmpl=component'), $text, $attribs);
+			}
+			else
+			{
+				$slug = $article->alias ? ($article->id . ':' . $article->alias) : $article->id;
+				$url  = ContentHelperRoute::getArticleRoute($slug, $article->catid, $article->language);
+				$link = JHtml::_('link', JRoute::_($url . '&tmpl=component'), $text, $attribs);
+			}
+		}
+		else
+		{
+			$link = $text;
+		}
+
+		// Add the label text and closing tag.
+		$label .= '>' . $link . '<span class="star">&#160;*</span></label>';
+
+		return $label;
+	}
+}
diff --git a/plugins/user/terms/terms.php b/plugins/user/terms/terms.php
new file mode 100644
index 0000000000000..92fb3448120fa
--- /dev/null
+++ b/plugins/user/terms/terms.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  User.terms
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * An example custom terms and conditions plugin.
+ *
+ * @since  3.9.0
+ */
+class PlgUserTerms extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.9.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Application object.
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.9.0
+	 */
+	protected $app;
+
+	/**
+	 * Database object.
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.9.0
+	 */
+	protected $db;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   object  &$subject  The object to observe
+	 * @param   array   $config    An array that holds the plugin configuration
+	 *
+	 * @since   3.9.0
+	 */
+	public function __construct(&$subject, $config)
+	{
+		parent::__construct($subject, $config);
+
+		JFormHelper::addFieldPath(__DIR__ . '/field');
+	}
+
+	/**
+	 * Adds additional fields to the user registration form
+	 *
+	 * @param   JForm  $form  The form to be altered.
+	 * @param   mixed  $data  The associated data for the form.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function onContentPrepareForm($form, $data)
+	{
+		if (!($form instanceof JForm))
+		{
+			$this->_subject->setError('JERROR_NOT_A_FORM');
+
+			return false;
+		}
+
+		// Check we are manipulating a valid form - we only display this on user registration form.
+		$name = $form->getName();
+
+		if (!in_array($name, array('com_users.registration')))
+		{
+			return true;
+		}
+
+		// Add the terms and conditions fields to the form.
+		JForm::addFormPath(__DIR__ . '/terms');
+		$form->loadFile('terms');
+
+		$termsarticle = $this->params->get('terms_article');
+		$termsnote    = $this->params->get('terms_note');
+
+		// Push the terms and conditions article ID into the terms field.
+		$form->setFieldAttribute('terms', 'article', $termsarticle, 'terms');
+		$form->setFieldAttribute('terms', 'note', $termsnote, 'terms');
+	}
+
+	/**
+	 * Method is called before user data is stored in the database
+	 *
+	 * @param   array    $user   Holds the old user data.
+	 * @param   boolean  $isNew  True if a new user is stored.
+	 * @param   array    $data   Holds the new user data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 * @throws  InvalidArgumentException on missing required data.
+	 */
+	public function onUserBeforeSave($user, $isNew, $data)
+	{
+		// // Only check for front-end user registration
+		if ($this->app->isClient('administrator'))
+		{
+			return true;
+		}
+
+		$userId = ArrayHelper::getValue($user, 'id', 0, 'int');
+
+		// User already registered, no need to check it further
+		if ($userId > 0)
+		{
+			return true;
+		}
+
+		// Check that the terms is checked if required ie only in registration from frontend.
+		$option = $this->app->input->getCmd('option');
+		$task   = $this->app->input->get->getCmd('task');
+		$form   = $this->app->input->post->get('jform', array(), 'array');
+
+		if ($option == 'com_users' && in_array($task, array('registration.register')) && empty($form['terms']['terms']))
+		{
+			throw new InvalidArgumentException(Text::_('PLG_USER_TERMS_FIELD_ERROR'));
+		}
+
+		return true;
+	}
+
+	/**
+	 * Saves user profile data
+	 *
+	 * @param   array    $data    entered user data
+	 * @param   boolean  $isNew   true if this is a new user
+	 * @param   boolean  $result  true if saving the user worked
+	 * @param   string   $error   error message
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.0
+	 */
+	public function onUserAfterSave($data, $isNew, $result, $error)
+	{
+		if (!$isNew || !$result)
+		{
+			return true;
+		}
+
+		JLoader::register('ActionlogsModelActionlog', JPATH_ADMINISTRATOR . '/components/com_actionlogs/models/actionlog.php');
+		$userId = ArrayHelper::getValue($data, 'id', 0, 'int');
+
+		$message = array(
+			'action'      => 'consent',
+			'id'          => $userId,
+			'title'       => $data['name'],
+			'itemlink'    => 'index.php?option=com_users&task=user.edit&id=' . $userId,
+			'userid'      => $userId,
+			'username'    => $data['username'],
+			'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $userId,
+		);
+
+		/* @var ActionlogsModelActionlog $model */
+		$model = JModelLegacy::getInstance('Actionlog', 'ActionlogsModel');
+		$model->addLog(array($message), 'PLG_USER_TERMS_LOGGING_CONSENT_TO_TERMS', 'plg_user_terms', $userId);
+	}
+}
diff --git a/plugins/user/terms/terms.xml b/plugins/user/terms/terms.xml
new file mode 100644
index 0000000000000..f3c8a9286bd03
--- /dev/null
+++ b/plugins/user/terms/terms.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="user" method="upgrade">
+	<name>plg_user_terms</name>
+	<author>Joomla! Project</author>
+	<creationDate>June 2018</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.9.0</version>
+	<description>PLG_USER_TERMS_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="terms">terms.php</filename>
+		<folder>terms</folder>
+		<folder>field</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_user_terms.ini</language>
+		<language tag="en-GB">en-GB.plg_user_terms.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic" addfieldpath="/administrator/components/com_content/models/fields">
+				<field 
+					name="terms_note" 
+					type="textarea" 
+					label="PLG_USER_TERMS_NOTE_FIELD_LABEL"
+					description="PLG_USER_TERMS_NOTE_FIELD_DESC"
+					hint="PLG_USER_TERMS_NOTE_FIELD_DEFAULT"
+					class="span12"
+					rows="7" 
+					cols="20" 
+					filter="html"
+				/>	
+				<field
+					name="terms_article"
+					type="modal_article"
+					label="PLG_USER_TERMS_FIELD_ARTICLE_LABEL"
+					description="PLG_USER_TERMS_FIELD_ARTICLE_DESC"
+					select="true"
+					new="true"
+					edit="true"
+					clear="true"
+					filter="integer"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/plugins/user/terms/terms/terms.xml b/plugins/user/terms/terms/terms.xml
new file mode 100644
index 0000000000000..4a6da336c5147
--- /dev/null
+++ b/plugins/user/terms/terms/terms.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="terms">
+		<fieldset
+			name="terms"
+			label="PLG_USER_TERMS_LABEL"
+		>
+			<field
+				name="terms"
+				type="terms"
+				label="PLG_USER_TERMS_FIELD_LABEL"
+				description="PLG_USER_TERMS_FIELD_DESC"
+				default="0"
+				filter="integer"
+				required="true"
+				>
+				<option value="1">PLG_USER_TERMS_OPTION_AGREE</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/webservices/content/content.php b/plugins/webservices/content/content.php
new file mode 100644
index 0000000000000..963f26c32b0b5
--- /dev/null
+++ b/plugins/webservices/content/content.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.Content
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Router\ApiRouter;
+
+/**
+ * Web Services adapter for com_content.
+ *
+ * @since  4.0.0
+ */
+class PlgWebservicesContent extends CMSPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  4.0.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Registers com_content's API's routes in the application
+	 *
+	 * @param   ApiRouter  &$router  The API Routing object
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function onBeforeApiRoute(&$router)
+	{
+		$router->createCRUDRoutes('v1/article', 'articles', ['component' => 'com_content']);
+	}
+}
diff --git a/plugins/webservices/content/content.xml b/plugins/webservices/content/content.xml
new file mode 100644
index 0000000000000..523b5492e093a
--- /dev/null
+++ b/plugins/webservices/content/content.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="webservices" method="upgrade">
+	<name>plg_webservices_content</name>
+	<author>Joomla! Project</author>
+	<creationDate>August 2017</creationDate>
+	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>4.0.0</version>
+	<description>PLG_WEBSERVICES_CONTENT_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="content">content.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.plg_webservices_content.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.plg_webservices_content.sys.ini</language>
+	</languages>
+</extension>
diff --git a/templates/cassiopeia/component.php b/templates/cassiopeia/component.php
index 6eb8b7937a53f..aca76a2c9e39a 100644
--- a/templates/cassiopeia/component.php
+++ b/templates/cassiopeia/component.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.cassiopeia
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/cassiopeia/error.php b/templates/cassiopeia/error.php
index 3b9251465c797..caf66bcdfd314 100644
--- a/templates/cassiopeia/error.php
+++ b/templates/cassiopeia/error.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.cassiopeia
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -25,7 +25,7 @@
 $layout   = $app->input->getCmd('layout', '');
 $task     = $app->input->getCmd('task', '');
 $itemid   = $app->input->getCmd('Itemid', '');
-$sitename = $app->get('sitename');
+$sitename = htmlspecialchars($app->get('sitename'), ENT_QUOTES, 'UTF-8');
 $menu     = $app->getMenu()->getActive();
 $pageclass = $menu !== null ? $menu->params->get('pageclass_sfx', '') : '';
 
diff --git a/templates/cassiopeia/html/layouts/chromes/cardGrey.php b/templates/cassiopeia/html/layouts/chromes/cardGrey.php
new file mode 100644
index 0000000000000..9c5cfc8af591b
--- /dev/null
+++ b/templates/cassiopeia/html/layouts/chromes/cardGrey.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.cassiopeia
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$module  = $displayData['module'];
+$params  = $displayData['params'];
+$attribs = $displayData['attribs'];
+
+$modulePos   = $module->position;
+$moduleTag   = $params->get('module_tag', 'div');
+$headerTag   = htmlspecialchars($params->get('header_tag', 'h4'));
+$headerClass = htmlspecialchars($params->get('header_class', ''));
+
+if ($module->content) : ?>
+	<<?php echo $moduleTag; ?> class="<?php echo $modulePos; ?> card card-grey <?php echo htmlspecialchars($params->get('moduleclass_sfx')); ?>">
+		<?php if ($module->showtitle and $headerClass !== 'card-title') : ?>
+			<<?php echo $headerTag; ?> class="card-header <?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
+		<?php endif; ?>
+		<div class="card-body">
+			<?php if ($module->showtitle && $headerClass === 'card-title') : ?>
+				<<?php echo $headerTag; ?> class="<?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
+			<?php endif; ?>
+			<?php echo $module->content; ?>
+		</div>
+	</<?php echo $moduleTag; ?>>
+<?php endif; ?>
diff --git a/templates/cassiopeia/html/layouts/chromes/default.php b/templates/cassiopeia/html/layouts/chromes/default.php
new file mode 100644
index 0000000000000..5156cdb62b690
--- /dev/null
+++ b/templates/cassiopeia/html/layouts/chromes/default.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.cassiopeia
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$module  = $displayData['module'];
+$params  = $displayData['params'];
+$attribs = $displayData['attribs'];
+
+$modulePos   = $module->position;
+$moduleTag   = $params->get('module_tag', 'div');
+$headerTag   = htmlspecialchars($params->get('header_tag', 'h4'));
+$headerClass = htmlspecialchars($params->get('header_class', ''));
+
+if ($module->content) : ?>
+	<<?php echo $moduleTag; ?> class="<?php echo $modulePos; ?> card <?php echo htmlspecialchars($params->get('moduleclass_sfx')); ?>">
+		<?php if ($module->showtitle && $headerClass !== 'card-title') : ?>
+			<<?php echo $headerTag; ?> class="card-header<?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
+		<?php endif; ?>
+		<div class="card-body">
+			<?php if ($module->showtitle && $headerClass === 'card-title') : ?>
+				<<?php echo $headerTag; ?> class="<?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
+			<?php endif; ?>
+			<?php echo $module->content; ?>
+		</div>
+	</<?php echo $moduleTag; ?>>
+<?php endif; ?>
diff --git a/templates/cassiopeia/html/modules.php b/templates/cassiopeia/html/modules.php
deleted file mode 100644
index 6c86d3c391cf1..0000000000000
--- a/templates/cassiopeia/html/modules.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * @package     Joomla.Site
- * @subpackage  Templates.cassiopeia
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-/**
- * This is a file to add template specific chrome to module rendering.  To use it you would
- * set the style attribute for the given module(s) include in your template to use the style
- * for each given modChrome function.
- *
- * eg. To render a module mod_test in the submenu style, you would use the following include:
- * <jdoc:include type="module" name="test" style="submenu" />
- *
- * This gives template designers ultimate control over how modules are rendered.
- *
- * NOTICE: All chrome wrapping methods should be named: modChrome_{STYLE} and take the same
- * two arguments.
- */
-
-/*
- * Module chrome for rendering the module in a submenu
- */
-function modChrome_no($module, &$params, &$attribs)
-{
-	if ($module->content)
-	{
-		echo $module->content;
-	}
-}
-
-function modChrome_default($module, &$params, &$attribs)
-{
-	$modulePos	   = $module->position;
-	$moduleTag     = $params->get('module_tag', 'div');
-	$headerTag     = htmlspecialchars($params->get('header_tag', 'h4'));
-	$headerClass   = htmlspecialchars($params->get('header_class', ''));
-
-	if ($module->content)
-	{
-		echo '<' . $moduleTag . ' class="' . $modulePos . ' card ' . htmlspecialchars($params->get('moduleclass_sfx')) . '">';
-		if ($module->showtitle && $headerClass !== 'card-title')
-		{
-			echo '<' . $headerTag . ' class="card-header' . $headerClass . '">' . $module->title . '</' . $headerTag . '>';
-		}
-		echo '<div class="card-body">';
-		if ($module->showtitle && $headerClass === 'card-title')
-		{
-			echo '<' . $headerTag . ' class="' . $headerClass . '">' . $module->title . '</' . $headerTag . '>';
-		}
-		echo $module->content;
-		echo '</div>';
-		echo '</' . $moduleTag . '>';
-	}
-}
-
-function modChrome_cardGrey($module, &$params, &$attribs)
-{
-	$modulePos	   = $module->position;
-	$moduleTag     = $params->get('module_tag', 'div');
-	$headerTag     = htmlspecialchars($params->get('header_tag', 'h4'));
-	$headerClass   = htmlspecialchars($params->get('header_class', ''));
-
-	if ($module->content)
-	{
-		echo '<' . $moduleTag . ' class="' . $modulePos . ' card card-grey ' . htmlspecialchars($params->get('moduleclass_sfx')) . '">';
-		if ($module->showtitle && $headerClass !== 'card-title')
-		{
-			echo '<' . $headerTag . ' class="card-header' . $headerClass . '">' . $module->title . '</' . $headerTag . '>';
-		}
-		echo '<div class="card-body">';
-		if ($module->showtitle && $headerClass === 'card-title')
-		{
-			echo '<' . $headerTag . ' class="' . $headerClass . '">' . $module->title . '</' . $headerTag . '>';
-		}
-		echo $module->content;
-		echo '</div>';
-		echo '</' . $moduleTag . '>';
-	}
-}
diff --git a/templates/cassiopeia/index.php b/templates/cassiopeia/index.php
index 220b079fc9149..e11b9229b9ab8 100644
--- a/templates/cassiopeia/index.php
+++ b/templates/cassiopeia/index.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.cassiopeia
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -26,7 +26,7 @@
 $layout   = $app->input->getCmd('layout', '');
 $task     = $app->input->getCmd('task', '');
 $itemid   = $app->input->getCmd('Itemid', '');
-$sitename = $app->get('sitename');
+$sitename = htmlspecialchars($app->get('sitename'), ENT_QUOTES, 'UTF-8');
 $menu     = $app->getMenu()->getActive();
 $pageclass = $menu->params->get('pageclass_sfx');
 
diff --git a/templates/cassiopeia/js/template.js b/templates/cassiopeia/js/template.js
index 4c23177a957dc..ea029cc8e53f7 100644
--- a/templates/cassiopeia/js/template.js
+++ b/templates/cassiopeia/js/template.js
@@ -1,7 +1,7 @@
 /**
  * @package     Joomla.Site
  * @subpackage  Templates.Cassiopeia
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       4.0
  */
diff --git a/templates/cassiopeia/language/en-GB/en-GB.tpl_cassiopeia.ini b/templates/cassiopeia/language/en-GB/en-GB.tpl_cassiopeia.ini
index 5d93b8a74f68f..6cee59239ea2c 100644
--- a/templates/cassiopeia/language/en-GB/en-GB.tpl_cassiopeia.ini
+++ b/templates/cassiopeia/language/en-GB/en-GB.tpl_cassiopeia.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/templates/cassiopeia/language/en-GB/en-GB.tpl_cassiopeia.sys.ini b/templates/cassiopeia/language/en-GB/en-GB.tpl_cassiopeia.sys.ini
index b5e65b452da2a..2350f71b83671 100644
--- a/templates/cassiopeia/language/en-GB/en-GB.tpl_cassiopeia.sys.ini
+++ b/templates/cassiopeia/language/en-GB/en-GB.tpl_cassiopeia.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/templates/cassiopeia/offline.php b/templates/cassiopeia/offline.php
index 1de1ee9c75c37..ab12df2d5eef5 100644
--- a/templates/cassiopeia/offline.php
+++ b/templates/cassiopeia/offline.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.cassiopeia
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -41,7 +41,7 @@
 HTMLHelper::_('bootstrap.loadCss', false, $this->direction);
 
 // Logo file or site title param
-$sitename = $app->get('sitename');
+$sitename = htmlspecialchars($app->get('sitename'), ENT_QUOTES, 'UTF-8');
 
 if ($this->params->get('logoFile'))
 {
@@ -53,7 +53,7 @@
 }
 else
 {
-	$logo = '<span class="site-title" title="' . $sitename . '">' . $sitename . '</span>';
+	$logo = '<span class="site-title">' . $sitename . '</span>';
 }
 ?>
 <!DOCTYPE html>
@@ -69,10 +69,10 @@
 			<?php if (!empty($logo)) : ?>
 				<h1><?php echo $logo; ?></h1>
 			<?php else : ?>
-				<h1><?php echo htmlspecialchars($app->get('sitename')); ?></h1>
+				<h1><?php echo $sitename; ?></h1>
 			<?php endif; ?>
 			<?php if ($app->get('offline_image') && file_exists($app->get('offline_image'))) : ?>
-				<img src="<?php echo $app->get('offline_image'); ?>" alt="<?php echo htmlspecialchars($app->get('sitename')); ?>">
+				<img src="<?php echo $app->get('offline_image'); ?>" alt="<?php echo $sitename; ?>">
 			<?php endif; ?>
 			<?php if ($app->get('display_offline_message', 1) == 1 && str_replace(' ', '', $app->get('offline_message')) != '') : ?>
 				<p><?php echo $app->get('offline_message'); ?></p>
@@ -96,14 +96,14 @@
 				<form action="<?php echo Route::_('index.php', true); ?>" method="post" id="form-login">
 					<fieldset>
 						<label for="username"><?php echo Text::_('JGLOBAL_USERNAME'); ?></label>
-						<input name="username" class="form-control" id="username" type="text" title="<?php echo Text::_('JGLOBAL_USERNAME'); ?>">
+						<input name="username" class="form-control" id="username" type="text">
 
 						<label for="password"><?php echo Text::_('JGLOBAL_PASSWORD'); ?></label>
-						<input name="password" class="form-control" id="password" type="password" title="<?php echo Text::_('JGLOBAL_PASSWORD'); ?>">
+						<input name="password" class="form-control" id="password" type="password">
 
 						<?php if (count($twofactormethods) > 1) : ?>
 						<label for="secretkey"><?php echo Text::_('JGLOBAL_SECRETKEY'); ?></label>
-						<input name="secretkey" class="form-control" id="secretkey" type="text" title="<?php echo Text::_('JGLOBAL_SECRETKEY'); ?>">
+						<input name="secretkey" class="form-control" id="secretkey" type="text">
 						<?php endif; ?>
 
 						<input type="submit" name="Submit" class="btn btn-primary" value="<?php echo Text::_('JLOGIN'); ?>">
diff --git a/templates/cassiopeia/scss/template.scss b/templates/cassiopeia/scss/template.scss
index ab4f3635955f2..11868c212aa8d 100644
--- a/templates/cassiopeia/scss/template.scss
+++ b/templates/cassiopeia/scss/template.scss
@@ -13,13 +13,13 @@
 @import "../../../media/vendor/font-awesome/scss/font-awesome";
 
 // B/C for Icomoon
-@import "../../../build/media/system/scss/icomoon";
+@import "../../../build/media_source/system/scss/icomoon";
 
 // Alert
-@import "../../../build/media/system/scss/jalert";
+@import "../../../build/media_source/system/scss/jalert";
 
 // jQuery Minicolors
-@import "../../../build/media/system/scss/jquery-minicolors";
+@import "../../../build/media_source/system/scss/jquery-minicolors";
 
 // Blocks
 @import "blocks/global"; // Leave this first
diff --git a/templates/cassiopeia/templateDetails.xml b/templates/cassiopeia/templateDetails.xml
index 743de60483768..e85ea000180cc 100644
--- a/templates/cassiopeia/templateDetails.xml
+++ b/templates/cassiopeia/templateDetails.xml
@@ -5,7 +5,7 @@
 	<creationDate>30/02/2017</creationDate>
 	<author>Charlie Lodder / Ciarán Walsh</author>
 	<authorEmail>admin@joomla.org</authorEmail>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.</copyright>
 	<description>TPL_CASSIOPEIA_XML_DESCRIPTION</description>
 	<files>
 		<filename>component.php</filename>
diff --git a/templates/system/build_incomplete.html b/templates/system/build_incomplete.html
index c116d0595bd35..727bb0d77831a 100644
--- a/templates/system/build_incomplete.html
+++ b/templates/system/build_incomplete.html
@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Joomla: Environment Setup Incomplete</title><!-- Sets the page title, IMPORTANT DO NOT REMOVE -->
   <style>body{margin:0;padding:0;font:14px / 18px sans-serif;color:#555;background-color:transparent}html{background:#f1f1f1;background:-moz-radial-gradient(center,ellipse cover,rgba(241,241,241,1) 0,rgba(58,146,200,1) 100%);background:-webkit-radial-gradient(center,ellipse cover,rgba(241,241,241,1) 0,rgba(58,146,200,1) 100%);background:radial-gradient(ellipse at center,rgba(241,241,241,1) 0,rgba(58,146,200,1) 100%);background-repeat:no-repeat;background-attachment:fixed}ol,ul{padding:0;margin:0;list-style:none}a{color:#0084b4;text-decoration:none;outline:0}a:hover,a:focus{text-decoration:underline}p a{line-height:inherit}.container{display:flex;flex-direction:column;justify-content:center;align-items:center;position:relative;margin:0 auto;width:100%;height:100vh;overflow:hidden}.alert-main{display:block;position:relative;background:#fff;border:1px solid rgba(0,0,0,0.1);border-radius:5px;padding:20px 60px;margin:0 20px;box-shadow:0 0 10px rgba(0,0,0,0.05)}svg{position:absolute;bottom:-120px;right:-70px;width:400px;transform:rotate(10deg);z-index:-1}h1,p{position:relative;z-index:10;text-align:center;text-rendering:optimizeLegibility}h1{margin:18px 0 0;font-size:40px;font-weight:200;line-height:1;text-shadow:0 1px 2px rgba(0,0,0,.2)}p,label{margin:10px 0 20px;font-size:18px;font-weight:300;line-height:25px;color:#777}p a{font-weight:bold;color:#1c3d5c}.link-help{padding:.4rem .85rem;font-size:1rem;font-weight:normal;border-radius:.25rem;text-decoration:none;background-color:#f5f5f5;border:1px solid rgba(0,0,0,0.1)}.link-help:hover{background-color:#eee;text-decoration:none}.footer{margin:8px 20px;text-align:left;font-size:11px}.footer ul{margin-bottom:5px}.footer li{display:inline;margin:0 5px;line-height:20px}.footer li,.footer a{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{display:block;text-align:center;margin-top:4rem;margin-left:auto;margin-right:auto;font-size:1rem}.links li{display:inline-block;margin-top:20px}@media screen and (max-width:480px){.container{height:auto;padding-top:20px;padding-bottom:20px}h1{font-size:30px}.link-help{white-space:nowrap}}</style><!-- Sets the page styling, IMPORTANT DO NOT REMOVE -->
-  <script>window.errorLocale = {"en-US":{"language":"English US","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you complete a couple of extra steps first.","help-url-text":"More Details"},"en-GB":{"language":"English GB","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you complete a couple of extra steps first.","help-url-text":"More Details"},}</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
+  <script>window.errorLocale = {"en-GB":{"language":"English GB","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you complete a couple of extra steps first.","help-url-text":"More Details"},"en-US":{"language":"English US","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you complete a couple of extra steps first.","help-url-text":"More Details"},}</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
 </head>
 <body ><!-- Sets the minimum PHP version, IMPORTANT DO NOT REMOVE -->
 <div class="container">
diff --git a/templates/system/component.php b/templates/system/component.php
index 9e7e976b9023c..402752bd05d42 100644
--- a/templates/system/component.php
+++ b/templates/system/component.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Template.system
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/css/editor.css b/templates/system/css/editor.css
index 5238683a49791..f6518bd3c8087 100644
--- a/templates/system/css/editor.css
+++ b/templates/system/css/editor.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/css/error.css b/templates/system/css/error.css
index 1288fc75f82e9..df74ca28a7728 100644
--- a/templates/system/css/error.css
+++ b/templates/system/css/error.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/css/error_rtl.css b/templates/system/css/error_rtl.css
index ddadcadd74489..6b9df9a2b4d2f 100644
--- a/templates/system/css/error_rtl.css
+++ b/templates/system/css/error_rtl.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/css/general.css b/templates/system/css/general.css
index 2bf4c27d0241a..e837f14d616f1 100644
--- a/templates/system/css/general.css
+++ b/templates/system/css/general.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/css/offline.css b/templates/system/css/offline.css
index 1b17236861a9b..3409355c28d93 100644
--- a/templates/system/css/offline.css
+++ b/templates/system/css/offline.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/css/offline_rtl.css b/templates/system/css/offline_rtl.css
index 75b636e10064e..931ba88eb39a3 100644
--- a/templates/system/css/offline_rtl.css
+++ b/templates/system/css/offline_rtl.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/error.php b/templates/system/error.php
index 66b4f945e8e74..9a1b4e1d93610 100644
--- a/templates/system/error.php
+++ b/templates/system/error.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Template.system
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -55,7 +55,7 @@
 			</ol>
 			<p><strong><?php echo JText::_('JERROR_LAYOUT_PLEASE_TRY_ONE_OF_THE_FOLLOWING_PAGES'); ?></strong></p>
 			<ul>
-				<li><a href="<?php echo JUri::root(true); ?>/index.php" title="<?php echo JText::_('JERROR_LAYOUT_GO_TO_THE_HOME_PAGE'); ?>"><?php echo JText::_('JERROR_LAYOUT_HOME_PAGE'); ?></a></li>
+				<li><a href="<?php echo JUri::root(true); ?>/index.php"><?php echo JText::_('JERROR_LAYOUT_HOME_PAGE'); ?></a></li>
 			</ul>
 			<p><?php echo JText::_('JERROR_LAYOUT_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR'); ?></p>
 			<div id="techinfo">
diff --git a/templates/system/html/modules.php b/templates/system/html/modules.php
deleted file mode 100644
index 3df167767b0f7..0000000000000
--- a/templates/system/html/modules.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/**
- * @package     Joomla.Site
- * @subpackage  Template.system
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-/*
- * none (output raw module content)
- */
-function modChrome_none($module, &$params, &$attribs)
-{
-	echo $module->content;
-}
-
-/*
- * html5 (chosen html5 tag and font header tags)
- */
-function modChrome_html5($module, &$params, &$attribs)
-{
-	$moduleTag      = htmlspecialchars($params->get('module_tag', 'div'), ENT_QUOTES, 'UTF-8');
-	$headerTag      = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');
-	$bootstrapSize  = (int) $params->get('bootstrap_size', 0);
-	$moduleClass    = $bootstrapSize !== 0 ? ' span' . $bootstrapSize : '';
-
-	// Temporarily store header class in variable
-	$headerClass    = $params->get('header_class');
-	$headerClass    = !empty($headerClass) ? ' class="' . htmlspecialchars($headerClass, ENT_COMPAT, 'UTF-8') . '"' : '';
-
-	if (!empty ($module->content)) : ?>
-		<<?php echo $moduleTag; ?> class="moduletable <?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
-
-		<?php if ((bool) $module->showtitle) :?>
-			<<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
-		<?php endif; ?>
-
-			<?php echo $module->content; ?>
-
-		</<?php echo $moduleTag; ?>>
-
-	<?php endif;
-}
-
-/*
- * Module chrome that wraps the module in a table
- */
-function modChrome_table($module, &$params, &$attribs)
-{ ?>
-	<table cellpadding="0" cellspacing="0" class="moduletable <?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8'); ?>">
-	<?php if ((bool) $module->showtitle) : ?>
-		<tr>
-			<th>
-				<?php echo $module->title; ?>
-			</th>
-		</tr>
-	<?php endif; ?>
-		<tr>
-			<td>
-				<?php echo $module->content; ?>
-			</td>
-		</tr>
-		</table>
-	<?php
-}
-
-/*
- * Module chrome that wraps the tabled module output in a <td> tag of another table
- */
-function modChrome_horz($module, &$params, &$attribs)
-{ ?>
-	<table cellspacing="1" cellpadding="0" width="100%">
-		<tr>
-			<td>
-				<?php modChrome_table($module, $params, $attribs); ?>
-			</td>
-		</tr>
-	</table>
-	<?php
-}
-
-/*
- * xhtml (divs and font header tags)
- * With the new advanced parameter it does the same as the html5 chrome
- */
-function modChrome_xhtml($module, &$params, &$attribs)
-{
-	$moduleTag      = htmlspecialchars($params->get('module_tag', 'div'), ENT_QUOTES, 'UTF-8');
-	$headerTag      = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');
-	$bootstrapSize  = (int) $params->get('bootstrap_size', 0);
-	$moduleClass    = $bootstrapSize !== 0 ? ' span' . $bootstrapSize : '';
-
-	// Temporarily store header class in variable
-	$headerClass    = $params->get('header_class');
-	$headerClass    = $headerClass ? ' class="' . htmlspecialchars($headerClass, ENT_COMPAT, 'UTF-8') . '"' : '';
-
-	if (!empty ($module->content)) : ?>
-		<<?php echo $moduleTag; ?> class="moduletable<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
-			<?php if ((bool) $module->showtitle) : ?>
-				<<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
-			<?php endif; ?>
-			<?php echo $module->content; ?>
-		</<?php echo $moduleTag; ?>>
-	<?php endif;
-}
-
-/*
- * Module chrome that allows for rounded corners by wrapping in nested div tags
- */
-function modChrome_rounded($module, &$params, &$attribs)
-{ ?>
-		<div class="module <?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8'); ?>">
-			<div>
-				<div>
-					<div>
-						<?php if ((bool) $module->showtitle) : ?>
-							<h3><?php echo $module->title; ?></h3>
-						<?php endif; ?>
-					<?php echo $module->content; ?>
-					</div>
-				</div>
-			</div>
-		</div>
-	<?php
-}
-
-/*
- * Module chrome that add preview information to the module
- */
-function modChrome_outline($module, &$params, &$attribs)
-{
-	static $css = false;
-
-	if (!$css)
-	{
-		$css = true;
-		$doc = JFactory::getDocument();
-
-		$doc->addStyleDeclaration('.mod-preview-info { padding: 2px 4px 2px 4px; border: 1px solid black; position: absolute; background-color: white; color: red;}');
-		$doc->addStyleDeclaration('.mod-preview-wrapper { background-color:#eee; border: 1px dotted black; color:#700;}');
-	}
-	?>
-	<div class="mod-preview">
-		<div class="mod-preview-info"><?php echo 'Position: ' . $module->position . ' [ Style: ' . $module->style . ']'; ?></div>
-		<div class="mod-preview-wrapper">
-			<?php echo $module->content; ?>
-		</div>
-	</div>
-	<?php
-}
diff --git a/templates/system/incompatible.html b/templates/system/incompatible.html
index 55bd7a21c496f..3422c6245ffeb 100644
--- a/templates/system/incompatible.html
+++ b/templates/system/incompatible.html
@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Joomla: unsupported PHP version</title><!-- Sets the page title, IMPORTANT DO NOT REMOVE -->
   <style>body{margin:0;padding:0;font:14px / 18px sans-serif;color:#555;background-color:transparent}html{background:#f1f1f1;background:-moz-radial-gradient(center,ellipse cover,rgba(241,241,241,1) 0,rgba(58,146,200,1) 100%);background:-webkit-radial-gradient(center,ellipse cover,rgba(241,241,241,1) 0,rgba(58,146,200,1) 100%);background:radial-gradient(ellipse at center,rgba(241,241,241,1) 0,rgba(58,146,200,1) 100%);background-repeat:no-repeat;background-attachment:fixed}ol,ul{padding:0;margin:0;list-style:none}a{color:#0084b4;text-decoration:none;outline:0}a:hover,a:focus{text-decoration:underline}p a{line-height:inherit}.container{display:flex;flex-direction:column;justify-content:center;align-items:center;position:relative;margin:0 auto;width:100%;height:100vh;overflow:hidden}.alert-main{display:block;position:relative;background:#fff;border:1px solid rgba(0,0,0,0.1);border-radius:5px;padding:20px 60px;margin:0 20px;box-shadow:0 0 10px rgba(0,0,0,0.05)}svg{position:absolute;bottom:-120px;right:-70px;width:400px;transform:rotate(10deg);z-index:-1}h1,p{position:relative;z-index:10;text-align:center;text-rendering:optimizeLegibility}h1{margin:18px 0 0;font-size:40px;font-weight:200;line-height:1;text-shadow:0 1px 2px rgba(0,0,0,.2)}p,label{margin:10px 0 20px;font-size:18px;font-weight:300;line-height:25px;color:#777}p a{font-weight:bold;color:#1c3d5c}.link-help{padding:.4rem .85rem;font-size:1rem;font-weight:normal;border-radius:.25rem;text-decoration:none;background-color:#f5f5f5;border:1px solid rgba(0,0,0,0.1)}.link-help:hover{background-color:#eee;text-decoration:none}.footer{margin:8px 20px;text-align:left;font-size:11px}.footer ul{margin-bottom:5px}.footer li{display:inline;margin:0 5px;line-height:20px}.footer li,.footer a{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{display:block;text-align:center;margin-top:4rem;margin-left:auto;margin-right:auto;font-size:1rem}.links li{display:inline-block;margin-top:20px}@media screen and (max-width:480px){.container{height:auto;padding-top:20px;padding-bottom:20px}h1{font-size:30px}.link-help{white-space:nowrap}}</style><!-- Sets the page styling, IMPORTANT DO NOT REMOVE -->
-  <script>window.errorLocale = {"en-US":{"language":"English US","header":"Sorry, your PHP version is not supported","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla","help-url-text":"Help me resolve this"},"en-GB":{"language":"English GB","header":"Sorry, your PHP version is not supported","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla","help-url-text":"Help me resolve this"},}</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
+  <script>window.errorLocale = {"en-GB":{"language":"English GB","header":"Sorry, your PHP version is not supported","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla","help-url-text":"Help me resolve this"},"en-US":{"language":"English US","header":"Sorry, your PHP version is not supported","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla","help-url-text":"Help me resolve this"},}</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
 </head>
 <body ><!-- Sets the minimum PHP version, IMPORTANT DO NOT REMOVE -->
 <div class="container">
diff --git a/templates/system/index.php b/templates/system/index.php
index 75ff973e56f6b..b855b9ec7b3f8 100644
--- a/templates/system/index.php
+++ b/templates/system/index.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Template.system
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/js/error-locales.js b/templates/system/js/error-locales.js
index d7bc20fa701d3..0431ac8d6c167 100644
--- a/templates/system/js/error-locales.js
+++ b/templates/system/js/error-locales.js
@@ -1,7 +1,7 @@
 /**
  * @package     Joomla.Installation
  * @subpackage  JavaScript
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/offline.php b/templates/system/offline.php
index e5a47e473b2ee..f8e75c1bab659 100644
--- a/templates/system/offline.php
+++ b/templates/system/offline.php
@@ -3,15 +3,17 @@
  * @package     Joomla.Site
  * @subpackage  Template.system
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
+
 /** @var JDocumentHtml $this */
 
-$app = JFactory::getApplication();
+$app = Factory::getApplication();
 
 // Styles
 JHtml::_('stylesheet', 'templates/system/css/offline.css', ['version' => 'auto']);
diff --git a/tests/README.md b/tests/README.md
index ff2298d8bf376..efdc508c953b9 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,9 +1,16 @@
-Testing Joomla CMS
+Automated Testing of the Joomla CMS
 ==========
 
-Our test are located in separate repositories. Please find more information in the documentation of the repositories:
+Joomla maintains a range of different methods to run automated tests on its codebase.
 
-* Unit: https://github.com/joomla/test-unit
-* Integration: https://github.com/joomla/test-integration
-* Javascript: https://github.com/joomla/test-javascript
-* System: https://github.com/joomla/test-system 
\ No newline at end of file
+Unit tests
+==========
+The unit tests are checking the specific PHP code of the Joomla framework with the help of PHPUnit. For further information on the tests and on how to run them, please check out tests/unit/README.md
+
+Javascript tests
+==========
+The javascript tests test the Joomla-specific Javascript code. For further information on the tests and on how to run them, please check out https://docs.joomla.org/Running_JavaScript_Tests_for_the_Joomla_CMS
+
+System tests
+==========
+The system tests test the user interface in a real browser. For further information on the tests and on how to run them, please go to https://github.com/joomla/test-system
diff --git a/tests/Unit/Libraries/Cms/Access/RuleTest.php b/tests/Unit/Libraries/Cms/Access/RuleTest.php
new file mode 100644
index 0000000000000..30d8421f026bb
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Access/RuleTest.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Access
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Access;
+
+use Joomla\CMS\Access\Rule;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for \Joomla\CMS\Access\Rule.
+ *
+ * @package  Joomla.Platform
+ *
+ * @since    1.7.0
+ */
+class RuleTest extends UnitTestCase
+{
+	/**
+	 * Tests the \Joomla\CMS\Access\Rule::__construct and \Joomla\CMS\Access\Rule::__toString methods.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.7.0
+	 */
+	public function testIsConstructableWithString()
+	{
+		$ruleData = [
+			-42 => 1,
+			2 => 1,
+			3 => 0
+		];
+
+		// Test constructor with array.
+		$rule = new Rule(json_encode($ruleData));
+
+		$this->assertEquals($ruleData, $rule->getData());
+	}
+
+	/**
+	 * Tests the \Joomla\CMS\Access\Rule::__construct and \Joomla\CMS\Access\Rule::__toString methods.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.7.0
+	 */
+	public function testIsConstructableWithArray()
+	{
+		$ruleData = [
+			-42 => 1,
+			2 => 1,
+			3 => 0
+		];
+
+		// Test constructor with array.
+		$rule = new Rule($ruleData);
+
+		$this->assertEquals($ruleData, $rule->getData());
+	}
+
+	/**
+	 * Tests the \Joomla\CMS\Access\Rule::mergeIdentity method.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.7.0
+	 */
+	public function testMergeIdentity()
+	{
+		// Construct a rule with no identities.
+		$rule = new Rule('');
+
+		// Add the identity with allow.
+		$rule->mergeIdentity(-42, true);
+		$this->assertEquals('{"-42":1}', (string) $rule);
+
+		// Read the identity, but deny.
+		$rule->mergeIdentity(-42, false);
+		$this->assertEquals('{"-42":0}', (string) $rule);
+
+		// Read the identity with allow (checking deny wins).
+		$rule->mergeIdentity(-42, true);
+		$this->assertEquals('{"-42":0}', (string) $rule);
+	}
+
+	/**
+	 * Tests the \Joomla\CMS\Access\Rule::mergeIdentities method.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.7.0
+	 */
+	public function testMergeIdentities()
+	{
+		$ruleData = [
+			-42 => 1,
+			2 => 1,
+			3 => 0
+		];
+
+		// Construct a rule with no identities.
+		$rule = new Rule('');
+
+		$rule->mergeIdentities($ruleData);
+		$this->assertEquals(json_encode($ruleData), (string) $rule);
+
+		$rule2 = new Rule($ruleData);
+		$rule->mergeIdentities($rule2);
+		$this->assertEquals(json_encode($ruleData), (string) $rule);
+
+		$this->assertEquals((string) $rule2, (string) $rule);
+
+		// Merge a new set, flipping some bits.
+		$ruleData2 = [
+			-42 => 0,
+			2 => 1,
+			3 => 1,
+			4 => 1
+		];
+
+		// Ident 3 should remain false, 4 should be added.
+		$expectedResult = [
+			-42 => 0,
+			2 => 1,
+			3 => 0,
+			4 => 1
+		];
+		$rule->mergeIdentities($ruleData2);
+		$this->assertEquals(json_encode($expectedResult), (string) $rule);
+	}
+
+	/**
+	 * Tests the \Joomla\CMS\Access\Rule::allow method.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.7.0
+	 */
+	public function testAllow()
+	{
+		// Simple allow and deny test.
+		$ruleData = [
+			-42 => 0,
+			2 => 1
+		];
+		$rule = new Rule($ruleData);
+
+		// This one should be denied.
+		$this->assertFalse($rule->allow(-42));
+		$this->assertEquals(null, $rule->allow(null));
+		$this->assertTrue($rule->allow(2));
+		$this->assertFalse($rule->allow([-42, 2]));
+	}
+
+	public function testToString()
+	{
+		$ruleData = [
+			-42 => 0,
+			2 => 1
+		];
+
+		$rule = new Rule($ruleData);
+
+		$this->assertEquals(json_encode($ruleData), (string) $rule);
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Access/RulesTest.php b/tests/Unit/Libraries/Cms/Access/RulesTest.php
new file mode 100644
index 0000000000000..73a8adb684bec
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Access/RulesTest.php
@@ -0,0 +1,353 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Access
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Access;
+
+use Joomla\CMS\Access\Rule;
+use Joomla\CMS\Access\Rules;
+use Joomla\CMS\Object\CMSObject;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for \Joomla\CMS\Access\Rules.
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Access
+ * @since       1.7.0
+ */
+class RulesTest extends UnitTestCase
+{
+	public function testIsConstructableWithInputString()
+	{
+		$ruleIdentities = [
+			-42 => 1,
+			2 => 1,
+			3 => 0
+		];
+		$input = [
+			'edit' => $ruleIdentities
+		];
+
+		// Test input as string.
+		$rules = new Rules(json_encode($input));
+
+		$editRule = $rules->getData()['edit'];
+		$this->assertInstanceOf(Rule::class,  $editRule);
+		$this->assertEquals($ruleIdentities, $editRule->getData());
+	}
+
+	public function testIsConstructableWithArray()
+	{
+		$ruleIdentities = [
+			-42 => 1,
+			2 => 1,
+			3 => 0
+		];
+		$input = [
+			'edit' => $ruleIdentities
+		];
+
+		$rules = new Rules($input);
+
+		$editRule = $rules->getData()['edit'];
+		$this->assertInstanceOf(Rule::class,  $editRule);
+		$this->assertEquals($ruleIdentities, $editRule->getData());
+	}
+
+	/**
+	 * Tests the \Joomla\CMS\Access\Rules constructor
+	 *
+	 * @return  void
+	 *
+	 * @since   1.7.0
+	 */
+	public function testIsConstructableWithObject()
+	{
+		$ruleIdentities = [
+			-42 => 1,
+			2 => 1,
+			3 => 0
+		];
+		$input = [
+			'edit' => $ruleIdentities
+		];
+
+		$rules = new Rules(  (object) $input);
+
+		$editRule = $rules->getData()['edit'];
+		$this->assertInstanceOf(Rule::class,  $editRule);
+		$this->assertEquals($ruleIdentities, $editRule->getData());
+	}
+
+	/**
+	 * Tests the \Joomla\CMS\Access\Rules::mergeAction method.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.7.0
+	 */
+	public function testMergeAction()
+	{
+		$ruleIdentities = [
+			-42 => 1,
+			2 => 1,
+			3 => 0
+		];
+
+		// Construct and empty \Joomla\CMS\Access\Rules.
+		$rules = new Rules;
+		$rules->mergeAction('edit', $ruleIdentities);
+
+		$editRule = $rules->getData()['edit'];
+		$this->assertInstanceOf(Rule::class,  $editRule);
+		$this->assertEquals($ruleIdentities, $editRule->getData());
+
+		// Merge a new set, flipping some bits.
+		// Ident 3 should remain false, 4 should be added.
+		$newRuleIdentities = array(
+			-42 => 0,
+			2 => 1,
+			3 => 1,
+			4 => 1
+		);
+		$rules->mergeAction('edit', $newRuleIdentities);
+
+		$editRule = $rules->getData()['edit'];
+		$this->assertEquals([
+			-42 => 0,
+			2 => 1,
+			3 => 0,
+			4 => 1
+		], $editRule->getData());
+
+	}
+
+	/**
+	 * Tests the \Joomla\CMS\Access\Rules::merge method.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.7.0
+	 */
+	public function testMerge()
+	{
+		$ruleData1 = [
+			'edit' => [
+				-42 => 1
+			],
+			'delete' => [
+				-42 => 0
+			]
+		];
+		$ruleData2 = [
+			'create' => [
+				2 => 1
+			],
+			'delete' => [
+				2 => 0
+			]
+		];
+
+		$expectedResult = [
+			'edit' => [
+				-42 => 1
+			],
+			'delete' => [
+				-42 => 0,
+				2 => 0
+			],
+			'create' => [
+				2 => 1
+			],
+		];
+
+		$rules1 = new Rules($ruleData1);
+		$rules2 = new Rules($ruleData2);
+		$rules1->merge($rules2);
+
+		$editRule = $rules1->getData()['edit'];
+		$deleteRule = $rules1->getData()['delete'];
+		$createRule = $rules1->getData()['create'];
+
+		$this->assertInstanceOf(Rule::class,  $editRule);
+		$this->assertInstanceOf(Rule::class,  $deleteRule);
+		$this->assertInstanceOf(Rule::class,  $createRule);
+		$this->assertEquals($expectedResult['edit'], $editRule->getData());
+		$this->assertEquals($expectedResult['delete'], $deleteRule->getData());
+		$this->assertEquals($expectedResult['create'], $createRule->getData());
+	}
+
+	/**
+	 * Tests the \Joomla\CMS\Access\Rules::merge method
+	 *
+	 * @return  void
+	 *
+	 * @since   1.7.0
+	 */
+	public function testMergeRulesNull()
+	{
+		$ruleData = array(
+			'edit' => array(
+				-42 => 1
+			),
+			'delete' => array(
+				-42 => 0
+			)
+		);
+
+		$rules1 = new Rules($ruleData);
+		$rules2 = new Rules('');
+		$rules2->merge($rules1);
+
+		$editRule = $rules1->getData()['edit'];
+		$deleteRule = $rules1->getData()['delete'];
+
+		$this->assertInstanceOf(Rule::class,  $editRule);
+		$this->assertInstanceOf(Rule::class,  $deleteRule);
+		$this->assertEquals($ruleData['edit'], $editRule->getData());
+		$this->assertEquals($ruleData['delete'], $deleteRule->getData());
+	}
+
+	/**
+	 * Tests the \Joomla\CMS\Access\Rules::merge method
+	 *
+	 * @return  void
+	 *
+	 * @since   1.7.0
+	 */
+	public function testMergeRules()
+	{
+		$ruleData1 = [
+			'edit' => [
+				-42 => 1
+			],
+			'delete' => [
+				-42 => 0
+			]
+		];
+
+		$ruleData2 = [
+			'create' => [
+				2 => 1
+			],
+			'delete' => [
+				2 => 0
+			]
+		];
+
+		$expectedResult = [
+			'edit' => [
+				-42 => 1
+			],
+			'delete' => [
+				-42 => 0,
+				2 => 0
+			],
+			'create' => [
+				2 => 1
+			],
+		];
+
+		$rules1 = new Rules($ruleData1);
+		$rules1->merge($ruleData2);
+
+		$editRule = $rules1->getData()['edit'];
+		$deleteRule = $rules1->getData()['delete'];
+		$createRule = $rules1->getData()['create'];
+
+		$this->assertInstanceOf(Rule::class,  $editRule);
+		$this->assertInstanceOf(Rule::class,  $deleteRule);
+		$this->assertInstanceOf(Rule::class,  $createRule);
+		$this->assertEquals($expectedResult['edit'], $editRule->getData());
+		$this->assertEquals($expectedResult['delete'], $deleteRule->getData());
+		$this->assertEquals($expectedResult['create'], $createRule->getData());
+	}
+
+	/**
+	 * Tests the \Joomla\CMS\Access\Rules::allow method.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.7.0
+	 */
+	public function testAllow()
+	{
+		$ruleData = [
+			'edit' => [
+				-42 => 1
+			],
+			'delete' => [
+				-42 => 0,
+				2 => 1
+			]
+		];
+
+		$rules = new Rules($ruleData);
+
+		// Explicit allow.
+		$this->assertTrue($rules->allow('edit', -42));
+		$this->assertTrue($rules->allow('edit', '-42'));
+		$this->assertNull($rules->allow('edit', 999));
+		$this->assertFalse($rules->allow('delete', -42));
+		$this->assertTrue($rules->allow('edit', [-42, 999]));
+		$this->assertFalse($rules->allow('delete', [-42, 2]));
+		$this->assertNull($rules->allow('unknown', [-42, 2]));
+	}
+
+	/**
+	 * Tests the \Joomla\CMS\Access\Rules::getAllowed method.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.7.0
+	 */
+	public function testGetAllowed()
+	{
+		$ruleData = [
+			'create' => [
+				-42 => 1
+			],
+			'edit' => [
+				-42 => 1
+			],
+			'delete' => [
+				-42 => 0,
+				2 => 1
+			]
+		];
+
+		$rules = new Rules($ruleData);
+		$allowed = $rules->getAllowed(-42);
+
+		$this->assertInstanceOf(CMSObject::class, $allowed);
+		$this->assertTrue($allowed->get('create'));
+		$this->assertTrue($allowed->get('edit'));
+		$this->assertNull($allowed->get('delete'));
+	}
+
+	public function testToString()
+	{
+		$ruleData = [
+			'create' => [
+				-42 => 1
+			],
+			'edit' => [
+				-42 => 1
+			],
+			'delete' => [
+				-42 => 0,
+				2 => 1
+			]
+		];
+
+		$rules = new Rules($ruleData);
+
+		$this->assertEquals(json_encode($ruleData), (string) $rules);
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Console/Loader/WritableContainerLoaderTest.php b/tests/Unit/Libraries/Cms/Console/Loader/WritableContainerLoaderTest.php
new file mode 100644
index 0000000000000..3fd0f45468bab
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Console/Loader/WritableContainerLoaderTest.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Console
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Console\Loader;
+
+use Joomla\CMS\Console\Loader\WritableContainerLoader;
+use Joomla\Console\Command\AbstractCommand;
+use Joomla\Tests\Unit\UnitTestCase;
+use Psr\Container\ContainerInterface;
+
+/**
+ * Test class for Joomla\CMS\Console\Loader\WritableContainerLoader.
+ */
+class WritableContainerLoaderTest extends UnitTestCase
+{
+	/**
+	 * @var  ContainerInterface|\PHPUnit_Framework_MockObject_MockObject
+	 */
+	protected $container;
+
+	/**
+	 * Sets up the fixture, for example, opens a network connection.
+	 * This method is called before a test is executed.
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		$this->container = $this->createMock(ContainerInterface::class);
+	}
+
+	public function testTheLoaderCanBeWrittenTo()
+	{
+		$command = $this->createMock(AbstractCommand::class);
+
+		$commandName = 'test:command';
+		$serviceId   = 'test.loader';
+
+		$this->container->expects($this->once())
+			->method('has')
+			->with($serviceId)
+			->willReturn(true);
+
+		$loader = new WritableContainerLoader($this->container, []);
+		$loader->add($commandName, $serviceId);
+
+		$this->assertTrue($loader->has($commandName));
+	}
+
+	public function testTheLoaderRetrievesACommand()
+	{
+		$command = $this->createMock(AbstractCommand::class);
+
+		$commandName = 'test:command';
+		$serviceId   = 'test.loader';
+
+		$this->container->expects($this->once())
+			->method('has')
+			->with($serviceId)
+			->willReturn(true);
+
+		$this->container->expects($this->once())
+			->method('get')
+			->with($serviceId)
+			->willReturn($command);
+
+		$this->assertSame(
+			$command,
+			(new WritableContainerLoader($this->container, [$commandName => $serviceId]))->get($commandName)
+		);
+	}
+
+	/**
+	 * @expectedException  \Symfony\Component\Console\Exception\CommandNotFoundException
+	 */
+	public function testTheLoaderDoesNotRetrieveAnUnknownCommand()
+	{
+		$commandName = 'test:loader';
+		$serviceId   = 'test.loader';
+
+		$this->container->expects($this->once())
+			->method('has')
+			->with($serviceId)
+			->willReturn(false);
+
+		$this->container->expects($this->never())
+			->method('get');
+
+		(new WritableContainerLoader($this->container, [$commandName => $serviceId]))->get($commandName);
+	}
+
+	public function testTheLoaderHasACommand()
+	{
+		$commandName = 'test:loader';
+		$serviceId   = 'test.loader';
+
+		$this->container->expects($this->once())
+			->method('has')
+			->with($serviceId)
+			->willReturn(true);
+
+		$this->assertTrue(
+			(new WritableContainerLoader($this->container, [$commandName => $serviceId]))->has($commandName)
+		);
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Document/DocumentTest.php b/tests/Unit/Libraries/Cms/Document/DocumentTest.php
new file mode 100644
index 0000000000000..d2c4d1f5ac663
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Document/DocumentTest.php
@@ -0,0 +1,616 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Document
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Html;
+
+use Joomla\CMS\Document\Document;
+use Joomla\CMS\Document\FactoryInterface;
+use Joomla\CMS\Document\HtmlDocument;
+use Joomla\CMS\Document\RawDocument;
+use Joomla\CMS\WebAsset\WebAssetManager;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for Document.
+ */
+class DocumentTest extends UnitTestCase
+{
+	/**
+	 * Provides constructor data for test methods
+	 *
+	 * @return  array
+	 */
+	public function constructData(): array
+	{
+		return [
+			[
+				['lineend' => "\12"],
+				[
+					'lineend' => "\12",
+					'charset' => 'utf-8',
+					'language' => 'en-gb',
+					'direction' => 'ltr',
+					'tab' => "\11",
+					'link' => '',
+					'base' => ''
+				]
+			],
+			[
+				['charset' => "euc-jp", 'mediaversion' => '1a2b3c4d'],
+				[
+					'lineend' => "\12",
+					'charset' => 'euc-jp',
+					'language' => 'en-gb',
+					'direction' => 'ltr',
+					'tab' => "\11",
+					'link' => '',
+					'base' => '',
+					'mediaversion' => '1a2b3c4d'
+				]
+			],
+			[
+				[
+					'language' => "de-de", 'direction' => 'rtl',
+					'tab'      => 'Crazy Tab', 'link' => 'http://joomla.org',
+					'base'     => 'http://base.joomla.org/dir'
+				],
+				[
+					'lineend' => "\12",
+					'charset' => 'utf-8',
+					'language' => 'de-de',
+					'direction' => 'rtl',
+					'tab' => "Crazy Tab",
+					'link' => 'http://joomla.org',
+					'base' => 'http://base.joomla.org/dir'
+				]
+			]
+		];
+	}
+
+	/**
+	 * @param   array  $options  Options array to inject
+	 * @param   array  $expects  Expected data values
+	 *
+	 * @dataProvider constructData
+	 */
+	public function testInjectingOptionsIntoTheObjectConstructor($options, $expects)
+	{
+		$document = $this->createDocument($options);
+
+		$this->assertAttributeSame($expects['lineend'], '_lineEnd', $document);
+		$this->assertAttributeSame($expects['charset'], '_charset', $document);
+		$this->assertAttributeSame($expects['language'], 'language', $document);
+		$this->assertAttributeSame($expects['direction'], 'direction', $document);
+		$this->assertAttributeSame($expects['tab'], '_tab', $document);
+		$this->assertAttributeSame($expects['link'], 'link', $document);
+		$this->assertAttributeSame($expects['base'], 'base', $document);
+	}
+
+	/**
+	 * @testdox  Test retrieving an instance of JDocumentHtml
+	 */
+	public function testRetrievingAnInstanceOfTheHtmlDocument()
+	{
+		$this->assertInstanceOf(
+			HtmlDocument::class,
+			Document::getInstance('html',  $this->getDocumentDependencyMocks())
+		);
+	}
+
+	/**
+	 * @testdox  Test retrieving non-existing JDocument type returns a JDocumentRaw instance
+	 */
+	public function testRetrievingANonExistantTypeFetchesARawDocument()
+	{
+		$type = 'does-not-exist';
+
+		$document = Document::getInstance($type, $this->getDocumentDependencyMocks());
+
+		$this->assertInstanceOf(RawDocument::class, $document);
+		$this->assertAttributeSame($type, '_type', $document);
+	}
+
+	/**
+	 * @testdox  Test that setType returns an instance of $this
+	 */
+	public function testEnsureSetTypeReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setType('raw'));
+	}
+
+	/**
+	 * @testdox  Test the default return for getType is null
+	 */
+	public function testTheDefaultReturnForGetTypeIsNull()
+	{
+		$this->assertNull($this->createDocument()->getType());
+	}
+
+	/**
+	 * @testdox  Test that setBuffer returns an instance of $this
+	 */
+	public function testEnsureSetBufferReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setBuffer('My awesome content'));
+
+		// Cleanup
+		$document::$_buffer = null;
+	}
+
+	/**
+	 * @testdox  Test the default return for getBuffer is null
+	 */
+	public function testTheDefaultReturnForGetBufferIsNull()
+	{
+		$this->assertNull($this->createDocument()->getBuffer());
+	}
+
+	/**
+	 * @testdox  Test that setMetadata with the 'generator' param returns an instance of $this
+	 */
+	public function testEnsureSetMetadataForGeneratorReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setMetaData('generator', 'My Custom Generator'));
+	}
+
+	/**
+	 * @testdox  Test the default return for getMetaData with 'generator' param
+	 */
+	public function testTheDefaultReturnForGetMetaDataWithGenerator()
+	{
+		$this->assertSame('Joomla! - Open Source Content Management', $this->createDocument()->getMetaData('generator'));
+	}
+
+	/**
+	 * @testdox  Test that setMetadata with the 'description' param returns an instance of $this
+	 */
+	public function testEnsureSetMetadataForDescriptionReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setMetaData('description', 'My Description'));
+	}
+
+	/**
+	 * @testdox  Test the default return for getMetaData with 'description' param
+	 */
+	public function testTheDefaultReturnForGetMetaDataWithDescription()
+	{
+		$this->assertEmpty($this->createDocument()->getMetaData('description'));
+	}
+
+	/**
+	 * @testdox  Test that setMetadata with a custom param returns an instance of $this
+	 */
+	public function testEnsureSetMetadataForCustomParamsReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setMetaData('myMetaTag', 'myMetaContent'));
+	}
+
+	/**
+	 * @testdox  Test the return for getMetaData with a custom param and HTTP-Equiv flag true with data not set to HTTP-Equiv
+	 */
+	public function testTheReturnForGetMetaDataWithCustomParamAndHttpEquivTrueAndDataNotSet()
+	{
+		$document = $this->createDocument();
+
+		$document->setMetaData('myMetaTag', 'myMetaContent');
+
+		$this->assertEmpty($document->getMetaData('myMetaTag', true));
+	}
+
+	/**
+	 * @testdox  Test the return for getMetaData with a custom param and HTTP-Equiv flag true with data set to HTTP-Equiv
+	 */
+	public function testTheReturnForGetMetaDataWithCustomParamAndHttpEquivTrueAndDataSet()
+	{
+		$document = $this->createDocument();
+
+		$document->setMetaData('myMetaTag', 'myMetaContent', true);
+
+		$this->assertSame('myMetaContent', $document->getMetaData('myMetaTag', true));
+	}
+
+	/**
+	 * @testdox  Test the return for getMetaData with a custom param and HTTP-Equiv flag false with data set to HTTP-Equiv
+	 */
+	public function testTheReturnForGetMetaDataWithCustomParamAndHttpEquivFalseAndDataNotSet()
+	{
+		$document = $this->createDocument();
+
+		$document->setMetaData('myMetaTag', 'myMetaContent', true);
+
+		$this->assertEmpty($document->getMetaData('myMetaTag'));
+	}
+
+	/**
+	 * @testdox  Test the return for getMetaData with a custom param and HTTP-Equiv flag false with data not set to HTTP-Equiv
+	 */
+	public function testTheReturnForGetMetaDataWithCustomParamAndHttpEquivFalseAndDataSet()
+	{
+		$document = $this->createDocument();
+
+		$document->setMetaData('myMetaTag', 'myMetaContent');
+
+		$this->assertSame('myMetaContent', $document->getMetaData('myMetaTag'));
+	}
+
+	/**
+	 * @testdox  Test that addScript returns an instance of $this
+	 */
+	public function testEnsureAddScriptReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->addScript('https://www.joomla.org/media/system/js/core.js'));
+	}
+
+	/**
+	 * @testdox  Test that addScriptDeclaration returns an instance of $this
+	 */
+	public function testEnsureAddScriptDeclarationReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->addScriptDeclaration('<script>this.window.close();</script>'));
+	}
+
+	/**
+	 * @testdox  Test that calling addScriptDeclaration twice returns an instance of $this
+	 */
+	public function testEnsureTwoAddScriptDeclarationCallsReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->addScriptDeclaration('<script>this.document.id();</script>'));
+		$this->assertSame($document, $document->addScriptDeclaration('<script>this.window.close();</script>'));
+	}
+
+	/**
+	 * @testdox  Test that addStyleSheet returns an instance of $this
+	 */
+	public function testEnsureAddStylesheetReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->addStyleSheet('https://www.joomla.org/media/system/css/system.css'));
+	}
+
+	/**
+	 * @testdox  Test that addStyleDeclaration returns an instance of $this
+	 */
+	public function testEnsureAddStyleDeclarationReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->addStyleDeclaration('<style>div { padding: 0; }</style>'));
+	}
+
+	/**
+	 * @testdox  Test that calling addStyleDeclaration twice returns an instance of $this
+	 */
+	public function testEnsureTwoAddStyleDeclarationCallsReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->addStyleDeclaration('<style>div { padding: 0; }</style>'));
+		$this->assertSame($document, $document->addStyleDeclaration('<style>h1 { font-size: 4px; }</style>'));
+	}
+
+	/**
+	 * @testdox  Test that setCharset returns an instance of $this
+	 */
+	public function testEnsureSetCharsetReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setCharset('utf-8'));
+	}
+
+	/**
+	 * @testdox  Test the default return for getCharset
+	 */
+	public function testTheDefaultReturnForGetCharset()
+	{
+		$this->assertSame('utf-8', $this->createDocument()->getCharset());
+	}
+
+	/**
+	 * @testdox  Test that setLanguage returns an instance of $this
+	 */
+	public function testEnsureSetLanguageReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setLanguage('de-de'));
+	}
+
+	/**
+	 * @testdox  Test the default return for getLanguage
+	 */
+	public function testTheDefaultReturnForGetLanguage()
+	{
+		$this->assertSame('en-gb', $this->createDocument()->getLanguage());
+	}
+
+	/**
+	 * @testdox  Test that setDirection returns an instance of $this
+	 */
+	public function testEnsureSetDirectionReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setDirection('rtl'));
+	}
+
+	/**
+	 * @testdox  Test the default return for getDirection
+	 */
+	public function testTheDefaultReturnForGetDirection()
+	{
+		$this->assertSame('ltr', $this->createDocument()->getDirection());
+	}
+
+	/**
+	 * @testdox  Test that setTitle returns an instance of $this
+	 */
+	public function testEnsureSetTitleReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setTitle('Joomla! Rocks'));
+	}
+
+	/**
+	 * @testdox  Test the default return for getTitle
+	 */
+	public function testTheDefaultReturnForGetTitle()
+	{
+		$this->assertEmpty($this->createDocument()->getTitle());
+	}
+
+	/**
+	 * @testdox  Test that setBase returns an instance of $this
+	 */
+	public function testEnsureSetBaseReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setBase('https://www.joomla.org'));
+	}
+
+	/**
+	 * @testdox  Test the default return for getBase
+	 */
+	public function testTheDefaultReturnForGetBase()
+	{
+		$this->assertEmpty($this->createDocument()->getBase());
+	}
+
+	/**
+	 * @testdox  Test that setDescription returns an instance of $this
+	 */
+	public function testEnsureSetDescriptionReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setDescription('Joomla!'));
+	}
+
+	/**
+	 * @testdox  Test the default return for getDescription
+	 */
+	public function testTheDefaultReturnForGetDescription()
+	{
+		$this->assertEmpty($this->createDocument()->getDescription());
+	}
+
+	/**
+	 * @testdox  Test that setLink returns an instance of $this
+	 */
+	public function testEnsureSetLinkReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setLink('https://www.joomla.org'));
+	}
+
+	/**
+	 * @testdox  Test the default return for getLink
+	 */
+	public function testTheDefaultReturnForGetLink()
+	{
+		$this->assertEmpty($this->createDocument()->getLink());
+	}
+
+	/**
+	 * @testdox  Test that setGenerator returns an instance of $this
+	 */
+	public function testEnsureSetGeneratorReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setGenerator('Joomla! Content Management System'));
+	}
+
+	/**
+	 * @testdox  Test the default return for getGenerator
+	 */
+	public function testTheDefaultReturnForGetGenerator()
+	{
+		$this->assertSame('Joomla! - Open Source Content Management', $this->createDocument()->getGenerator());
+	}
+
+	/**
+	 * @testdox  Test that setModifiedDate returns an instance of $this
+	 */
+	public function testEnsureSetModifiedDateReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setModifiedDate('2014-10-17'));
+	}
+
+	/**
+	 * @testdox  Test the default return for getModifiedDate
+	 */
+	public function testTheDefaultReturnForGetModifiedDate()
+	{
+		$this->assertEmpty($this->createDocument()->getModifiedDate());
+	}
+
+	/**
+	 * @testdox  Test that setMimeEncoding returns an instance of $this
+	 */
+	public function testEnsureSetMimeEncodingReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setMimeEncoding('application/json'));
+	}
+
+	/**
+	 * @testdox  Test the default return for getMimeEncoding
+	 */
+	public function testTheDefaultReturnForGetMimeEncoding()
+	{
+		$this->assertEmpty($this->createDocument()->getMimeEncoding());
+	}
+
+	/**
+	 * @testdox  Test that setLineEnd with param 'win' returns an instance of $this
+	 */
+	public function testEnsureSetLineEndWinReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setLineEnd('win'));
+	}
+
+	/**
+	 * @testdox  Test that setLineEnd with param 'unix' returns an instance of $this
+	 */
+	public function testEnsureSetLineEndUnixReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setLineEnd('unix'));
+	}
+
+	/**
+	 * @testdox  Test that setLineEnd with param 'mac' returns an instance of $this
+	 */
+	public function testEnsureSetLineEndMacReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setLineEnd('mac'));
+	}
+
+	/**
+	 * @testdox  Test that setLineEnd with a custom param returns an instance of $this
+	 */
+	public function testEnsureSetLineEndCustomReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setLineEnd('special'));
+	}
+
+	/**
+	 * @testdox  Test the default return for _getLineEnd
+	 */
+	public function testTheDefaultReturnForGetLineEnd()
+	{
+		$this->assertSame("\12", $this->createDocument()->_getLineEnd());
+	}
+
+	/**
+	 * @testdox  Test that setTab with a custom param returns an instance of $this
+	 */
+	public function testEnsureSetTabReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->setTab("\t"));
+	}
+
+	/**
+	 * @testdox  Test the default return for _getTab
+	 */
+	public function testTheDefaultReturnForGetTab()
+	{
+		$this->assertSame("\11", $this->createDocument()->_getTab());
+	}
+
+	/**
+	 * @testdox  Test that loadRenderer returns the intended object
+	 *
+	 * @covers   JDocument::loadRenderer
+	 * @uses     JDocument::setType
+	 */
+	public function testEnsureLoadRendererReturnsCorrectObjectFromFactory()
+	{
+		$documentDependencyMocks = $this->getDocumentDependencyMocks();
+		$documentDependencyMocks['factory']
+			->expects($this->once())
+			->method('createRenderer');
+
+		$document = $this->createDocument($documentDependencyMocks);
+
+		$document->loadRenderer('head');
+	}
+
+	/**
+	 * @testdox  Test that parse returns an instance of $this
+	 */
+	public function testEnsureParseReturnsThisObject()
+	{
+		$document = $this->createDocument();
+
+		$this->assertSame($document, $document->parse());
+	}
+
+	/**
+	 * Helper function to create a document with mocked dependencies
+	 *
+	 * @param array $options
+	 *
+	 * @return Document
+	 */
+	protected function createDocument(array $options = []): Document
+	{
+		$mergedOptions = array_merge($this->getDocumentDependencyMocks(), $options);
+
+		$object = new Document($mergedOptions);
+
+		return $object;
+	}
+
+	/**
+	 * Helper function to get mocked constructor dependencies of the document
+	 *
+	 * @return array
+	 */
+	protected function getDocumentDependencyMocks(): array
+	{
+		return [
+			'factory' => $this->createMock(FactoryInterface::class),
+			'webAssetManager' =>  $this->createMock(WebAssetManager::class),
+		];
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Environment/BrowserTest.php b/tests/Unit/Libraries/Cms/Environment/BrowserTest.php
new file mode 100644
index 0000000000000..a39df0ab06c04
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Environment/BrowserTest.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Environment
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Environment;
+
+use Joomla\CMS\Environment\Browser;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for JBrowser.
+ */
+class BrowserTest extends UnitTestCase
+{
+	/**
+	 * Backup of the SERVER superglobal
+	 *
+	 * @var  array
+	 */
+	protected $backupServer;
+
+	/**
+	 * Object being tested
+	 *
+	 * @var  Browser
+	 */
+	protected $browser;
+
+	/**
+	 * This method is called before a test is executed.
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		$this->browser = new Browser;
+
+		parent::setUp();
+	}
+
+	/**
+	 * This method is called after a test is executed.
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		unset($this->browser);
+
+		parent::tearDown();
+	}
+
+	/**
+	 * Data provider for the testBrowserMatching method
+	 *
+	 * @return  array
+	 */
+	public function dataMatch(): array
+	{
+		return [
+			'Edge 14' => [
+				'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393',
+				'edge',
+				'win',
+				'14',
+				false,
+			],
+			'Opera 9.80 Mobile Linux' => [
+				'Opera/9.80 (Android 3.2.1; Linux; Opera Tablet/ADR-1111101157; U; en) Presto/2.9.201 Version/11.50',
+				'opera',
+				'unix',
+				'11',
+				true,
+			],
+			'Chrome 13 OS X' => [
+				'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_3) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.32 Safari/535.1',
+				'chrome',
+				'mac',
+				'13',
+				false,
+			],
+			'Chrome 12 Windows' => [
+				'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.113 Safari/534.30',
+				'chrome',
+				'win',
+				'12',
+				false,
+			],
+			'Chrome 54 Windows' => [
+				'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.71 Safari/537.36',
+				'chrome',
+				'win',
+				'54',
+				false,
+			],
+			'Chrome 12 Ubuntu' => [
+				'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/534.30 (KHTML, like Gecko) Ubuntu/10.04 Chromium/12.0.742.112 Chrome/12.0.742.112 Safari/534.30',
+				'chrome',
+				'unix',
+				'12',
+				false,
+			],
+			'Internet Explorer 10' => [
+				'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)',
+				'msie',
+				'win',
+				'10',
+				false,
+			],
+			'Internet Explorer 9' => [
+				'Mozilla/5.0 (Windows; U; MSIE 9.0; WIndows NT 9.0; en-US))',
+				'msie',
+				'win',
+				'9',
+				false,
+			],
+			'Firefox 12 Android Tablet' => [
+				'Mozilla/5.0 (Android; Tablet; rv:12.0) Gecko/12.0 Firefox/12.0',
+				'firefox',
+				'unix',
+				'12',
+				true,
+			],
+			'Firefox 6 Windows' => [
+				'Mozilla/5.0 (Windows NT 5.0; WOW64; rv:6.0) Gecko/20100101 Firefox/6.0',
+				'firefox',
+				'win',
+				'6',
+				false,
+			],
+		];
+	}
+
+	/**
+	 * @testdox  A browser with a given user agent is correctly detected
+	 *
+	 * @covers        JBrowser::match
+	 * @dataProvider  dataMatch
+	 *
+	 * @param   string   $userAgent             The user agent to test
+	 * @param   string   $expectedBrowser       The expected browser value
+	 * @param   string   $expectedPlatform      The expected platform value
+	 * @param   string   $expectedMajorVersion  The expected major version value
+	 * @param   boolean  $expectedMobile        The expected mobile state
+	 */
+	public function testBrowserMatching($userAgent, $expectedBrowser, $expectedPlatform, $expectedMajorVersion, $expectedMobile)
+	{
+		$this->browser->match($userAgent);
+
+		$this->assertSame($expectedBrowser, $this->browser->getBrowser());
+		$this->assertSame($expectedPlatform, $this->browser->getPlatform());
+		$this->assertSame($expectedMajorVersion, $this->browser->getMajor());
+		$this->assertSame($expectedMobile, $this->browser->isMobile());
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Feed/FeedEntryTest.php b/tests/Unit/Libraries/Cms/Feed/FeedEntryTest.php
new file mode 100644
index 0000000000000..5c6cc8c533a23
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Feed/FeedEntryTest.php
@@ -0,0 +1,431 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Feed
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Feed;
+
+use InvalidArgumentException;
+use Joomla\CMS\Date\Date;
+use Joomla\CMS\Feed\FeedEntry;
+use Joomla\CMS\Feed\FeedLink;
+use Joomla\CMS\Feed\FeedPerson;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for FeedEntry.
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Feed
+ * @since       3.1.4
+ */
+class FeedEntryTest extends UnitTestCase
+{
+	/**
+	 * @var FeedEntry
+	 */
+	protected $feedEntry;
+
+	/**
+	 * Setup the tests.
+	 *
+	 * @return  void
+	 *
+	 * @see     \PHPUnit\Framework\TestCase::setUp()
+	 * @since   3.1.4
+	 */
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->feedEntry = new FeedEntry;
+	}
+
+	/**
+	 * Method to tear down whatever was set up before the test.
+	 *
+	 * @return  void
+	 *
+	 * @see     \PHPUnit\Framework\TestCase::tearDown()
+	 * @since   3.1.4
+	 */
+	protected function tearDown()
+	{
+		unset($this->feedEntry);
+
+		parent::tearDown();
+	}
+
+	/**
+	 * Tests the FeedEntry::__get method with default property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testMagicGetterWithDefaultProperty()
+	{
+		$this->assertEquals('', $this->feedEntry->uri);
+	}
+
+	/**
+	 * Tests the FeedEntry::__get method when the property has not been set to a value.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testMagicGetterWithUnknownProperty()
+	{
+		$this->assertEquals(null, $this->feedEntry->unknown);
+	}
+
+	/**
+	 * Tests the FeedEntry::__set method with updatedDate with a string.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testSetUpdatedDateWithString()
+	{
+		$this->feedEntry->updatedDate = 'May 2nd, 1967';
+
+		$this->assertInstanceOf(Date::class, $this->feedEntry->updatedDate);
+	}
+
+	/**
+	 * Tests the FeedEntry::__set method with updatedDate with a JDate object.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testMagicSetUpdatedDateWithDateObject()
+	{
+		$date = new Date('October 12, 2011');
+		$this->feedEntry->updatedDate = $date;
+
+		$updatedDate = $this->feedEntry->updatedDate;
+		$this->assertInstanceOf(Date::class, $updatedDate);
+		$this->assertSame($date, $updatedDate);
+	}
+
+	/**
+	 * Tests the FeedEntry::__set method with a person object.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testSetAuthorWithPerson()
+	{
+		$name = 'Brian Kernighan';
+		$email = 'brian@example.com';
+		$person = new FeedPerson($name, $email);
+
+		$this->feedEntry->author = $person;
+
+		$author = $this->feedEntry->author;
+		$this->assertInstanceOf(FeedPerson::class, $author);
+		$this->assertEquals($name, $author->name);
+		$this->assertEquals($email, $author->email);
+	}
+
+	/**
+	 * Tests the FeedEntry::__set method with an invalid argument for author.
+	 *
+	 * @return  void
+	 *
+	 * @expectedException  InvalidArgumentException
+	 * @since              3.1.4
+	 */
+	public function testSetAuthorWithInvalidAuthor()
+	{
+		$this->feedEntry->author = 'Jack Sprat';
+	}
+
+	/**
+	 * Tests the FeedEntry::__set method with an invalid argument for author.
+	 *
+	 * @return  void
+	 *
+	 * @expectedException  InvalidArgumentException
+	 * @since              3.1.4
+	 */
+	public function testSetSourceWithInvalidSource()
+	{
+		$this->feedEntry->source = 'Outer Space';
+	}
+
+	/**
+	 * Tests the FeedEntry::__set method with a disallowed property.
+	 *
+	 * @return  void
+	 *
+	 * @expectedException  InvalidArgumentException
+	 * @since              3.1.4
+	 */
+	public function testSetCategoriesWithInvalidProperty()
+	{
+		$this->feedEntry->categories = 'Can\'t touch this';
+	}
+
+	/**
+	 * Tests the FeedEntry::__set method with a typical property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testMagicSetter()
+	{
+		$value = 'test';
+		$this->feedEntry->testValue = $value;
+
+		$this->assertEquals($value, $this->feedEntry->testValue);
+	}
+
+	/**
+	 * Tests the FeedEntry::addCategory method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testAddSingleCategory()
+	{
+		$name = 'category';
+		$uri = 'http://www.example.com';
+		$this->feedEntry->addCategory($name, $uri);
+
+		$categories = $this->feedEntry->categories;
+		$this->assertCount(1, $categories);
+		$this->assertArrayHasKey($name, $categories);
+		$this->assertEquals($uri, $categories[$name]);
+	}
+
+	/**
+	 * Tests the FeedEntry::addCategory method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testAddMultipleCategories()
+	{
+		$categories = [
+			['name' => 'category1', 'uri' => 'http://www.example1.com'],
+			['name' => 'category2', 'uri' => 'http://www.example2.com'],
+			['name' => 'category3', 'uri' => 'http://www.example3.com'],
+		];
+
+		foreach ($categories as $category)
+		{
+			$this->feedEntry->addCategory($category['name'], $category['uri']);
+		}
+
+		$feedCategories = $this->feedEntry->categories;
+		$this->assertCount(3, $feedCategories);
+		foreach ($categories as $category)
+		{
+			$this->assertArrayHasKey($category['name'], $feedCategories);
+			$this->assertEquals($category['uri'], $feedCategories[$category['name']]);
+		}
+	}
+
+	/**
+	 * Tests the FeedEntry::addContributor method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testAddNewContributor()
+	{
+		$name = 'Dennis Ritchie';
+		$email = 'dennis.ritchie@example.com';
+
+		$this->feedEntry->addContributor($name, $email);
+
+		$contributors = $this->feedEntry->contributors;
+		$this->assertCount(1, $contributors);
+		$this->assertEquals($name, $contributors[0]->name);
+		$this->assertEquals($email, $contributors[0]->email);
+	}
+
+	/**
+	 * Tests the FeedEntry::addContributor method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testAddExistingContributor()
+	{
+		$name = 'Dennis Ritchie';
+		$email = 'dennis.ritchie@example.com';
+
+		$this->feedEntry->addContributor($name, $email);
+		$this->feedEntry->addContributor($name, $email);
+
+		$contributors = $this->feedEntry->contributors;
+		$this->assertCount(1, $contributors);
+		$this->assertEquals($name, $contributors[0]->name);
+		$this->assertEquals($email, $contributors[0]->email);
+	}
+
+	/**
+	 * Tests the FeedEntry::addContributor method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testAddMultipleContributors()
+	{
+		$contributors = [
+			['name' => 'name1', 'email' => 'email1@email.com'],
+			['name' => 'name2', 'email' => 'email2@email.com'],
+			['name' => 'name3', 'email' => 'email3@email.com'],
+		];
+
+		foreach ($contributors as $contributor)
+		{
+			$this->feedEntry->addContributor($contributor['name'], $contributor['email']);
+		}
+
+		$feedContributors = $this->feedEntry->contributors;
+		$this->assertCount(3, $feedContributors);
+		foreach ($contributors as $index => $contributor)
+		{
+			$this->assertEquals($contributor['name'], $feedContributors[$index]->name);
+			$this->assertEquals($contributor['email'], $feedContributors[$index]->email);
+		}
+	}
+
+	/**
+	 * Tests FeedEntry->addLink()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testAddNewLink()
+	{
+		$link = 'http://domain.com/path/to/resource';
+		$feedLink = new FeedLink($link);
+
+		$this->feedEntry->addLink($feedLink);
+
+		$feedLinks = $this->feedEntry->links;
+		$this->assertCount(1, $feedLinks);
+		$this->assertEquals($link, $feedLinks[0]->uri);
+	}
+
+	/**
+	 * Tests FeedEntry->addLink()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testAddExistingLink()
+	{
+		$link = 'http://domain.com/path/to/resource';
+		$feedLink = new FeedLink($link);
+
+		$this->feedEntry->addLink($feedLink);
+		$this->feedEntry->addLink($feedLink);
+
+		$feedLinks = $this->feedEntry->links;
+		$this->assertCount(1, $feedLinks);
+		$this->assertEquals($link, $feedLinks[0]->uri);
+	}
+
+	/**
+	 * Tests the FeedEntry::removeCategory method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testRemoveCategory()
+	{
+		$name = 'category';
+		$uri = 'http://www.example.com';
+
+		$this->feedEntry->addCategory($name, $uri);
+		$this->feedEntry->removeCategory($name);
+
+		$categories = $this->feedEntry->categories;
+		$this->assertCount(0, $categories);
+		$this->assertArrayNotHasKey($name, $categories);
+	}
+
+	/**
+	 * Tests the FeedEntry::removeContributor method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testRemoveContributor()
+	{
+		$name = 'Dennis Ritchie';
+		$email = 'dennis.ritchie@example.com';
+
+		$feedPerson = new FeedPerson($name, $email);
+
+		$this->feedEntry->addContributor($name, $email);
+		$this->feedEntry->removeContributor($feedPerson);
+
+		$this->assertCount(0, $this->feedEntry->contributors);
+	}
+
+	/**
+	 * Tests FeedEntry->removeLink()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testRemoveLink()
+	{
+		$link = 'http://domain.com/path/to/resource';
+		$feedLink = new FeedLink($link);
+
+		$this->feedEntry->addLink($feedLink);
+		$this->feedEntry->removeLink($feedLink);
+
+		$this->assertCount(0, $this->feedEntry->links);
+	}
+
+	/**
+	 * Tests the FeedEntry::setAuthor method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testSetAuthor()
+	{
+		$name = 'name';
+		$email = 'email@email.com';
+		$uri = 'http://example.com';
+		$type = 'some type';
+
+		$this->feedEntry->setAuthor($name, $email, $uri, $type);
+
+		$author = $this->feedEntry->author;
+		$this->assertInstanceOf(FeedPerson::class, $author);
+		$this->assertEquals($name, $author->name);
+		$this->assertEquals($email, $author->email);
+		$this->assertEquals($uri, $author->uri);
+		$this->assertEquals($type, $author->type);
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Feed/FeedFactoryTest.php b/tests/Unit/Libraries/Cms/Feed/FeedFactoryTest.php
new file mode 100644
index 0000000000000..4b8627ff510bf
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Feed/FeedFactoryTest.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Feed
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Feed;
+
+use InvalidArgumentException;
+use Joomla\CMS\Feed\FeedFactory;
+use Joomla\CMS\Feed\FeedParser;
+use Joomla\Tests\Unit\UnitTestCase;
+use ReflectionClass;
+use XMLReader;
+
+/**
+ * Test class for FeedFactory.
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Feed
+ */
+class FeedFactoryTest extends UnitTestCase
+{
+	/**
+	 * @var  FeedFactory
+	 */
+	private $feedFactory;
+
+	/**
+	 * Setup the tests.
+	 */
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->feedFactory = new FeedFactory;
+	}
+
+	/**
+	 * Method to tear down whatever was set up before the test.
+	 */
+	protected function tearDown()
+	{
+		unset($this->feedFactory);
+
+		parent::tearDown();
+	}
+
+	/**
+	 * Tests FeedFactory::getFeed().
+	 */
+	public function testGetFeed()
+	{
+		$this->markTestSkipped('We cant unit test FeedFactory::getFeed() at the moment, because it uses filesystem (XMLReader::open) and http service. It should be refactored and covered with integration tests.');
+	}
+
+	/**
+	 *  Tests FeedFactory::getParsers().
+	 */
+	public function testGetDefaultParsers()
+	{
+		$defaultParsers = $this->feedFactory->getParsers();
+		$this->assertCount(2, $defaultParsers);
+		$this->assertArrayHasKey('rss', $defaultParsers);
+		$this->assertArrayHasKey('feed', $defaultParsers);
+	}
+
+	/**
+	 * Tests FeedFactory::registerParser()
+	 */
+	public function testRegisterParser()
+	{
+		$tagName = 'parser-mock';
+		$parseMock = $this->createMock(FeedParser::class);
+		$defaultParserCount = count($this->feedFactory->getParsers());
+
+		$this->feedFactory->registerParser($tagName, get_class($parseMock));
+
+		$feedParsers = $this->feedFactory->getParsers();
+		$this->assertCount($defaultParserCount + 1, $feedParsers);
+		$this->assertArrayHasKey($tagName, $feedParsers);
+	}
+
+	/**
+	 * Tests FeedFactory::registerParser()
+	 *
+	 * @expectedException  InvalidArgumentException
+	 */
+	public function testRegisterParserWithInvalidClass()
+	{
+		$this->feedFactory->registerParser('does-not-exist', 'NotExistingClass');
+	}
+
+	/**
+	 * Tests FeedFactory::registerParser()
+	 *
+	 * @expectedException  InvalidArgumentException
+	 */
+	public function testRegisterParserWithInvalidTag()
+	{
+		$parseMock = $this->createMock(FeedParser::class);
+		$this->feedFactory->registerParser('42tag', get_class($parseMock));
+	}
+
+	/**
+	 * Tests FeedFactory::_fetchFeedParser()
+	 */
+	public function testFetchFeedParser()
+	{
+		$tagName = 'parser-mock';
+		$xmlReaderMock = $this->createMock(XMLReader::class);
+		$parseMock = $this->createMock(FeedParser::class);
+		$this->feedFactory->registerParser($tagName, get_class($parseMock));
+
+		// Use reflection to test private method
+		$reflectionClass = new ReflectionClass($this->feedFactory);
+		$method = $reflectionClass->getMethod('_fetchFeedParser');
+		$method->setAccessible(true);
+		$parser = $method->invoke($this->feedFactory, $tagName, $xmlReaderMock);
+
+		$this->assertInstanceOf(FeedParser::class, $parser);
+		$this->assertSame(get_class($parseMock), get_class($parser));
+	}
+
+	/**
+	 * Tests FeedFactory::_fetchFeedParser()
+	 *
+	 * @expectedException  LogicException
+	 */
+	public function testFetchFeedParserWithInvalidTag()
+	{
+		$xmlReaderMock = $this->createMock(XMLReader::class);
+
+		// Use reflection to test private method
+		$reflectionClass = new ReflectionClass($this->feedFactory);
+		$method = $reflectionClass->getMethod('_fetchFeedParser');
+		$method->setAccessible(true);
+		$method->invoke($this->feedFactory, 'not-existing', $xmlReaderMock);
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Feed/FeedLinkTest.php b/tests/Unit/Libraries/Cms/Feed/FeedLinkTest.php
new file mode 100644
index 0000000000000..6e7dd1894261b
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Feed/FeedLinkTest.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Feed
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Feed;
+
+use InvalidArgumentException;
+use Joomla\CMS\Feed\FeedLink;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for FeedLink.
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Feed
+ * @since       3.1.4
+ */
+class FeedLinkTest extends UnitTestCase
+{
+	/**
+	 * Tests the FeedLink::__construct() method with invalid length.
+	 *
+	 * @return  void
+	 *
+	 * @expectedException  InvalidArgumentException
+	 * @since              3.1.4
+	 */
+	public function testConstructWithInvalidLength()
+	{
+		new FeedLink('URI', 'self', 'application/x-pdf', 'en-GB', 'My Link', 'foobar');
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Feed/FeedParserTest.php b/tests/Unit/Libraries/Cms/Feed/FeedParserTest.php
new file mode 100644
index 0000000000000..be3ec1765d109
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Feed/FeedParserTest.php
@@ -0,0 +1,545 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Feed
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Feed;
+
+use Joomla\CMS\Feed\Feed;
+use Joomla\CMS\Feed\FeedEntry;
+use Joomla\CMS\Feed\FeedParser;
+use Joomla\CMS\Feed\Parser\NamespaceParserInterface;
+use Joomla\Tests\Unit\UnitTestCase;
+use ReflectionClass;
+use SimpleXMLElement;
+use XMLReader;
+
+/**
+ * Test class for FeedParser.
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Feed
+ * @since       3.1.4
+ */
+class FeedParserTest extends UnitTestCase
+{
+	/**
+	 * Tests FeedParser::parse()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testParse()
+	{
+		$xml       = '<root><tag>something</tag></root>';
+		$xmlReader = $this->getXmlReader($xml, 'tag');
+		$parser    = new FeedParserStub($xmlReader);
+
+		$feed = $parser->parse();
+
+		$this->assertInstanceOf(Feed::class, $feed);
+		$this->assertEquals(1, $parser->getInitializeCalledCounter());
+
+		// Cleanup
+		$xmlReader->close();
+	}
+
+	/**
+	 * Tests FeedParser::parse() with processing a custom element.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testParseCustomElement()
+	{
+		$content   = 'test';
+		$xml       = "<root><custom>$content</custom></root>";
+		$xmlReader = $this->getXmlReader($xml, 'custom');
+		$parser    = new FeedParserStub($xmlReader);
+
+		$parser->parse();
+
+		$handleCustomCalledWith = $parser->getHandleCustomCalledWith();
+		$this->assertCount(1, $handleCustomCalledWith);
+		$this->assertInstanceOf(Feed::class, $handleCustomCalledWith[0]['feed']);
+		$this->assertEquals($content, $handleCustomCalledWith[0]['el'][0]);
+
+		// Cleanup
+		$xmlReader->close();
+	}
+
+	/**
+	 * Tests FeedParser::parse() with processing a namespace.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testParseNamespaceElement()
+	{
+		$content = 'test';
+		$prefix = 'custom';
+		$xml = "<root xmlns:$prefix='http://namespace'><$prefix:content>$content</$prefix:content></root>";
+		$xmlReader = $this->getXmlReader($xml, $prefix . ':content');
+		$namespaceMock = $this->createMock(NamespaceParserInterface::class);
+		$namespaceMock
+			->expects($this->once())
+			->method('processElementForFeed')
+			->with(
+				$this->isInstanceOf(Feed::class),
+				$this->callback(function ($value) use ($content) {
+					return $value instanceof SimpleXMLElement && (string) $value[0] === $content;
+				}));
+
+		$parser = new FeedParserStub($xmlReader);
+		$parser->registerNamespace($prefix, $namespaceMock);
+		$parser->parse();
+
+		// Cleanup
+		$xmlReader->close();
+	}
+
+	/**
+	 * Tests FeedParser::parse() for unregistered namespace.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testParseDetectsUnregisteredNamespace()
+	{
+		$content = 'test';
+		$prefix = 'unregistered';
+		$xml = "<root xmlns:$prefix='http://namespace'><$prefix:content>$content</$prefix:content></root>";
+		$xmlReader = $this->getXmlReader($xml, "$prefix:content");
+
+		$parser = new FeedParserStub($xmlReader);
+		$parser->parse();
+
+		$this->assertAttributeNotEmpty( 'namespaces', $parser);
+		$this->assertArrayHasKey($prefix, static::readAttribute($parser, 'namespaces'));
+		$this->assertInstanceOf(FeedParserStubUnregistered::class, static::readAttribute($parser, 'namespaces')[$prefix]);
+
+		// Cleanup
+		$xmlReader->close();
+	}
+
+	/**
+	 * Tests FeedParser::parse() with processing an entry element.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testParseElementWithEntry()
+	{
+		$xml       = "<root><entry></entry></root>";
+		$xmlReader = $this->getXmlReader($xml, 'entry');
+		$parser    = new FeedParserStub($xmlReader);
+
+		$feed = $parser->parse();
+
+		$this->assertInstanceOf(Feed::class, $feed);
+		$this->assertEquals(1, $feed->count());
+		$processFeedEntryCalledWith = $parser->getProcessFeedEntryCalledWith();
+		$this->assertCount(1, $processFeedEntryCalledWith);
+		$this->assertInstanceOf(FeedEntry::class, $processFeedEntryCalledWith[0]['entry']);
+		$this->assertEquals('', $processFeedEntryCalledWith[0]['el'][0]);
+
+		// Cleanup
+		$xmlReader->close();
+	}
+
+	/**
+	 * Tests FeedParser::parse() with processing an namespaced entry element.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testParseElementWithNamespaceEntry()
+	{
+		$content = 'test';
+		$prefix = 'custom';
+		$xml = "<root xmlns:$prefix='http://namespace'><$prefix:entry></$prefix:entry></root>";
+		$xmlReader = $this->getXmlReader($xml, $prefix . ':entry');
+		$namespaceMock = $this->createMock(NamespaceParserInterface::class);
+		$namespaceMock
+			->expects($this->once())
+			->method('processElementForFeedEntry')
+			->with(
+				$this->isInstanceOf(FeedEntry::class),
+				$this->callback(function ($value) use ($content) {
+					return $value instanceof SimpleXMLElement && (string) $value[0] === '';
+				}));
+
+		$parser = new FeedParserStub($xmlReader);
+		$parser->registerNamespace($prefix, $namespaceMock);
+		$parser->parse();
+	}
+
+	/**
+	 * Tests FeedParser::registerNamespace()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testRegisterNamespace()
+	{
+		$prefix        = 'my-namespace';
+		$namespaceMock = $this->createMock(NamespaceParserInterface::class);
+		$readerMock    = $this->createMock(XMLReader::class);
+
+		$parser         = new FeedParserStub($readerMock);
+		$returnedParser = $parser->registerNamespace($prefix, $namespaceMock);
+
+		$this->assertInstanceOf(FeedParserStub::class, $returnedParser);
+		$this->assertAttributeEquals([$prefix => $namespaceMock], 'namespaces', $parser);
+	}
+
+	/**
+	 * Tests FeedParser::moveToNextElement()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testMoveToNextElement()
+	{
+		$xml = '<root><node test="first"><child>foobar</child></node><node test="second"></node></root>';
+		$xmlReader = $this->getXmlReader($xml, 'root');
+
+		$parser = new FeedParserStub($xmlReader);
+
+		// Use reflection to test protected method (its easier than testing this using the public interface)
+		$reflectionClass = new ReflectionClass($parser);
+		$method = $reflectionClass->getMethod('moveToNextElement');
+		$method->setAccessible(true);
+
+		// Move to next element
+		$method->invoke($parser);
+
+		// Move to the next element, which should be <node test="first">.
+		$this->assertEquals('node', $xmlReader->name);
+		$this->assertEquals('first', $xmlReader->getAttribute('test'));
+
+		// Move to next element
+		$method->invoke($parser);
+
+		// Move to the next element, which should be <child> with a data value of "foobar".
+		$this->assertEquals('child', $xmlReader->name);
+		$this->assertEquals('foobar', $xmlReader->readString());
+
+		// Move to next element
+		$method->invoke($parser);
+
+		// Move to the next element, which should be <node test="second">.
+		$this->assertEquals('node', $xmlReader->name);
+		$this->assertEquals('second', $xmlReader->getAttribute('test'));
+
+		// Move to next element and assert that it returns false
+		$this->assertFalse($method->invoke($parser));
+	}
+
+	/**
+	 * Tests FeedParser::moveToNextElement() when using the name attribute.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testMoveToNextElementByName()
+	{
+		$xml = '<root><node test="first"><child>foobar</child></node><node test="second"></node></root>';
+		$xmlReader = $this->getXmlReader($xml, 'root');
+
+		$parser = new FeedParserStub($xmlReader);
+
+		// Use reflection to test protected method (its easier than testing this using the public interface)
+		$reflectionClass = new ReflectionClass($parser);
+		$method = $reflectionClass->getMethod('moveToNextElement');
+		$method->setAccessible(true);
+
+		// Move to next element
+		$method->invoke($parser, 'node');
+
+		// Move to the next <node> element, which should be <node test="first">.
+		$this->assertEquals('node', $xmlReader->name);
+		$this->assertEquals('first', $xmlReader->getAttribute('test'));
+
+		// Move to the next <node> element, which should be <node test="second">.
+		$method->invoke($parser, 'node');
+		$this->assertEquals('node', $xmlReader->name);
+		$this->assertEquals('second', $xmlReader->getAttribute('test'));
+	}
+
+	/**
+	 * Tests FeedParser::moveToClosingElement()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testMoveToClosingElement()
+	{
+		$xml = '<root><child>foobar</child></root>';
+		$xmlReader = $this->getXmlReader($xml, 'root');
+
+		$parser = new FeedParserStub($xmlReader);
+
+		// Use reflection to test protected method (its easier than testing this using the public interface)
+		$reflectionClass = new ReflectionClass($parser);
+		$method = $reflectionClass->getMethod('moveToClosingElement');
+		$method->setAccessible(true);
+
+		// Move to next element
+		$method->invoke($parser);
+
+		// Move to the closing element, which should be </root>.
+		$this->assertEquals(XMLReader::END_ELEMENT, $xmlReader->nodeType);
+		$this->assertEquals('root', $xmlReader->name);
+	}
+
+	/**
+	 * Tests FeedParser::moveToClosingElement() with internal elements.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testMoveToClosingElementWithInternalElements()
+	{
+		// Set the XML for the internal reader and move the stream to the first <node> element.
+		$xml = '<root><node test="first"><child>foobar</child></node><node test="second"></node></root>';
+		$xmlReader = $this->getXmlReader($xml, 'node');
+
+		$parser = new FeedParserStub($xmlReader);
+
+		// Use reflection to test protected method (its easier than testing this using the public interface)
+		$reflectionClass = new ReflectionClass($parser);
+		$method = $reflectionClass->getMethod('moveToClosingElement');
+		$method->setAccessible(true);
+
+		// Move to next element
+		$method->invoke($parser);
+
+		// Ensure that the current node is closing element
+		$this->assertEquals(XMLReader::END_ELEMENT, $xmlReader->nodeType);
+		$this->assertEquals('node', $xmlReader->name);
+	}
+
+	/**
+	 * Tests FeedParser::moveToClosingElement() with self-closing tags.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testMoveToClosingElementWithSelfClosingTag()
+	{
+		// Set the XML for the internal reader and move the stream to the first <node> element.
+		$xml = '<root><node test="first" /><node test="second"></node></root>';
+		$xmlReader = $this->getXmlReader($xml, 'node');
+
+		$parser = new FeedParserStub($xmlReader);
+
+		// Use reflection to test protected method (its easier than testing this using the public interface)
+		$reflectionClass = new ReflectionClass($parser);
+		$method = $reflectionClass->getMethod('moveToClosingElement');
+		$method->setAccessible(true);
+
+		// Move to closing element
+		$method->invoke($parser);
+
+		// Move to the closing element, which should be </node>.
+		$this->assertEquals(true, $xmlReader->isEmptyElement);
+		$this->assertEquals('node', $xmlReader->name);
+	}
+
+	/**
+	 * Helper function which gets an instance of xml reader
+	 *
+	 * @param $xml
+	 * @param $moveTo
+	 *
+	 * @return XMLReader
+	 *
+	 * @since 4.0
+	 */
+	protected function getXmlReader($xml, $moveTo): XMLReader
+	{
+		// Its hard to mock the xml reader stream, so we use the real object here (but set xml directly)
+		$xmlReader = new XMLReader;
+
+		// Set the XML for the internal reader and move the stream to the element.
+		$xmlReader->XML($xml);
+
+		do
+		{
+			$xmlReader->read();
+		}
+		while ($xmlReader->name != $moveTo && $xmlReader->nodeType != XMLReader::END_ELEMENT);
+
+		return $xmlReader;
+	}
+}
+
+/**
+ * Class FeedParserStub
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Feed
+ * @since       4.0
+ */
+class FeedParserStub extends FeedParser
+{
+	/**
+	 * Test helper flag to check that the initialize method was called
+	 *
+	 * @var  int
+	 */
+	protected $initializeCalledCounter = 0;
+
+	/**
+	 * Test helper flag to check that the process feed entry handler was called
+	 *
+	 * @var array
+	 */
+	protected $processFeedEntryCalledWith = [];
+
+	/**
+	 * Test helper flag to check that the custom element handler was called
+	 *
+	 * @var array
+	 */
+	protected $handleCustomCalledWith = [];
+
+	/**
+	 * Getter for the initialize called counter
+	 *
+	 * @return  int
+	 *
+	 * @since   4.0
+	 */
+	public function getInitializeCalledCounter(): int
+	{
+		return $this->initializeCalledCounter;
+	}
+
+	/**
+	 * Getter for the handle custom called with flag
+	 *
+	 * @return  array
+	 *
+	 * @since   4.0
+	 */
+	public function getHandleCustomCalledWith(): array
+	{
+		return $this->handleCustomCalledWith;
+	}
+
+	/**
+	 * Getter for the handle custom called with flag
+	 *
+	 * @return  array
+	 *
+	 * @since   4.0
+	 */
+	public function getProcessFeedEntryCalledWith(): array
+	{
+		return $this->processFeedEntryCalledWith;
+	}
+
+	/**
+	 * Process a feed entry
+	 *
+	 * @param FeedEntry        $entry
+	 * @param SimpleXMLElement $el
+	 *
+	 * @return void
+	 *
+	 * @since   4.0
+	 */
+	public function processFeedEntry(FeedEntry $entry, SimpleXMLElement $el)
+	{
+		$this->processFeedEntryCalledWith[] = [
+			'entry' => $entry,
+			'el'   => $el,
+		];
+	}
+
+	/**
+	 * Method to initialise the feed for parsing.  If child parsers need to detect versions or other
+	 * such things this is where you'll want to implement that logic.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	protected function initialise()
+	{
+		$this->initializeCalledCounter++;
+	}
+
+	/**
+	 * Custom element handler
+	 *
+	 * @param Feed             $feed
+	 * @param SimpleXMLElement $el
+	 *
+	 * @return void
+	 *
+	 * @since   4.0
+	 */
+	protected function handleCustom(Feed $feed, SimpleXMLElement $el)
+	{
+		$this->handleCustomCalledWith[] = [
+			'feed' => $feed,
+			'el'   => $el,
+		];
+	}
+}
+
+/**
+ * Class FeedParserStubUnregistered
+ *
+ * Helper Class to test an unregistered namespace
+ */
+class FeedParserStubUnregistered implements NamespaceParserInterface
+{
+
+	/**
+	 * Method to handle an element for the feed given that a certain namespace is present.
+	 *
+	 * @param   Feed              $feed The Feed object being built from the parsed feed.
+	 * @param   SimpleXMLElement $el   The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function processElementForFeed(Feed $feed, SimpleXMLElement $el)
+	{
+	}
+
+	/**
+	 * Method to handle the feed entry element for the feed given that a certain namespace is present.
+	 *
+	 * @param   FeedEntry $entry The FeedEntry object being built from the parsed feed entry.
+	 * @param   SimpleXMLElement          $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function processElementForFeedEntry(FeedEntry $entry, SimpleXMLElement $el)
+	{
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Feed/FeedTest.php b/tests/Unit/Libraries/Cms/Feed/FeedTest.php
new file mode 100644
index 0000000000000..d761449f141aa
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Feed/FeedTest.php
@@ -0,0 +1,537 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Feed
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Feed;
+
+use InvalidArgumentException;
+use Joomla\CMS\Date\Date;
+use Joomla\CMS\Feed\Feed;
+use Joomla\CMS\Feed\FeedEntry;
+use Joomla\CMS\Feed\FeedPerson;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for Feed.
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Feed
+ * @since       3.1.4
+ */
+class FeedTest extends UnitTestCase
+{
+	/**
+	 * @var    Feed
+	 * @since  3.1.4
+	 */
+	private $feed;
+
+	/**
+	 * Setup the tests.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->feed = new Feed;
+	}
+
+	/**
+	 * Method to tear down whatever was set up before the test.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	protected function tearDown()
+	{
+		unset($this->feed);
+
+		parent::tearDown();
+	}
+
+	/**
+	 * Tests the Feed::__get method when the property has been set to a value.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testMagicGetterWithDefaultProperty()
+	{
+		$this->assertEquals('', $this->feed->uri);
+	}
+
+
+	/**
+	 * Tests the Feed::__get method when the property has not been set to a value.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testMagicGetterWithUnknownProperty()
+	{
+		$this->assertEquals(null, $this->feed->unknown);
+	}
+
+	/**
+	 * Tests the Feed::__get method when the property has been set to a value.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testMagicGetterWithValue()
+	{
+		$value = 'test';
+		$this->feed->testValue = $value;
+
+		$this->assertEquals($value, $this->feed->testValue);
+	}
+
+	/**
+	 * Tests the Feed::__set method with updatedDate with a string.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testSetUpdatedDateWithString()
+	{
+		$this->feed->updatedDate = 'May 2nd, 1967';
+
+		$this->assertInstanceOf(Date::class, $this->feed->updatedDate);
+	}
+
+	/**
+	 * Tests the Feed::__set method with updatedDate with a JDate object.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testMagicSetUpdatedDateWithDateObject()
+	{
+		$date = new Date('October 12, 2011');
+		$this->feed->updatedDate = $date;
+
+		$updatedDate = $this->feed->updatedDate;
+		$this->assertInstanceOf(Date::class, $updatedDate);
+		$this->assertSame($date, $updatedDate);
+	}
+
+	/**
+	 * Tests the Feed::setAuthor method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testSetAuthorWithNameAndEmail()
+	{
+		$name = 'Brian Kernighan';
+		$email = 'brian@example.com';
+
+		$this->feed->setAuthor($name, $email);
+
+		$author = $this->feed->author;
+		$this->assertInstanceOf(FeedPerson::class, $author);
+		$this->assertEquals($name, $author->name);
+		$this->assertEquals($email, $author->email);
+	}
+
+	/**
+	 * Tests the Feed::__set method with a person object.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testSetAuthorWithPerson()
+	{
+		$name = 'Brian Kernighan';
+		$email = 'brian@example.com';
+		$person = new FeedPerson($name, $email);
+
+		$this->feed->author = $person;
+
+		$author = $this->feed->author;
+		$this->assertInstanceOf(FeedPerson::class, $author);
+		$this->assertEquals($name, $author->name);
+		$this->assertEquals($email, $author->email);
+	}
+
+	/**
+	 * Tests the Feed::__set method with an invalid argument for author.
+	 *
+	 * @return  void
+	 *
+	 * @expectedException  InvalidArgumentException
+	 * @since              3.1.4
+	 */
+	public function testSetAuthorWithInvalidAuthor()
+	{
+		$this->feed->author = 'Jack Sprat';
+	}
+
+	/**
+	 * Tests the Feed::__set method with a disallowed property.
+	 *
+	 * @return  void
+	 *
+	 * @expectedException  InvalidArgumentException
+	 * @since              3.1.4
+	 */
+	public function testSetCategoriesWithInvalidProperty()
+	{
+		$this->feed->categories = 'Can\'t touch this';
+	}
+
+	/**
+	 * Tests the Feed::__set method with a disallowed property.
+	 *
+	 * @return  void
+	 *
+	 * @expectedException  InvalidArgumentException
+	 * @since              3.1.4
+	 */
+	public function testSetContributorsWithInvalidProperty()
+	{
+		$this->feed->contributors = 'Can\'t touch this';
+	}
+
+	/**
+	 * Tests the Feed::__set method with a typical property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testMagicSetter()
+	{
+		$value = 'test';
+		$this->feed->testValue = $value;
+
+		$this->assertEquals($value, $this->feed->testValue);
+	}
+
+	/**
+	 * Tests the Feed::addCategory method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testAddSingleCategory()
+	{
+		$name = 'category';
+		$uri = 'http://www.example.com';
+		$this->feed->addCategory($name, $uri);
+
+		$categories = $this->feed->categories;
+		$this->assertCount(1, $categories);
+		$this->assertArrayHasKey($name, $categories);
+		$this->assertEquals($uri, $categories[$name]);
+	}
+
+	/**
+	 * Tests the Feed::addCategory method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testAddMultipleCategories()
+	{
+		$categories = [
+			['name' => 'category1', 'uri' => 'http://www.example1.com'],
+			['name' => 'category2', 'uri' => 'http://www.example2.com'],
+			['name' => 'category3', 'uri' => 'http://www.example3.com'],
+		];
+
+		foreach ($categories as $category)
+		{
+			$this->feed->addCategory($category['name'], $category['uri']);
+		}
+
+		$feedCategories = $this->feed->categories;
+		$this->assertCount(3, $feedCategories);
+		foreach ($categories as $category)
+		{
+			$this->assertArrayHasKey($category['name'], $feedCategories);
+			$this->assertEquals($category['uri'], $feedCategories[$category['name']]);
+		}
+	}
+
+	/**
+	 * Tests the Feed::addContributor method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testAddNewContributor()
+	{
+		$name = 'Dennis Ritchie';
+		$email = 'dennis.ritchie@example.com';
+
+		$this->feed->addContributor($name, $email);
+
+		$contributors = $this->feed->contributors;
+		$this->assertCount(1, $contributors);
+		$this->assertEquals($name, $contributors[0]->name);
+		$this->assertEquals($email, $contributors[0]->email);
+	}
+
+	/**
+	 * Tests the Feed::addContributor method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testAddExistingContributor()
+	{
+		$name = 'Dennis Ritchie';
+		$email = 'dennis.ritchie@example.com';
+
+		$this->feed->addContributor($name, $email);
+		$this->feed->addContributor($name, $email);
+
+		$contributors = $this->feed->contributors;
+		$this->assertCount(1, $contributors);
+		$this->assertEquals($name, $contributors[0]->name);
+		$this->assertEquals($email, $contributors[0]->email);
+	}
+
+	/**
+	 * Tests the Feed::addContributor method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testAddMultipleContributors()
+	{
+		$contributors = [
+			['name' => 'name1', 'email' => 'email1@email.com'],
+			['name' => 'name2', 'email' => 'email2@email.com'],
+			['name' => 'name3', 'email' => 'email3@email.com'],
+		];
+
+		foreach ($contributors as $contributor)
+		{
+			$this->feed->addContributor($contributor['name'], $contributor['email']);
+		}
+
+		$feedContributors = $this->feed->contributors;
+		$this->assertCount(3, $feedContributors);
+		foreach ($contributors as $index => $contributor)
+		{
+			$this->assertEquals($contributor['name'], $feedContributors[$index]->name);
+			$this->assertEquals($contributor['email'], $feedContributors[$index]->email);
+		}
+	}
+
+	/**
+	 * Tests the Feed::addEntry method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testAddNewEntry()
+	{
+		$feedEntry = $this->createMock(FeedEntry::class);
+
+		$this->feed->addEntry($feedEntry);
+
+		$this->assertEquals(1, $this->feed->count());
+		$this->assertEquals($feedEntry, $this->feed[0]);
+	}
+
+	/**
+	 * Tests the Feed::addEntry method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testAddExistingEntry()
+	{
+		$feedEntry = $this->createMock(FeedEntry::class);
+
+		$this->feed->addEntry($feedEntry);
+		$this->feed->addEntry($feedEntry);
+
+		$this->assertEquals(1, $this->feed->count());
+		$this->assertEquals($feedEntry, $this->feed[0]);
+	}
+
+	/**
+	 * Tests the Feed::addEntry method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testAddMultipleEntries()
+	{
+		$feedEntry1 = $this->createMock(FeedEntry::class);
+		$feedEntry2 = $this->createMock(FeedEntry::class);
+		$feedEntry2->name = 'name2';
+
+		$this->feed->addEntry($feedEntry1);
+		$this->feed->addEntry($feedEntry2);
+
+		$this->assertEquals(2, $this->feed->count());
+		$this->assertEquals($feedEntry1, $this->feed[0]);
+		$this->assertEquals($feedEntry2, $this->feed[1]);
+	}
+
+	/**
+	 * Tests the Feed::offsetExists method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testOffsetExists()
+	{
+		$feedEntry = $this->createMock(FeedEntry::class);
+
+		$this->feed->addEntry($feedEntry);
+
+		$this->assertTrue($this->feed->offsetExists(0));
+	}
+
+	/**
+	 * Tests the Feed::offsetGet method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testOffsetGet()
+	{
+		$feedEntry = $this->createMock(FeedEntry::class);
+
+		$this->feed->addEntry($feedEntry);
+
+		$this->assertEquals($feedEntry, $this->feed->offsetGet(0));
+	}
+
+	/**
+	 * Tests the Feed::offsetSet method with a string as a value -- invalid.
+	 *
+	 * @return  void
+	 *
+	 * @expectedException  InvalidArgumentException
+	 * @since              3.1.4
+	 */
+	public function testOffsetSetWithString()
+	{
+		$this->feed->offsetSet(1, 'My string');
+	}
+
+	/**
+	 * Tests the Feed::offsetSet method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testOffsetSet()
+	{
+		$feedEntry = $this->createMock(FeedEntry::class);
+
+		$this->feed->offsetSet(1, $feedEntry);
+
+		$this->assertEquals(1, $this->feed->count());
+		$this->assertEquals($feedEntry, $this->feed->offsetGet(1));
+	}
+
+	/**
+	 * Tests the Feed::offsetUnset method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testOffsetUnset()
+	{
+		$feedEntry = $this->createMock(FeedEntry::class);
+
+		$this->feed->offsetSet(10, $feedEntry);
+		$this->feed->offsetUnset(10);
+
+		$this->assertEquals(0, $this->feed->count());
+	}
+
+	/**
+	 * Tests the Feed::removeCategory method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testRemoveCategory()
+	{
+		$name = 'category';
+		$uri = 'http://www.example.com';
+
+		$this->feed->addCategory($name, $uri);
+		$this->feed->removeCategory($name);
+
+		$categories = $this->feed->categories;
+		$this->assertCount(0, $categories);
+		$this->assertArrayNotHasKey($name, $categories);
+	}
+
+	/**
+	 * Tests the Feed::removeContributor method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testRemoveContributor()
+	{
+		$name = 'Dennis Ritchie';
+		$email = 'dennis.ritchie@example.com';
+
+		$feedPerson = new FeedPerson($name, $email);
+
+		$this->feed->addContributor($name, $email);
+		$this->feed->removeContributor($feedPerson);
+
+		$this->assertCount(0, $this->feed->contributors);
+	}
+
+	/**
+	 * Tests the Feed::removeEntry method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testRemoveEntry()
+	{
+		$feedEntry = $this->createMock(FeedEntry::class);
+
+		$this->feed->addEntry($feedEntry);
+		$this->feed->removeEntry($feedEntry);
+
+		$this->assertEquals(0, $this->feed->count());
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Feed/Parser/AtomParserTest.php b/tests/Unit/Libraries/Cms/Feed/Parser/AtomParserTest.php
new file mode 100644
index 0000000000000..d59a979ebe348
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Feed/Parser/AtomParserTest.php
@@ -0,0 +1,386 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Feed
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Feed\Parser;
+
+use Joomla\CMS\Feed\Feed;
+use Joomla\CMS\Feed\FeedEntry;
+use Joomla\CMS\Feed\FeedLink;
+use Joomla\CMS\Feed\Parser\AtomParser;
+use Joomla\Tests\Unit\UnitTestCase;
+use ReflectionClass;
+use SimpleXMLElement;
+use XMLReader;
+
+/**
+ * Test class for AtomParser.
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Feed
+ * @since       3.1.4
+ */
+class AtomParserTest extends UnitTestCase
+{
+	/**
+	 * Tests AtomParser::handleAuthor()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleAuthor()
+	{
+		$author = [
+			'name' => 'John Doe',
+			'email' => 'john@doe.name',
+			'uri' => 'http://doe.name',
+		];
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<author/>');
+		$xmlElement->name = $author['name'];
+		$xmlElement->email = $author['email'];
+		$xmlElement->uri = $author['uri'];
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('setAuthor')
+			->with($author['name'], $author['email'], $author['uri']);
+
+		// Use reflection to test protected method
+		$atomParser = new AtomParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($atomParser);
+		$method = $reflectionClass->getMethod('handleAuthor');
+		$method->setAccessible(true);
+		$method->invoke($atomParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests AtomParser::handleContributor()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleContributor()
+	{
+		$contributor = [
+			'name' => 'John Doe',
+			'email' => 'john@doe.name',
+			'uri' => 'http://doe.name',
+		];
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<contributor />');
+		$xmlElement->name = $contributor['name'];
+		$xmlElement->email = $contributor['email'];
+		$xmlElement->uri = $contributor['uri'];
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('addContributor')
+			->with($contributor['name'], $contributor['email'], $contributor['uri']);
+
+		// Use reflection to test protected method
+		$atomParser = new AtomParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($atomParser);
+		$method = $reflectionClass->getMethod('handleContributor');
+		$method->setAccessible(true);
+		$method->invoke($atomParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests AtomParser::handleGenerator()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleGenerator()
+	{
+		$generator = 'Joomla';
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<generator>' . $generator . '</generator>');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('generator', $generator);
+
+		// Use reflection to test protected method
+		$atomParser = new AtomParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($atomParser);
+		$method = $reflectionClass->getMethod('handleGenerator');
+		$method->setAccessible(true);
+		$method->invoke($atomParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests AtomParser::handleId()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleId()
+	{
+		$id = 'http://domain.com/path/to/resource';
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<id>' . $id . '</id>');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('uri', $id);
+
+		// Use reflection to test protected method
+		$atomParser = new AtomParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($atomParser);
+		$method = $reflectionClass->getMethod('handleId');
+		$method->setAccessible(true);
+		$method->invoke($atomParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests AtomParser::handleLink()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleLink()
+	{
+		$href = 'http://domain.com/path/to/resource';
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<link href="' . $href . '" />');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('link', $this->callback(function ($param) use ($href) {
+				return $param instanceof FeedLink && $param->uri === $href;
+			}));
+
+		// Use reflection to test protected method
+		$atomParser = new AtomParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($atomParser);
+		$method = $reflectionClass->getMethod('handleLink');
+		$method->setAccessible(true);
+		$method->invoke($atomParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests AtomParser::handleRights()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleRights()
+	{
+		$copyright = 'All Rights Reserved.';
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<rights>' . $copyright . '</rights>');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('copyright', $copyright);
+
+		// Use reflection to test protected method
+		$atomParser = new AtomParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($atomParser);
+		$method = $reflectionClass->getMethod('handleRights');
+		$method->setAccessible(true);
+		$method->invoke($atomParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests AtomParser::handleSubtitle()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleSubtitle()
+	{
+		$subtitle = 'Lorem Ipsum ...';
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<subtitle>' . $subtitle . '</subtitle>');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('description', $subtitle);
+
+		// Use reflection to test protected method
+		$atomParser = new AtomParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($atomParser);
+		$method = $reflectionClass->getMethod('handleSubtitle');
+		$method->setAccessible(true);
+		$method->invoke($atomParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests AtomParser::handleTitle()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleTitle()
+	{
+		$title = 'My Title.';
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<title>' . $title . '</title>');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('title', $title);
+
+		// Use reflection to test protected method
+		$atomParser = new AtomParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($atomParser);
+		$method = $reflectionClass->getMethod('handleTitle');
+		$method->setAccessible(true);
+		$method->invoke($atomParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests AtomParser::handleUpdated()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleUpdated()
+	{
+		$date = '2019-01-01T00:00:00Z';
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<updated>' . $date . '</updated>');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('updatedDate', $date);
+
+		// Use reflection to test protected method
+		$atomParser = new AtomParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($atomParser);
+		$method = $reflectionClass->getMethod('handleUpdated');
+		$method->setAccessible(true);
+		$method->invoke($atomParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests AtomParser::initialise()
+	 *
+	 * @since         3.1.4
+	 */
+	public function testInitialiseSetsDefaultVersion()
+	{
+		$readerMock = $this->createMock(XMLReader::class);
+		$readerMock
+			->expects($this->once())
+			->method('getAttribute')
+			->with('version')
+			->willReturn('Some Version');
+
+		// Use reflection to test protected method
+		$atomParser = new AtomParser($readerMock);
+		$reflectionClass = new ReflectionClass($atomParser);
+		$method = $reflectionClass->getMethod('initialise');
+		$method->setAccessible(true);
+		$method->invoke($atomParser);
+
+		$this->assertAttributeEquals('1.0', 'version', $atomParser);
+	}
+
+	/**
+	 * Tests AtomParser::initialise()
+	 *
+	 * @since         3.1.4
+	 */
+	public function testInitialiseSetsOldVersion()
+	{
+		$readerMock = $this->createMock(XMLReader::class);
+		$readerMock
+			->expects($this->once())
+			->method('getAttribute')
+			->with('version')
+			->willReturn('0.3');
+
+		// Use reflection to test protected method
+		$atomParser = new AtomParser($readerMock);
+		$reflectionClass = new ReflectionClass($atomParser);
+		$method = $reflectionClass->getMethod('initialise');
+		$method->setAccessible(true);
+		$method->invoke($atomParser);
+
+		$this->assertAttributeEquals('0.3', 'version', $atomParser);
+	}
+
+	/**
+	 * Tests AtomParser::processFeedEntry()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testProcessFeedEntry()
+	{
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<entry><id>http://example.com/id</id><title>title</title><updated>August 25, 1991</updated><summary>summary</summary></entry>');
+
+		$feedEntryMock = $this->createMock(FeedEntry::class);
+		$feedEntryMock
+			->expects($this->any())
+			->method('__set')
+			->withConsecutive(
+				['uri', 'http://example.com/id'],
+				['title', 'title'],
+				['updatedDate', 'August 25, 1991'],
+				['content', 'summary']
+			);
+
+		// Use reflection to test protected method
+		$atomParser = new AtomParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($atomParser);
+		$method = $reflectionClass->getMethod('processFeedEntry');
+		$method->setAccessible(true);
+		$method->invoke($atomParser, $feedEntryMock, $xmlElement);
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Feed/Parser/RssParserTest.php b/tests/Unit/Libraries/Cms/Feed/Parser/RssParserTest.php
new file mode 100644
index 0000000000000..a139b7127507e
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Feed/Parser/RssParserTest.php
@@ -0,0 +1,641 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Feed
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Feed\Parser;
+
+use Joomla\CMS\Feed\Feed;
+use Joomla\CMS\Feed\FeedEntry;
+use Joomla\CMS\Feed\FeedLink;
+use Joomla\CMS\Feed\FeedPerson;
+use Joomla\CMS\Feed\Parser\RssParser;
+use Joomla\Tests\Unit\UnitTestCase;
+use ReflectionClass;
+use SimpleXMLElement;
+use XMLReader;
+
+/**
+ * Test class for RssParser.
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Feed
+ * @since       3.1.4
+ */
+class RssParserTest extends UnitTestCase
+{
+
+	/**
+	 * Tests RssParser::handleCategory()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleCategory()
+	{
+		$category = 'IT/Internet/Web development';
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement("<category>$category</category>");
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('addCategory')
+			->with($category, '');
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('handleCategory');
+		$method->setAccessible(true);
+		$method->invoke($rssParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests RssParser::handleCloud()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleCloud()
+	{
+		$cloud = [
+			'domain' => 'domain.com',
+			'port' => '80',
+			'path' => '/RPC',
+			'registerProcedure' => 'autoNotify',
+			'protocol' => 'xml-rpc',
+		];
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<cloud domain="' . $cloud['domain'] . '" port="' . $cloud['port'] . '" path="' . $cloud['path'] . '" registerProcedure="' . $cloud['registerProcedure'] . '" protocol="' . $cloud['protocol'] . '" />');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('cloud', $this->callback(function ($value) use ($cloud) {
+				return is_object($value)
+					&& $value->domain === $cloud['domain']
+					&& $value->port === $cloud['port']
+					&& $value->path === $cloud['path']
+					&& $value->registerProcedure ===$cloud['registerProcedure']
+					&& $value->protocol ===$cloud['protocol'];
+			}));
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('handleCloud');
+		$method->setAccessible(true);
+		$method->invoke($rssParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests RssParser::handleCopyright()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleCopyright()
+	{
+		$copyright = 'All Rights Reserved.';
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<rights>' . $copyright . '</rights>');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('copyright', $copyright);
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('handleCopyright');
+		$method->setAccessible(true);
+		$method->invoke($rssParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests RssParser::handleDescription()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleDescription()
+	{
+		$subtitle = 'Lorem Ipsum ...';
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<description>' . $subtitle . '</description>');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('description', $subtitle);
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('handleDescription');
+		$method->setAccessible(true);
+		$method->invoke($rssParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests RssParser::handleGenerator()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleGenerator()
+	{
+		$generator = 'Joomla';
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<generator>' . $generator . '</generator>');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('generator', $generator);
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('handleGenerator');
+		$method->setAccessible(true);
+		$method->invoke($rssParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests RssParser::handleImage()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleImage()
+	{
+		$image = [
+			'url' => 'http://www.w3schools.com/images/logo.gif',
+			'title' => 'W3Schools.com',
+			'link' => 'http://www.w3schools.com',
+			'description' => 'Some description',
+		];
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<image><url>' . $image['url'] . '</url><title>' . $image['title'] . '</title><link>' . $image['link'] . '</link><description>' . $image['description'] . '</description></image>');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('image', $this->callback(function ($value) use ($image) {
+				return $value instanceOf FeedLink
+					&& $value->uri === $image['url']
+					&& $value->relation === null
+					&& $value->type === 'logo'
+					&& $value->language === null
+					&& $value->title === $image['title']
+					&& $value->description === $image['description']
+					&& $value->height === ''
+					&& $value->width === '';
+			}));
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('handleImage');
+		$method->setAccessible(true);
+		$method->invoke($rssParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests RssParser::handleLanguage()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleLanguage()
+	{
+		$language = 'en-US';
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<language>' . $language . '</language>');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('language', $language);
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('handleLanguage');
+		$method->setAccessible(true);
+		$method->invoke($rssParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests RssParser::handleLastBuildDate()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleLastBuildDate()
+	{
+		$buildDate = 'Sat, 01 Jan 2011 00:00:00 UTC';
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<lastBuildDate>' . $buildDate . '</lastBuildDate>');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('updatedDate', $buildDate);
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('handleLastBuildDate');
+		$method->setAccessible(true);
+		$method->invoke($rssParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests RssParser::handleLink()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleLink()
+	{
+		$link = 'http://domain.com/path/to/resource';
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement("<link href='$link' />");
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('link', $this->callback(function ($value) use ($link) {
+				return $value instanceOf FeedLink && $value->uri === $link;
+			}));
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('handleLink');
+		$method->setAccessible(true);
+		$method->invoke($rssParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests RssParser::handleManagingEditor()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleManagingEditor()
+	{
+		$editor = [
+			'name' => 'The Editor',
+			'email' => 'editor@domain.com'
+		];
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<managingEditor>' . $editor['email'] . ' ' . $editor['name'] . '</managingEditor>');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('author', $this->callback(function ($value) use ($editor) {
+				return $value instanceOf FeedPerson
+					&& $value->name === $editor['name']
+					&& $value->email === $editor['email'];
+			}));
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('handleManagingEditor');
+		$method->setAccessible(true);
+		$method->invoke($rssParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests RssParser::handlePubDate()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandlePubDate()
+	{
+		$pubDate = 'Sat, 01 Jan 2011 00:00:00 GMT';
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<pubDate>' . $pubDate . '</pubDate>');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('publishedDate', $pubDate);
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('handlePubDate');
+		$method->setAccessible(true);
+		$method->invoke($rssParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests RssParser::handleSkipDays()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleSkipDays()
+	{
+		$skipDays = ['Saturday', 'Sunday'];
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<skipDays><day>' . $skipDays[0] . '</day><day>' . $skipDays[1] . '</day></skipDays>');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('skipDays', $skipDays);
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('handleSkipDays');
+		$method->setAccessible(true);
+		$method->invoke($rssParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests RssParser::handleSkipHours()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleSkipHours()
+	{
+		$skipHours = ['0', '10'];
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<skipHours><hour>' . $skipHours[0] . '</hour><hour>' . $skipHours[1] . '</hour></skipHours>');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('skipHours', $skipHours);
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('handleSkipHours');
+		$method->setAccessible(true);
+		$method->invoke($rssParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests RssParser::handleTitle()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleTitle()
+	{
+		$title = 'My Title.';
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement("<title>$title</title>");
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('title', $title);
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('handleTitle');
+		$method->setAccessible(true);
+		$method->invoke($rssParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests RssParser::handleTtl()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleTtl()
+	{
+		$ttl = '45';
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement("<ttl>$ttl</ttl>");
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('__set')
+			->with('ttl', (int) $ttl);
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('handleTtl');
+		$method->setAccessible(true);
+		$method->invoke($rssParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests RssParser::handleWebmaster()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testHandleWebmaster()
+	{
+		$webmaster = [
+			'name' => 'The Webmaster',
+			'email' => 'webmaster@domain.com'
+		];
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement('<webmaster>' . $webmaster['email'] . ' ' . $webmaster['name'] . '</webmaster>');
+
+		$feedMock = $this->createMock(Feed::class);
+		$feedMock
+			->expects($this->once())
+			->method('addContributor')
+			->with($webmaster['name'], $webmaster['email'], null, 'webmaster');
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('handleWebmaster');
+		$method->setAccessible(true);
+		$method->invoke($rssParser, $feedMock, $xmlElement);
+	}
+
+	/**
+	 * Tests RssParser::initialise()
+	 *
+	 * @since         3.1.4
+	 */
+	public function testInitialiseSetsVersion()
+	{
+		$version = '2.0';
+
+		$readerMock = $this->createMock(XMLReader::class);
+		$readerMock
+			->expects($this->once())
+			->method('getAttribute')
+			->with('version')
+			->willReturn($version);
+		$readerMock
+			->expects($this->any())
+			->method('read')
+			->willReturn(false);
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($readerMock);
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('initialise');
+		$method->setAccessible(true);
+		$method->invoke($rssParser);
+
+		$this->assertAttributeEquals($version, 'version', $rssParser);
+	}
+
+	/**
+	 * Tests RssParser::processFeedEntry()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.4
+	 */
+	public function testProcessFeedEntry()
+	{
+		$entry = [
+			'link' => 'http://example.com/id',
+			'title' => 'title',
+			'pubDate' => 'August 25, 1991',
+			'description' => 'description',
+			'category' => 'category',
+			'authorName' => 'Webmaster',
+			'authorEmail' => 'admin@domain.com',
+			'enclosureUrl' => 'http://www.w3schools.com/media/3d.wmv',
+			'enclosureLength' => '78645',
+			'enclosureType' => 'video/wmv',
+		];
+
+		// Its currently not possible to mock simple xml element
+		// @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+		$xmlElement = new SimpleXMLElement(
+			'<entry>
+				<link>' . $entry['link'] . '</link>
+				<title>' . $entry['title'] . '</title>
+				<pubDate>' . $entry['pubDate'] . '</pubDate>
+				<description>' . $entry['description'] . '</description>
+				<category>' . $entry['category'] . '</category>
+				<author>' . $entry['authorEmail'] . ' (' . $entry['authorName'] . ')</author>
+				<enclosure url="' . $entry['enclosureUrl'] . '" length="' . $entry['enclosureLength'] . '" type="' . $entry['enclosureType'] . '" />
+			</entry>'
+		);
+		$feedEntryMock = $this->createMock(FeedEntry::class);
+		$feedEntryMock
+			->expects($this->any())
+			->method('__set')
+			->withConsecutive(
+				['uri', $entry['link']],
+				['title', $entry['title']],
+				['publishedDate', $entry['pubDate']],
+				['updatedDate', $entry['pubDate']],
+				['content', $entry['description']],
+				['guid', ''],
+				['isPermaLink', true],
+				['comments', ''],
+				['author', $this->callback(function($value) use ($entry) {
+					return $value instanceof FeedPerson
+						&& $value->name === $entry['authorName']
+						&& $value->email === $entry['authorEmail'];
+				})]
+			);
+		$feedEntryMock
+			->expects($this->once())
+			->method('addCategory')
+			->with($entry['category'], '');
+		$feedEntryMock
+			->expects($this->once())
+			->method('addLink')
+			->with($this->callback(function($value) use ($entry) {
+				return $value instanceof FeedLink
+					&& $value->uri === $entry['enclosureUrl']
+					&& $value->type === $entry['enclosureType']
+					&& $value->length === (int) $entry['enclosureLength'];
+			}));
+
+		// Use reflection to test protected method
+		$rssParser = new RssParser($this->createMock(XMLReader::class));
+		$reflectionClass = new ReflectionClass($rssParser);
+		$method = $reflectionClass->getMethod('processFeedEntry');
+		$method->setAccessible(true);
+		$method->invoke($rssParser, $feedEntryMock, $xmlElement);
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Html/JHtmlDateTest.php b/tests/Unit/Libraries/Cms/Html/JHtmlDateTest.php
new file mode 100644
index 0000000000000..ecc88e26fdb6d
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Html/JHtmlDateTest.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Html;
+
+use JHtmlDate;
+use Joomla\CMS\Date\Date;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for JHtmlDate.
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Html
+ * @since       3.1
+ */
+class JHtmlDateTest extends UnitTestCase
+{
+	/**
+	 * Test data for the testRelative method
+	 *
+	 * @return  array
+	 *
+	 * @since   3.1
+	 */
+	public function dataTestRelative(): array
+	{
+		$now1 = new Date('now');
+		usleep(1);
+		$now2 = new Date('now');
+
+		return [
+			// Element order: result, date, unit, time
+			// result - 1 hour ago
+			[
+				'JLIB_HTML_DATE_RELATIVE_HOURS',
+				new Date('2011-10-18 11:00:00'),
+				null,
+				new Date('2011-10-18 12:00:00')
+			],
+			// Result - 10 days ago
+			[
+				'JLIB_HTML_DATE_RELATIVE_DAYS',
+				new Date('2011-10-08 12:00:00'),
+				'day',
+				new Date('2011-10-18 12:00:00')
+			],
+			// Result - 3 weeks ago
+			[
+				'JLIB_HTML_DATE_RELATIVE_WEEKS',
+				new Date('2011-09-27 12:00:00'),
+				'week',
+				new Date('2011-10-18 12:00:00')
+			],
+			// Result - 10 minutes ago
+			[
+				'JLIB_HTML_DATE_RELATIVE_MINUTES',
+				new Date('2011-10-18 11:50:00'),
+				'minute',
+				new Date('2011-10-18 12:00:00')
+			],
+			// Result - Less than a minute ago
+			[
+				'JLIB_HTML_DATE_RELATIVE_LESSTHANAMINUTE',
+				$now1,
+				null,
+				$now2
+			]
+		];
+	}
+
+	/**
+	 * Tests the JHtmlDate::relative method.
+	 *
+	 * @param   string  $result  The expected test result
+	 * @param   string  $date    The date to convert
+	 * @param   string  $unit    The optional unit of measurement to return
+	 *                            if the value of the diff is greater than one
+	 * @param   string  $time    An optional time to compare to, defaults to now
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 * @dataProvider dataTestRelative
+	 */
+	public function testRelative($result, $date, $unit = null, $time = null)
+	{
+		$this->assertEquals($result, JHtmlDate::relative($date, $unit, $time));
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Html/JHtmlNumberTest.php b/tests/Unit/Libraries/Cms/Html/JHtmlNumberTest.php
new file mode 100644
index 0000000000000..67a0ee35de0b3
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Html/JHtmlNumberTest.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Html;
+
+use JHtmlNumber;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for JHtmlNumberTest.
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Html
+ * @since       3.1
+ */
+class JHtmlNumberTest extends UnitTestCase
+{
+	/**
+	 * Test...
+	 *
+	 * @return  array
+	 *
+	 * @since   3.1
+	 */
+	public function dataTestBytes(): array
+	{
+		return [
+			// Element order: result, bytes, unit, precision
+			[
+				'1.00 b',
+				1,
+			],
+			[
+				'1.00 kB',
+				1024,
+			],
+			[
+				'1.00 MB',
+				1024 * 1024,
+			],
+			[
+				'1.00 GB',
+				1024 * 1024 * 1024,
+			],
+			[
+				'1.00 TB',
+				1024 * 1024 * 1024 * 1024,
+			],
+			[
+				'1.00 PB',
+				1024 * 1024 * 1024 * 1024 * 1024,
+			],
+			[
+				'0',
+				0,
+			],
+
+			// Test units.
+			[
+				'1.00 YB',
+				1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024,
+				'auto',
+			],
+			[
+				'1.00 YB',
+				1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024,
+				'YB',
+			],
+			[
+				'1,024.00 ZB',
+				1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024,
+				'ZB',
+			],
+			[
+				'1,048,576.00 EB',
+				1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024,
+				'EB',
+			],
+			[
+				'1.00 PB',
+				1024 * 1024 * 1024 * 1024 * 1024,
+				'PB',
+			],
+			[
+				'1,024.00 TB',
+				1024 * 1024 * 1024 * 1024 * 1024,
+				'TB',
+			],
+			[
+				'1,048,576.00 GB',
+				1024 * 1024 * 1024 * 1024 * 1024,
+				'GB',
+			],
+			[
+				'1,073,741,824.00 MB',
+				1024 * 1024 * 1024 * 1024 * 1024,
+				'MB',
+			],
+			[
+				'1,099,511,627,776.00 kB',
+				1024 * 1024 * 1024 * 1024 * 1024,
+				'kB',
+			],
+			[
+				'1,125,899,906,842,624.00 b',
+				1024 * 1024 * 1024 * 1024 * 1024,
+				'b',
+			],
+			[
+				'1.1258999068426E+15',
+				1024 * 1024 * 1024 * 1024 * 1024,
+				'',
+			],
+
+			// Test precision
+			[
+				'1.33 kB',
+				1357,
+			],
+			[
+				'1.3 kB',
+				1357,
+				null,
+				1
+			],
+			[
+				'1.33 kB',
+				1357,
+				null,
+				2
+			],
+			[
+				'1.325 kB',
+				1357,
+				null,
+				3
+			],
+			[
+				'1.3252 kB',
+				1357,
+				null,
+				4
+			],
+
+			// Test unit suffixed inputs
+			[
+				'1.00 MB',
+				'1024K',
+			],
+			[
+				'1,024.00 MB',
+				'1 GB',
+				'MB'
+			],
+			[
+				'10.50 GB',
+				'1.0752E+4 MB',
+				'GB'
+			],
+
+			// Test IEC aware input
+			[
+				'1024000',
+				'1024 KB',
+				'',
+				2,
+				true
+			],
+			[
+				'1048576',
+				'1024 KiB',
+				'',
+				2,
+				true
+			],
+
+			// Test IEC aware output with automatic unit
+			[
+				'1.00 MB',
+				1000 * 1000,
+				'auto',
+				2,
+				true
+			],
+
+			// Test automatic binary units output
+			[
+				'1.00 MiB',
+				1024 * 1024,
+				'binary',
+				2,
+				true
+			],
+			[
+				'1.00 MiB',
+				1024 * 1024,
+				'binary',
+				2,
+				false
+			],
+
+			// Test IEC aware specific unit output
+			[
+				'1,000.00 KiB',
+				'1024 KB',
+				'KiB',
+				2,
+				true
+			],
+			[
+				'1,048.58 kB',
+				'1024 KiB',
+				'kB',
+				2,
+				true
+			],
+		];
+	}
+
+	/**
+	 * Tests the JHtmlNumber::bytes method.
+	 *
+	 * @param   string   $result     The expected result to match against.
+	 * @param   string   $bytes      The number of bytes. Can be either numeric or suffixed format: 32M, 60K, 12G or 812b
+	 * @param   string   $unit       The type of unit to return, few special values are:
+	 *                               Blank string '' for no unit,
+	 *                               'auto' to choose automatically (default)
+	 *                               'binary' to choose automatically but use binary unit prefix
+	 * @param   integer  $precision  The number of digits to be used after the decimal place.
+	 * @param   bool     $iec        Whether to be aware of IEC standards. IEC prefixes are always acceptable in input.
+	 *                               When IEC is ON:  KiB = 1024 B, KB = 1000 B
+	 *                               When IEC is OFF: KiB = 1024 B, KB = 1024 B
+	 *
+	 * @return  void
+	 *
+	 * @since        3.1
+	 * @dataProvider dataTestBytes
+	 */
+	public function testBytes($result, $bytes, $unit = 'auto', $precision = 2, $iec = false)
+	{
+		$this->assertEquals($result, JHtmlNumber::bytes($bytes, $unit, $precision, $iec));
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Html/JHtmlStringTest.php b/tests/Unit/Libraries/Cms/Html/JHtmlStringTest.php
new file mode 100644
index 0000000000000..1297ba2950e46
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Html/JHtmlStringTest.php
@@ -0,0 +1,463 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Html;
+
+use JHtmlString;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Tests for JHtmlString.
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  HTML
+ * @since       3.1
+ */
+class JHtmlStringTest extends UnitTestCase
+{
+	/**
+	 * Test cases for truncate.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.1
+	 */
+	public function getTestAbridgeData(): array
+	{
+		return [
+			'No change case' => [
+				'Plain text',
+				50,
+				30,
+				'Plain text',
+			],
+			'Normal case' => [
+				'Abridges text strings over the specified character limit. The behavior will insert an ellipsis into the text.',
+				50,
+				30,
+				'Abridges text strings over the...is into the text.',
+			],
+		];
+	}
+
+	/**
+	 * Test cases for truncate.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.1
+	 */
+	public function getTestTruncateData(): array
+	{
+		return [
+			'No change case' => [
+				'Plain text',
+				0,
+				true,
+				true,
+				'Plain text',
+			],
+			'Plain text under the limit' => [
+				'Plain text',
+				100,
+				true,
+				true,
+				'Plain text',
+			],
+			'Plain text at the limit' => [
+				'Plain text',
+				10,
+				true,
+				true,
+				'Plain text',
+			],
+			'Plain text over the limit by two words' => [
+				'Plain text test',
+				7,
+				true,
+				true,
+				'Plain...',
+			],
+			'Plain text over the limit by one word' => [
+				'Plain text test',
+				14,
+				true,
+				true,
+				'Plain text...',
+			],
+			'Plain text over the limit with short trailing words' => [
+				'Plain text a b c d',
+				13,
+				true,
+				true,
+				'Plain text...',
+			],
+			'Plain text over the limit splitting first word' => [
+				'Plain text',
+				3,
+				false,
+				true,
+				'Pla...',
+			],
+			'Plain text with word split' => [
+				'Plain split-less',
+				7,
+				false,
+				false,
+				'Plain s...',
+			],
+			'Plain html under the limit' => [
+				'<span>Plain text</span>',
+				100,
+				true,
+				true,
+				'<span>Plain text</span>',
+			],
+			'Plain html at the limit' => [
+				'<span>Plain text</span>',
+				23,
+				true,
+				true,
+				'<span>Plain text</span>',
+			],
+			'Plain html over the limit' => [
+				'<span>Plain text</span>',
+				22,
+				true,
+				true,
+				'<span>Plain</span>...',
+			],
+			// The tags by themselves make the string too long.
+			'Plain html over the limit by one word' => [
+				'<span>Plain text</span>',
+				12,
+				true,
+				true,
+				'...',
+			],
+			// TODO: Check these tests: 'Plain html over the limit splitting first word' (duplicate keys, only the last of the duplicates gets executed)
+			// Don't return invalid HTML
+			'Plain html over the limit splitting first word' => [
+				'<span>Plain text</span>',
+				1,
+				false,
+				true,
+				'...',
+			],
+			// TODO: Check these tests: 'Plain html over the limit splitting first word' (duplicate keys, only the last of the duplicates gets executed)
+			// Don't return invalid HTML
+			'Plain html over the limit splitting first word' => [
+				'<span>Plain text</span>',
+				4,
+				false,
+				true,
+				'...',
+			],
+			'Complex html over the limit' => [
+				'<div><span><i>Plain</i> <b>text</b> foo</span></div>',
+				37,
+				true,
+				true,
+				'<div><span><i>Plain</i> <b>text</b></span></div>...',
+			],
+			'Complex html over the limit 2' => [
+				'<div><span><i>Plain</i> <b>text</b> foo</span></div>',
+				38,
+				true,
+				true,
+				'<div><span><i>Plain</i> <b>text</b></span></div>...',
+			],
+			'HTML not allowed, split words' => [
+				'<div><span><i>Plain</i> <b>text</b> foo</span></div>',
+				8,
+				false,
+				false,
+				'Plain te...',
+			],
+			// TODO: Check these tests: 'HTML not allowed, no split' (duplicate keys, only the last of the duplicates gets executed)
+			'HTML not allowed, no split' => [
+				'<div><span><i>Plain</i> <b>text</b> foo</span></div>',
+				4,
+				true,
+				false,
+				'...',
+			],
+			'First character is < with a maximum length of 1' => [
+				'<div><span><i>Plain</i> <b>text</b> foo</span></div>',
+				1,
+				true,
+				false,
+				'...',
+			],
+			// TODO: Check these tests: 'HTML not allowed, no split' (duplicate keys, only the last of the duplicates gets executed)
+			'HTML not allowed, no split' => [
+				'<div><span><i>Plain</i> <b>text</b> foo</span></div>',
+				5,
+				true,
+				false,
+				'...',
+			],
+			'Text is the same as maxLength, no split, HTML allowed' => [
+				'<div><span><i>Plain</i></span></div>',
+				5,
+				true,
+				true,
+				'...',
+			],
+			// TODO: Check these tests: 'HTML not allowed, no split' (duplicate keys, only the last of the duplicates gets executed)
+			'HTML not allowed, no split' => [
+				'<div><span><i>Plain</i></span></div>',
+				5,
+				true,
+				false,
+				'Plain',
+			],
+			'Do not split within a tag' => [
+				'Some text is <div class="test"><span><i>Plain</i></span></div>',
+				20,
+				true,
+				true,
+				'Some text is...',
+			],
+
+		];
+	}
+
+	/**
+	 * Test cases for complex truncate.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.1
+	 */
+	public function getTestTruncateComplexData(): array
+	{
+		return [
+
+			'No change case' => [
+				'Plain text',
+				10,
+				true,
+				'Plain text'
+			],
+			'Plain text under the limit' => [
+				'Plain text',
+				100,
+				true,
+				'Plain text'
+			],
+			'Plain text at the limit' => [
+				'Plain text',
+				10,
+				true,
+				'Plain text'
+			],
+			'Plain text over the limit by two words' => [
+				'Plain text test',
+				6,
+				true,
+				'...'
+			],
+			'Plain text over the limit by one word' => [
+				'Plain text test',
+				13,
+				true,
+				'Plain text...'
+			],
+			'Plain text over the limit with short trailing words' => [
+				'Plain text a b c d',
+				13,
+				true,
+				'Plain text...'
+			],
+			'Plain text over the limit splitting first word' => [
+				'Plain text',
+				3,
+				false,
+				'...'
+			],
+			'Plain text with word split' => [
+				'Plain split-less',
+				7,
+				true,
+				'Plain...'
+			],
+			'Plain text under a short limit' => [
+				'Hi',
+				3,
+				true,
+				'Hi'
+			],
+			'Plain text with length 1 and a limit of 1' => [
+				'H',
+				1,
+				true,
+				'H'
+			],
+			'Plain html under the limit' => [
+				'<span>Plain text</span>',
+				100,
+				true,
+				'<span>Plain text</span>'
+			],
+			'Plain html at the limit' => [
+				'<span>Plain text</span>',
+				23,
+				true,
+				'<span>Plain text</span>'
+			],
+			'Plain html over the limit but under the text limit' => [
+				'<span>Plain text</span>',
+				22,
+				true,
+				'<span>Plain text</span>'
+			],
+
+			'Plain html over the limit by one word' => [
+				'<span>Plain text</span>',
+				8,
+				true,
+				'<span>Plain</span>...'
+			],
+			// TODO: Check these tests: 'Plain html over the limit splitting first word' (duplicate keys, only the last of the duplicates gets executed)
+			// TODO: Check this test: When the key is renamed and the test runs, it fails.
+			'Plain html over the limit splitting first word' => [
+				'<span>Plain text</span>',
+				4,
+				false,
+				'<span>P</span>...'
+			],
+			// TODO: Check these tests: 'Plain html over the limit splitting first word' (duplicate keys, only the last of the duplicates gets executed)
+			'Plain html over the limit splitting first word' => [
+				'<span>Plain text</span>',
+				1,
+				false,
+				'<span></span>...'
+			],
+			'Complex html over the limit but under the text limit' => [
+				'<div><span><i>Plain</i> <b>text</b> foo</span></div>',
+				37,
+				true,
+				'<div><span><i>Plain</i> <b>text</b> foo</span></div>'
+			],
+			'Complex html over the limit 2' => [
+				'<div><span><i>Plain</i> <b>text</b> foo</span></div>',
+				38,
+				true,
+				'<div><span><i>Plain</i> <b>text</b> foo</span></div>'
+			],
+			'Split words' => [
+				'<div><span><i>Plain</i> <b>text</b> foo</span></div>',
+				8,
+				false,
+				'<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>...'
+			],
+			'First character is < with a maximum length of 1, no split' => [
+				'<div><span><i>Plain</i> <b>text</b> foo</span></div>',
+				1,
+				true,
+				'<div></div>...'
+			],
+			'First character is < with a maximum length of 1, split' => [
+				'<div><span><i>Plain</i> <b>text</b> foo</span></div>',
+				1,
+				false,
+				'<div></div>...'
+			],
+			'Text is the same as maxLength, Complex HTML, no split' => [
+				'<div><span><i>Plain</i></span></div>',
+				5,
+				true,
+				'<div><span><i>Plain</i></span></div>'
+			],
+			'Text is all HTML' => [
+				'<img src="myimage.jpg" />',
+				5,
+				true,
+				'<img src="myimage.jpg" />'
+			],
+			'Text with no spaces, split, maxlength 3' => [
+				'thisistextwithnospace',
+				3,
+				false,
+				'...'
+			],
+			// From issue tracker, was creating infinite loop
+			'Complex test from issue tracker' => [
+				'<p class="mod-articles-category-introtext"><em>Bestas Review Magazine</em>' .
+				' featured <a href="http://viewer.zmags.com/publication/a1b0fbb9#/a1b0fbb9/28">something</a> else</p>',
+				60,
+				false,
+				'<p class="mod-articles-category-introtext"><em>Bestas Review Magazine</em> ' .
+				'featured <a href="http://viewer.zmags.com/publication/a1b0fbb9#/a1b0fbb9/28">something</a> else</p>'
+			],
+		];
+	}
+
+	/**
+	 * Tests the JHtmlString::abridge method.
+	 *
+	 * @param   string   $text      The text to truncate.
+	 * @param   integer  $length    The maximum length of the text.
+	 * @param   integer  $intro     The maximum length of the intro text.
+	 * @param   string   $expected  The expected result.
+	 *
+	 * @return  void
+	 *
+	 * @since         3.1
+	 * @dataProvider  getTestAbridgeData
+	 */
+	public function testAbridge($text, $length, $intro, $expected)
+	{
+		$this->assertEquals($expected, JHtmlString::abridge($text, $length, $intro));
+	}
+
+	/**
+	 * Tests the JHtmlString::truncate method.
+	 *
+	 * @param   string   $text         The text to truncate.
+	 * @param   integer  $length       The maximum length of the text.
+	 * @param   boolean  $noSplit      Don't split a word if that is where the cutoff occurs (default: true).
+	 * @param   boolean  $allowedHtml  Allow HTML tags in the output, and close any open tags (default: true).
+	 * @param   string   $expected     The expected result.
+	 *
+	 * @return  void
+	 *
+	 * @since         3.1
+	 * @dataProvider  getTestTruncateData
+	 */
+	public function testTruncate($text, $length, $noSplit, $allowedHtml, $expected)
+	{
+		$this->assertEquals($expected, JHtmlString::truncate($text, $length, $noSplit, $allowedHtml));
+	}
+
+	/**
+	 * Tests the JHtmlString::truncateComplex method.
+	 *
+	 * @param   string   $html       The text to truncate.
+	 * @param   integer  $maxLength  The maximum length of the text.
+	 * @param   boolean  $noSplit    Don't split a word if that is where the cutoff occurs (default: true)
+	 * @param   string   $expected   The expected result.
+	 *
+	 * @return  void
+	 *
+	 * @since         3.1
+	 * @dataProvider  getTestTruncateComplexData
+	 */
+	public function testTruncateComplex($html, $maxLength, $noSplit, $expected)
+	{
+		$this->assertEquals($expected, JHtmlString::truncateComplex($html, $maxLength, $noSplit));
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Html/JHtmlTelTest.php b/tests/Unit/Libraries/Cms/Html/JHtmlTelTest.php
new file mode 100644
index 0000000000000..f6d24d0c1d307
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Html/JHtmlTelTest.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Html;
+
+use JHtmlTel;
+use Joomla\Tests\Unit\UnitTestCase;
+
+
+/**
+ * Test class for JHtmlTel.
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Html
+ * @since       3.1
+ */
+class JHtmlTelTest extends UnitTestCase
+{
+	/**
+	 * Tests the JHtmlTel::tel method.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public function testTel()
+	{
+		$this->assertThat(
+			JHtmlTel::tel('1.9419555555', 'US'),
+			$this->StringContains('(941) 955-5555'),
+			'Testing for US format'
+		);
+
+		$this->assertThat(
+			JHtmlTel::tel('49.15123456789', 'EPP'),
+			$this->StringContains('+49.15123456789'),
+			'Testing for EPP format'
+		);
+
+		$this->assertThat(
+			JHtmlTel::tel('82.12345678', 'ITU-T'),
+			$this->StringContains('+82 12 34 56 78'),
+			'Testing for ITU-T format'
+		);
+
+		$this->assertThat(
+			JHtmlTel::tel('1.9413216789', 'ARPA'),
+			$this->StringContains('+9.8.7.6.1.2.3.1.4.9.1.e164.arpa'),
+			'Testing for ARPA format'
+		);
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Layout/BaseLayoutTest.php b/tests/Unit/Libraries/Cms/Layout/BaseLayoutTest.php
new file mode 100644
index 0000000000000..f6580a1487750
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Layout/BaseLayoutTest.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * @package        Joomla.UnitTest
+ * @subpackage     Layout
+ *
+ * @copyright      Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license        GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Layout;
+
+use Joomla\CMS\Layout\BaseLayout;
+use Joomla\Registry\Registry;
+use Joomla\Tests\Unit\UnitTestCase;
+
+class BaseLayoutTest extends UnitTestCase
+{
+	/**
+	 * @var BaseLayout
+	 */
+	protected $baseLayout;
+
+	/**
+	 * Sets up the test by instantiating BaseLayout
+	 * This method is called before a test is executed.
+	 */
+	protected function setUp()
+	{
+		$this->baseLayout = new BaseLayout;
+
+		parent::setUp();
+	}
+
+	/**
+	 * This method is called after a test is executed.
+	 */
+	protected function tearDown()
+	{
+		unset($this->baseLayout);
+
+		parent::tearDown();
+	}
+
+	/**
+	 * @testdox  BaseLayout->setOptions() returns a BaseLayout instance with empty parameter.
+	 *
+	 * @since    3.3.7
+	 */
+	public function testSetOptionsReturnsInstanceWithEmptyParameters()
+	{
+		$this->assertInstanceOf(BaseLayout::class, $this->baseLayout->setOptions());
+	}
+
+	/**
+	 * @testdox  BaseLayout->setOptions() returns a BaseLayout instance with JRegistry parameter.
+	 *
+	 * @since    3.3.7
+	 */
+	public function testSetOptionsReturnsInstanceWithRegistryParameter()
+	{
+		$registry = $this->createMock(Registry::class);
+
+		$this->assertInstanceOf(BaseLayout::class, $this->baseLayout->setOptions($registry));
+	}
+
+	/**
+	 * @testdox  BaseLayout->setOptions() returns a BaseLayout instance with an array parameter.
+	 *
+	 * @since    3.3.7
+	 */
+	public function testSetOptionsReturnsInstanceWithAnArrayParameter()
+	{
+		$this->assertInstanceOf(BaseLayout::class, $this->baseLayout->setOptions([]));
+	}
+
+	/**
+	 * @testdox  BaseLayout->getOptions() returns a JRegistry object when options parameter is empty.
+	 *
+	 * @since    3.3.7
+	 */
+	public function testGetOptionsReturnsAnEmptyRegistryObject()
+	{
+		$options = $this->baseLayout->getOptions();
+
+		$this->assertInstanceOf(Registry::class, $options);
+		$this->assertEmpty($options->toArray());
+	}
+
+	/**
+	 * @testdox  BaseLayout->getOptions() returns a JRegistry object when options parameter is an array.
+	 *
+	 * @since    3.3.7
+	 */
+	public function testGetOptionsReturnsAnRegistryObjectWhenOptionsIsArray()
+	{
+		$this->baseLayout->setOptions([]);
+
+		$options = $this->baseLayout->getOptions();
+
+		$this->assertInstanceOf(Registry::class, $options);
+	}
+
+	/**
+	 * @testdox  BaseLayout->getOptions() returns a JRegistry object when options parameter is a JRegistry object.
+	 *
+	 * @since    3.3.7
+	 */
+	public function testGetOptionsReturnsARegistryObjectWhenOptionsParameterIsRegistryObject()
+	{
+		$registry = $this->createMock(Registry::class);
+		$this->baseLayout->setOptions($registry);
+
+		$options = $this->baseLayout->getOptions();
+
+		$this->assertInstanceOf(Registry::class, $options);
+	}
+
+	/**
+	 * @testdox  BaseLayout->resetOptions() and check options is empty.
+	 *
+	 * @since    3.3.7
+	 */
+	public function testResetOptions()
+	{
+		$this->baseLayout->setOptions(['not' => 'empty']);
+
+		$this->baseLayout->resetOptions();
+
+		$this->assertEmpty($this->baseLayout->getOptions()->toArray());
+	}
+
+	/**
+	 * Tests the escape method.
+	 *
+	 * @since   3.3.7
+	 */
+	public function testEscapingSpecialCharactersIntoHtmlEntities()
+	{
+		$this->assertThat(
+			$this->baseLayout->escape('&'),
+			$this->equalTo('&amp;'),
+			'Test the ampersand is converted to HTML code'
+		);
+
+		$this->assertThat(
+			$this->baseLayout->escape('"'),
+			$this->equalTo('&quot;'),
+			'Test the double quote is converted to HTML code'
+		);
+
+		$this->assertThat(
+			$this->baseLayout->escape("'"),
+			$this->equalTo("&#039;"),
+			'Test the single quote is converted to HTML code'
+		);
+
+		$this->assertThat(
+			$this->baseLayout->escape("<a href='test'>Test</a>"),
+			$this->equalTo("&lt;a href=&#039;test&#039;&gt;Test&lt;/a&gt;"),
+			'Test the characters <> are not converted'
+		);
+	}
+
+	/**
+	 * Test the adding of debug messages.
+	 *
+	 * @since   3.3.7
+	 */
+	public function testAddDebugMessageToTheQueue()
+	{
+		$message = 'Unit Test';
+
+		$this->baseLayout->addDebugMessage($message);
+
+		$messages = $this->baseLayout->getDebugMessages();
+
+		$this->assertCount(1, $messages);
+		$this->assertEquals($message, $messages[0]);
+	}
+
+	/**
+	 * @testdox  JLayoutBase->getDebugMessages() retrieves a list of debug messages in an array.
+	 *
+	 * @since    3.3.7
+	 */
+	public function testRetrievingTheListOfDebugMessagesIsAnArray()
+	{
+		$this->assertInternalType('array', $this->baseLayout->getDebugMessages());
+	}
+
+	/**
+	 * @testdox  JLayoutBase->renderDebugMessages() returns debug message
+	 *
+	 * @since    3.3.7
+	 */
+	public function testRenderDebugMessageReturnsDebugMessage()
+	{
+		$this->baseLayout->addDebugMessage('Debug message 1');
+
+		$this->assertEquals("Debug message 1", $this->baseLayout->renderDebugMessages());
+	}
+
+	/**
+	 * @testdox  JLayoutBase->renderDebugMessages() returns string of messages separated by newline character.
+	 *
+	 * @since    3.3.7
+	 */
+	public function testRenderDebugMessageReturnsStringOfMessagesSeparatedByNewlineCharacter()
+	{
+		$this->baseLayout->addDebugMessage('Debug message 1');
+		$this->baseLayout->addDebugMessage('Debug message 2');
+
+		$this->assertEquals("Debug message 1\nDebug message 2", $this->baseLayout->renderDebugMessages());
+	}
+
+	/**
+	 * @testdox  JLayoutBase->render() returns an empty string.
+	 *
+	 * @since    3.3.7
+	 */
+	public function testRenderReturnsAnEmptyString()
+	{
+		$this->assertEquals('', $this->baseLayout->render('Data'), 'BaseLayout::render does not render an output');
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Mail/MailHelperTest.php b/tests/Unit/Libraries/Cms/Mail/MailHelperTest.php
new file mode 100644
index 0000000000000..c43cd0489cd03
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Mail/MailHelperTest.php
@@ -0,0 +1,288 @@
+<?php
+/**
+ * @package    Joomla.UnitTest
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Mail;
+
+use Joomla\CMS\Mail\MailHelper;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for JMailHelper.
+ * Generated by PHPUnit on 2011-10-26 at 19:33:00.
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Mail
+ * @since       1.7.0
+ */
+class MailHelperTest extends UnitTestCase
+{
+	/**
+	 * Test data for testCleanLine method
+	 *
+	 * @return  array
+	 *
+	 * @since   3.0.0
+	 */
+	public function dataCleanLine(): array
+	{
+		return [
+			["test\n\nme\r\r", 'testme'],
+			["test%0Ame", 'testme'],
+			["test%0Dme", 'testme']
+		];
+	}
+
+	/**
+	 * Test for the JMailHelper::cleanLine method.
+	 *
+	 * @param   string  $input     The input to clean
+	 * @param   string  $expected  The expected result
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0.0
+	 *
+	 * @dataProvider  dataCleanLine
+	 */
+	public function testCleanLine($input, $expected)
+	{
+		$this->assertEquals($expected, MailHelper::cleanLine($input));
+	}
+
+	/**
+	 * Test data for testCleanText method
+	 *
+	 * @return  array
+	 *
+	 * @since   3.0.0
+	 */
+	public function dataCleanText(): array
+	{
+		return [
+			["test\nme", "test\nme"],
+			["test%0AconTenT-Type:me", 'testme'],
+			["test%0Dcontent-type:me", 'testme'],
+			["test\ncontent-type:me", 'testme'],
+			["test\n\ncontent-type:me", 'testme'],
+			["test\rcontent-type:me", 'testme'],
+			["test\r\rcontent-type:me", 'testme'],
+			// @TODO Should this be included array("test\r\ncoNTent-tYPe:me", 'testme'),
+
+			["test%0Ato:me", 'testme'],
+			["test%0DTO:me", 'testme'],
+			["test\nTo:me", 'testme'],
+			["test\n\ntO:me", 'testme'],
+			["test\rto:me", 'testme'],
+			["test\r\rto:me", 'testme'],
+			// @TODO Should this be included array("test\r\nto:me", 'testme'),
+
+			["test%0Acc:me", 'testme'],
+			["test%0DCC:me", 'testme'],
+			["test\nCc:me", 'testme'],
+			["test\n\ncC:me", 'testme'],
+			["test\rcc:me", 'testme'],
+			["test\r\rcc:me", 'testme'],
+			// @TODO Should this be included array("test\r\ncc:me", 'testme'),
+
+			["test%0Abcc:me", 'testme'],
+			["test%0DBCC:me", 'testme'],
+			["test\nBCc:me", 'testme'],
+			["test\n\nbcC:me", 'testme'],
+			["test\rbcc:me", 'testme'],
+			["test\r\rbcc:me", 'testme'],
+			// @TODO Should this be included array("test\r\nbcc:me", 'testme'),
+		];
+	}
+
+	/**
+	 * Test for the JMailHelper::cleanText method.
+	 *
+	 * @param   string  $input     The input to clean
+	 * @param   string  $expected  The expected result
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0.0
+	 *
+	 * @dataProvider  dataCleanText
+	 */
+	public function testCleanText($input, $expected)
+	{
+		$this->assertEquals($expected, MailHelper::cleanText($input));
+	}
+
+	/**
+	 * Test data for testCleanBody method
+	 *
+	 * @return  array
+	 *
+	 * @since   3.0.0
+	 */
+	public function dataCleanBody(): array
+	{
+		return [
+			["testFrom: Foobar me", "test me"],
+			["testfrom: Foobar me", "testfrom: Foobar me"],
+			["testTo: Foobar me", "test me"],
+			["testto: Foobar me", "testto: Foobar me"],
+			["testCc: Foobar me", "test me"],
+			["testcc: Foobar me", "testcc: Foobar me"],
+			["testBcc: Foobar me", "test me"],
+			["testbcc: Foobar me", "testbcc: Foobar me"],
+			["testSubject: Foobar me", "test me"],
+			["testsubject: Foobar me", "testsubject: Foobar me"],
+			["testContent-type: Foobar me", "test me"],
+			["testcontent-type: Foobar me", "testcontent-type: Foobar me"]
+			// @TODO should this be case sensitive
+		];
+	}
+
+	/**
+	 * Test for the JMailHelper::cleanBody method.
+	 *
+	 * @param   string  $input     The input to clean
+	 * @param   string  $expected  The expected result
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0.0
+	 *
+	 * @dataProvider  dataCleanBody
+	 */
+	public function testCleanBody($input, $expected)
+	{
+		$this->assertEquals($expected, MailHelper::cleanBody($input));
+	}
+
+	/**
+	 * Test data for testCleanSubject method
+	 *
+	 * @return  array
+	 *
+	 * @since   3.0.0
+	 */
+	public function dataCleanSubject(): array
+	{
+		return [
+			["testFrom: Foobar me", "test me"],
+			["testfrom: Foobar me", "testfrom: Foobar me"],
+			["testTo: Foobar me", "test me"],
+			["testto: Foobar me", "testto: Foobar me"],
+			["testCc: Foobar me", "test me"],
+			["testcc: Foobar me", "testcc: Foobar me"],
+			["testBcc: Foobar me", "test me"],
+			["testbcc: Foobar me", "testbcc: Foobar me"],
+			["testContent-type: Foobar me", "test me"],
+			["testcontent-type: Foobar me", "testcontent-type: Foobar me"],
+			// @TODO should this be case sensitive
+		];
+	}
+
+	/**
+	 * Test for the JMailHelper::cleanSubject method.
+	 *
+	 * @param   string  $input     The input to clean
+	 * @param   string  $expected  The expected result
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0.0
+	 *
+	 * @dataProvider  dataCleanSubject
+	 */
+	public function testCleanSubject($input, $expected)
+	{
+		$this->assertEquals($expected, MailHelper::cleanSubject($input));
+	}
+
+	/**
+	 * Test data for testCleanAddress method
+	 *
+	 * @return  array
+	 *
+	 * @since   3.0.0
+	 */
+	public function dataCleanAddress(): array
+	{
+		return [
+			["testme", "testme"],
+			["test me", "test me"],
+			["test;me", "test;me"],
+			["test,me", "test,me"],
+			["test ;,me", false],
+		];
+	}
+
+	/**
+	 * Test for the JMailHelper::cleanAddress method.
+	 *
+	 * @param   string  $input     The input to clean
+	 * @param   string  $expected  The expected result
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0.0
+	 *
+	 * @dataProvider  dataCleanAddress
+	 */
+	public function testCleanAddress($input, $expected)
+	{
+		$this->assertEquals($expected, MailHelper::cleanAddress($input));
+	}
+
+	/**
+	 * Test data for testIsEmailAddress method
+	 *
+	 * @return  array
+	 *
+	 * @since   3.0.0
+	 */
+	public function dataIsEmailAddress(): array
+	{
+		return [
+			["joe", false],
+			["joe@home", true],
+			["a@b.c", true],
+			["joe@home.com", true],
+			["joe.bob@home.com", true],
+			["joe-bob[at]home.com", false],
+			["joe@his.home.com", true],
+			["joe@his.home.place", true],
+			["joe@home.org", true],
+			["joe@joebob.name", true],
+			["joe.@bob.com", false],
+			[".joe@bob.com", false],
+			["joe<>bob@bob.come", false],
+			["joe&bob@bob.com", true],
+			["joebob@bob.edu.co", true],
+			["~joe@bob.com", true],
+			["joe..bob@bob.com", false],
+			["joe$@bob.com", true],
+			["joe+bob@bob.com", true],
+			["o'reilly@there.com", true],
+			["o’reilly@there.com", false]
+		];
+	}
+
+	/**
+	 * Test for the JMailHelper::isEmailAddress method.
+	 *
+	 * @param   string  $input     The input to clean
+	 * @param   string  $expected  The expected result
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0.0
+	 *
+	 * @dataProvider  dataIsEmailAddress
+	 */
+	public function testIsEmailAddress($input, $expected)
+	{
+		$this->assertEquals($expected, MailHelper::isEmailAddress($input));
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Mail/MailTest.php b/tests/Unit/Libraries/Cms/Mail/MailTest.php
new file mode 100644
index 0000000000000..4c7f65c5f3e9d
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Mail/MailTest.php
@@ -0,0 +1,279 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Mail
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Mail;
+
+use Joomla\CMS\Mail\Mail;
+use Joomla\Tests\Unit\UnitTestCase;
+use PHPMailer\PHPMailer\PHPMailer;
+
+/**
+ * Test class for JMail.
+ * Generated by PHPUnit on 2011-10-26 at 19:32:59.
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Mail
+ * @since       1.7.0
+ */
+class MailTest extends UnitTestCase
+{
+	/**
+	 * @var Mail
+	 */
+	protected $mail;
+
+	/**
+	 * This method is called before a test is executed.
+	 *
+	 * @return void
+	 */
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->mail = new Mail;
+	}
+
+	/**
+	 * This method is called after a test is executed.
+	 *
+	 * @return void
+	 */
+	protected function tearDown()
+	{
+		unset($this->mail);
+
+		parent::tearDown();
+	}
+
+	/**
+	 * Provides test data for request format detection.
+	 *
+	 * @return array
+	 */
+	public function seedTestAdd(): array
+	{
+		// Recipient, name, $expected
+		return [
+			// Single emails and name
+			['test@example.com', 'test_name',
+				[
+					['test@example.com', 'test_name']
+				]
+			],
+			// Multiple emails with same name
+			[
+				['test_1@example.com', 'test_2@example.com'], 'test_name',
+				[
+					['test_1@example.com', 'test_name'], ['test_2@example.com', 'test_name']
+				]
+			],
+			// Multiple emails with individual names
+			[
+				['test_1@example.com', 'test_2@example.com'],
+				['test_name1', 'test_name2'],
+				[
+					['test_1@example.com', 'test_name1'],
+					['test_2@example.com', 'test_name2']
+				]
+			]
+		];
+	}
+
+	/**
+	 * Tests the addRecipient method.
+	 *
+	 * @covers  Mail::addRecipient
+	 *
+	 * @dataProvider  seedTestAdd
+	 */
+	public function testAddRecipient($recipient, $name, $expected)
+	{
+		$this->mail->addRecipient($recipient, $name);
+
+		$this->assertEquals($expected, $this->mail->getToAddresses());
+	}
+
+	/**
+	 * Tests the addCC method.
+	 *
+	 * @covers  Mail::addCc
+	 *
+	 * @dataProvider  seedTestAdd
+	 */
+	public function testAddCc($recipient, $name, $expected)
+	{
+		$this->mail->addCc($recipient, $name);
+
+		$this->assertEquals($expected, $this->mail->getCcAddresses());
+	}
+
+	/**
+	 * Tests the addBCC method.
+	 *
+	 * @covers  Mail::addBcc
+	 *
+	 * @dataProvider  seedTestAdd
+	 */
+	public function testAddBcc($recipient, $name, $expected)
+	{
+		$this->mail->addBcc($recipient, $name);
+
+		$this->assertEquals($expected, $this->mail->getBccAddresses());
+	}
+
+	/**
+	 * Provides test data for request format detection.
+	 *
+	 * @return array
+	 */
+	public function seedTestAddReplyTo(): array
+	{
+		// Recipient, name, $expected
+		return [
+			// Single emails and name
+			['test@example.com', 'test_name',
+				['test@example.com' => ['test@example.com', 'test_name']]
+			],
+			// Multiple emails with same name
+			[
+				['test_1@example.com', 'test_2@example.com'], 'test_name',
+				[
+					'test_1@example.com' => ['test_1@example.com', 'test_name'],
+					'test_2@example.com' => ['test_2@example.com', 'test_name']
+				]
+			],
+			// Multiple emails with individual names
+			[
+				['test_1@example.com', 'test_2@example.com'],
+				['test_name1', 'test_name2'],
+				[
+					'test_1@example.com' => ['test_1@example.com', 'test_name1'],
+					'test_2@example.com' => ['test_2@example.com', 'test_name2']
+				]
+			]
+		];
+	}
+
+	/**
+	 * Tests the addReplyTo method.
+	 *
+	 * @covers  JMail::addReplyTo
+	 *
+	 * @dataProvider  seedTestAddReplyTo
+	 */
+	public function testAddReplyTo($recipient, $name, $expected)
+	{
+		$this->mail->addReplyTo($recipient, $name);
+
+		$this->assertEquals($expected, $this->mail->getReplyToAddresses());
+	}
+
+	/**
+	 * Test the addAttachment method
+	 *
+	 * @return void
+	 */
+	public function testAddAttachment()
+	{
+		$path = __FILE__;
+		$name = basename(__FILE__);
+
+		$this->mail->addAttachment($path, $name);
+
+		$mailAttachments = $this->mail->GetAttachments();
+
+		$this->assertCount(1, $mailAttachments);
+		$this->assertEquals($path, $mailAttachments[0][0]);
+		$this->assertEquals($name, $mailAttachments[0][2]);
+	}
+
+	/**
+	 * Tests the IsHTML method.
+	 *
+	 * @covers  JMail::IsHTML
+	 *
+	 * @return void
+	 */
+	public function testIsHtmlTrue()
+	{
+		$this->mail->isHtml(true);
+
+		$this->assertEquals(PHPMailer::CONTENT_TYPE_TEXT_HTML, $this->mail->ContentType);
+	}
+
+	/**
+	 * Tests the IsHTML method.
+	 *
+	 * @covers  JMail::IsHTML
+	 *
+	 * @return void
+	 */
+	public function testIsHtmlFalse()
+	{
+		$this->mail->isHtml(false);
+
+		$this->assertEquals(PHPMailer::CONTENT_TYPE_PLAINTEXT, $this->mail->ContentType);
+	}
+
+	/**
+	 * Test data for testUseSMTP method
+	 *
+	 * @return  array
+	 *
+	 * @since   3.0.0
+	 */
+	public function dataUseSmtp(): array
+	{
+		return [
+			'SMTP without Authentication' => [
+				null,
+				'example.com',
+				null,
+				null,
+				false,
+				null,
+				[
+					'called' => 'IsSMTP',
+					'return' => true
+				]
+			]
+		];
+	}
+
+	/**
+	 * Test for the JMail::useSMTP method.
+	 *
+	 * @param   string   $auth      SMTP Authentication
+	 * @param   string   $host      SMTP Host
+	 * @param   string   $user      SMTP Username
+	 * @param   string   $pass      SMTP Password
+	 * @param   string   $secure    Use secure methods
+	 * @param   integer  $port      The SMTP port
+	 * @param   string   $expected  The expected result
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0.0
+	 *
+	 * @dataProvider  dataUseSMTP
+	 */
+	public function testUseSmtp($auth, $host, $user, $pass, $secure, $port, $expected)
+	{
+		// Build an partial mock object.
+		$mailMock = $this->getMockBuilder(Mail::class)
+					->setMethods(['SetLanguage', 'IsSMTP', 'IsMail'])
+					->getMock();
+		$mailMock
+			->expects($this->once())
+			->method($expected['called']);
+
+		$this->assertEquals($expected['return'], $mailMock->useSmtp($auth, $host, $user, $pass, $secure, $port));
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Microdata/MicrodataTest.php b/tests/Unit/Libraries/Cms/Microdata/MicrodataTest.php
new file mode 100644
index 0000000000000..5b1f11554003d
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Microdata/MicrodataTest.php
@@ -0,0 +1,1051 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Microdata
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Microdata;
+
+use Joomla\CMS\Microdata\Microdata;
+use Joomla\Tests\Unit\UnitTestCase;
+use ReflectionClass;
+
+/**
+ * Test class for JMicrodata
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Microdata
+ * @since       3.2
+ */
+class MicrodataTest extends UnitTestCase
+{
+
+	/**
+	 * Test the default settings
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function testDefaultType()
+	{
+		$microdata = new MicrodataStub;
+
+		$this->assertEquals('Thing', $microdata->getType());
+		$this->assertTrue($microdata->isEnabled());
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testOverrideTypeDuringConstruction()
+	{
+		$type         = 'some-type';
+		$expectedType = ucfirst(trim($type));
+		$microdata    = new MicrodataStub('some-type', true, [$expectedType => []]);
+
+		$this->assertEquals($expectedType, $microdata->getType());
+		$this->assertTrue($microdata->isEnabled());
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisableDuringConstruction()
+	{
+		$microdata = new MicrodataStub('', false);
+
+		$this->assertFalse($microdata->isEnabled());
+	}
+
+	/**
+	 * Test the setType() function
+	 *
+	 * @since   3.2
+	 */
+	public function testSetType()
+	{
+		$type      = 'Article';
+		$microdata = new MicrodataStub('', true, [$type => []]);
+
+		$microdata->setType($type);
+
+		// Test if the current Type is 'Article'
+		$this->assertEquals($type, $microdata->getType());
+	}
+
+	/**
+	 * Test the setType() function
+	 *
+	 * @since   3.2
+	 */
+	public function testSetInvalidTypeSetsDefaultType()
+	{
+		$type      = 'Article';
+		$microdata = new MicrodataStub;
+
+		$microdata->setType($type);
+
+		$this->assertEquals('Thing', $microdata->getType());
+	}
+
+	/**
+	 * Test the fallback() function
+	 *
+	 * @since   3.2
+	 */
+	public function testFallback()
+	{
+		$microdata = new MicrodataStub('', true, [
+			'Article' => [
+				'properties' => [
+					'articleBody' => []
+				]
+			]
+		]);
+
+		// Test fallback values
+		$microdata->fallback('Article', 'articleBody');
+		$this->assertEquals('Article', $microdata->getFallbackType());
+		$this->assertEquals('articleBody', $microdata->getFallbackProperty());
+	}
+
+	/**
+	 * Test the fallback() function
+	 *
+	 * @since   4.0
+	 */
+	public function testFallbackWithNotExistingProperty()
+	{
+		$microdata = new MicrodataStub('', true, [
+			'Article' => [
+				'extends'    => '',
+				'properties' => [
+					'articleBody' => []
+				]
+			]
+		]);
+
+		// Test if the Fallback Property fallbacks when it isn't available in the $Type
+		$microdata->fallback('Article', 'anUnavailableProperty');
+		$this->assertEquals('Article', $microdata->getFallbackType());
+		$this->assertNull($microdata->getFallbackProperty());
+	}
+
+	/**
+	 * Test the fallback() function
+	 *
+	 * @since   4.0
+	 */
+	public function testFallbackWithNotExistingTypeAndProperty()
+	{
+		$microdata = new MicrodataStub('', true, []);
+
+		// Test if the Fallback Type fallbacks to the 'Thing' Type
+		$microdata->fallback('anUnavailableType', 'anUnavailableProperty');
+		$this->assertEquals('Thing', $microdata->getFallbackType());
+		$this->assertNull($microdata->getFallbackProperty());
+	}
+
+	/**
+	 * Test the display() function
+	 *
+	 * @since   3.2
+	 */
+	public function testDisplayIsEmptyByDefault()
+	{
+		// Test display() with all null params
+		$microdata = new MicrodataStub;
+
+		$this->assertEquals('', $microdata->display());
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplayResetsParams()
+	{
+		$content   = 'Some Content';
+		$microdata = new MicrodataStub;
+
+		$microdata->setType('Article')
+			->content($content)
+			->property('name')
+			->fallback('Thing', 'url')
+			->display();
+
+		$this->assertNull($microdata->getFallbackProperty());
+		$this->assertNull($microdata->getFallbackType());
+		$this->assertNull($microdata->getProperty());
+		$this->assertNull($microdata->getContent());
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplaySimple()
+	{
+		$microdata = new MicrodataStub('Article', true, [
+			'Article' => [
+				'properties' => [
+					'url' => [
+						'expectedTypes' => ['URL']
+					]
+				]
+			]
+		]);
+
+		// Test for a simple display
+		$html = $microdata
+			->property('url')
+			->display();
+
+		$this->assertEquals("itemprop='url'", $html);
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplaySimpleWithContent()
+	{
+		$content   = 'Some Content';
+		$microdata = new MicrodataStub('Article', true, [
+			'Article' => [
+				'properties' => [
+					'url' => [
+						'expectedTypes' => ['URL']
+					]
+				]
+			]
+		]);
+
+		// Test for a simple display
+		$html = $microdata
+			->property('url')
+			->content($content)
+			->display();
+
+		$this->assertEquals("<span itemprop='url'>$content</span>", $html);
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplaySimpleWithEmptyContent()
+	{
+		$content   = '';
+		$microdata = new MicrodataStub('Article', true, [
+			'Article' => [
+				'properties' => [
+					'url' => [
+						'expectedTypes' => ['URL']
+					]
+				]
+			]
+		]);
+
+		// Test for a simple display
+		$html = $microdata
+			->property('url')
+			->content($content)
+			->display();
+
+		$this->assertEquals("<span itemprop='url'>$content</span>", $html);
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplayNested()
+	{
+		$microdata = new MicrodataStub('Article', true, [
+			'Article' => [
+				'properties' => [
+					'author' => [
+						'expectedTypes' => ['Organization', 'Person']
+					]
+				]
+			]
+		]);
+
+		// Test for a simple display
+		$html = $microdata
+			->property('author')
+			->display();
+
+		$this->assertEquals("itemprop='author' itemscope itemtype='https://schema.org/Organization'", $html);
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplayNestedWithContent()
+	{
+		$content   = 'some content';
+		$microdata = new MicrodataStub('Article', true, [
+			'Article' => [
+				'properties' => [
+					'author' => [
+						'expectedTypes' => ['Organization', 'Person']
+					]
+				]
+			]
+		]);
+
+		// Test for a simple display
+		$html = $microdata
+			->property('author')
+			->content($content)
+			->display();
+
+		$this->assertEquals("<span itemprop='author' itemscope itemtype='https://schema.org/Organization'>$content</span>",
+			$html);
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplayNestedWithContentAndFallback()
+	{
+		$content   = 'some content';
+		$microdata = new MicrodataStub('Article', true, [
+			'Article' => [
+				'properties' => [
+					'author' => [
+						'expectedTypes' => [
+							'Organization',
+							'Person'
+						]
+					]
+				]
+			],
+			'Person'  => [
+				'properties' => [
+					'name' => [
+						'expectedTypes' => ['Text']
+					]
+				]
+			]
+		]);
+
+		// Test for a simple display
+		$html = $microdata
+			->fallback('Person', 'name')
+			->property('author')
+			->content($content)
+			->display();
+
+		$this->assertEquals("<span itemprop='author' itemscope itemtype='https://schema.org/Person'><span itemprop='name'>$content</span></span>",
+			$html);
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplayNestedWithFallback()
+	{
+		$microdata = new MicrodataStub('Article', true, [
+			'Article' => [
+				'properties' => [
+					'author' => [
+						'expectedTypes' => [
+							'Organization',
+							'Person'
+						]
+					]
+				]
+			],
+			'Person'  => [
+				'properties' => [
+					'name' => [
+						'expectedTypes' => ['Text']
+					]
+				]
+			]
+		]);
+
+		// Test for a simple display
+		$html = $microdata
+			->fallback('Person', 'name')
+			->property('author')
+			->display();
+
+		$this->assertEquals("itemprop='author' itemscope itemtype='https://schema.org/Person' itemprop='name'", $html);
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplayMeta()
+	{
+		$microdata = new MicrodataStub('Article', true, [
+			'Article' => [
+				'properties' => [
+					'datePublished' => [
+						'expectedTypes' => [
+							'Date',
+						]
+					]
+				]
+			],
+		]);
+
+		// Test for a simple display
+		$html = $microdata
+			->property('datePublished')
+			->display();
+
+		$this->assertEquals("itemprop='datePublished'", $html);
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplayMetaWithContent()
+	{
+		$content   = '01 January 2011';
+		$microdata = new MicrodataStub('Article', true, [
+			'Article' => [
+				'properties' => [
+					'datePublished' => [
+						'expectedTypes' => [
+							'Date',
+						]
+					]
+				]
+			],
+		]);
+
+		// Test for a simple display
+		$html = $microdata
+			->property('datePublished')
+			->content($content)
+			->display();
+
+		$this->assertEquals("<meta itemprop='datePublished' content='$content'>$content", $html);
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplayMetaWithHumanAndMashineContent()
+	{
+		$content        = '01 January 2011';
+		$machineContent = "2011-01-01T00:00:00+00:00";
+		$microdata      = new MicrodataStub('Article', true, [
+			'Article' => [
+				'properties' => [
+					'datePublished' => [
+						'expectedTypes' => [
+							'Date',
+						]
+					]
+				]
+			],
+		]);
+
+		// Test for a simple display
+		$html = $microdata
+			->property('datePublished')
+			->content($content, $machineContent)
+			->display();
+
+		$this->assertEquals("<meta itemprop='datePublished' content='$machineContent'>$content", $html);
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplayMetaReturnsEmptyStringWhenPropertyDoesNotExist()
+	{
+		$microdata = new MicrodataStub('Article', true, [
+			'Article' => [
+				'extends'    => '',
+				'properties' => [],
+			],
+		]);
+
+		// Test for a simple display
+		$html = $microdata
+			->content('en-GB')
+			->property('doesNotExist')
+			->display('meta', true);
+
+		$this->assertEmpty($html);
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplayContentWhenDisabled()
+	{
+		$content   = 'Some Content';
+		$microdata = new MicrodataStub('Article', false, []);
+
+		// Test for a simple display
+		$html = $microdata
+			->content($content)
+			->fallback('Article', 'about')
+			->property('datePublished')
+			->display();
+
+		$this->assertEquals($content, $html);
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplayMetaContentWhenDisabled()
+	{
+		$microdata = new MicrodataStub('Article', false, []);
+
+		// Test for a simple display
+		$html = $microdata
+			->content('en-GB')
+			->property('inLanguage')
+			->fallback('Language', 'name')
+			->display('meta', true);
+
+		$this->assertEmpty($html);
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplayFallbackForNotExistingProperties()
+	{
+		$microdata = new MicrodataStub('Article', true, [
+			'Article' => [
+				'extends'    => '',
+				'properties' => [
+					'about' => [
+						'expectedTypes' => [
+							'Thing',
+						]
+					]
+				]
+			]
+		]);
+
+		// Test for a simple display
+		$html = $microdata
+			->property('notExisting')
+			->fallback('Article', 'about')
+			->display();
+
+		$this->assertEquals("itemscope itemtype='https://schema.org/Article' itemprop='about'", $html);
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplayFallbackForNotExistingPropertiesWithContent()
+	{
+		$content   = 'Some content';
+		$microdata = new MicrodataStub('Article', true, [
+			'Article' => [
+				'extends'    => '',
+				'properties' => [
+					'about' => [
+						'expectedTypes' => [
+							'Thing',
+						]
+					]
+				]
+			]
+		]);
+
+		// Test for a simple display
+		$html = $microdata
+			->content($content)
+			->property('notExisting')
+			->fallback('Article', 'about')
+			->display();
+
+		$this->assertEquals("<span itemscope itemtype='https://schema.org/Article'><span itemprop='about'>$content</span></span>",
+			$html);
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplayFallbackForNotExistingPropertiesAndFallbacks()
+	{
+		$microdata = new MicrodataStub('Article', true, [
+			'Article' => [
+				'extends'    => '',
+				'properties' => []
+			]
+		]);
+
+		// Test for a simple display
+		$html = $microdata
+			->property('notExisting')
+			->fallback('Article', 'notExisting')
+			->display();
+
+		$this->assertEquals("itemscope itemtype='https://schema.org/Article'", $html);
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplayFallbackWhenThePropertyDoesNotExistInTheType()
+	{
+		$microdata = new MicrodataStub('Article', true, [
+			'Article' => [
+				'extends'    => 'Thing',
+				'properties' => []
+			],
+			'Thing'   => [
+				'extends'    => '',
+				'properties' => [
+					'datePublished' => [
+						'expectedTypes' => ['Date']
+					]
+				]
+			]
+		]);
+
+		// Test without $content if fallbacks, the $Property isn't available in the current $Type
+		$html = $microdata
+			->property('notExisting')
+			->fallback('Article', 'datePublished')
+			->display();
+
+		$this->assertEquals("itemscope itemtype='https://schema.org/Article' itemprop='datePublished'", $html);
+	}
+
+	/**
+	 * @since   4.0
+	 */
+	public function testDisplayFallbackWithContentWhenThePropertyDoesNotExistInTheType()
+	{
+		$content   = 'Some content';
+		$microdata = new MicrodataStub('Article', true, [
+			'Article' => [
+				'extends'    => 'Thing',
+				'properties' => []
+			],
+			'Thing'   => [
+				'extends'    => '',
+				'properties' => [
+					'datePublished' => [
+						'expectedTypes' => ['Date']
+					]
+				]
+			]
+		]);
+
+		// Test for a simple display
+		$html = $microdata
+			->content($content)
+			->property('notExisting')
+			->fallback('Article', 'datePublished')
+			->display();
+
+		$this->assertEquals("<meta itemscope itemtype='https://schema.org/Article' itemprop='datePublished' content='$content'>",
+			$html);
+	}
+
+	/**
+	 * @since 4.0
+	 *
+	 * @return array
+	 */
+	public function displayTypes(): array
+	{
+		return [
+			['inline', "itemprop='datePublished'"],
+			['div', "<div itemprop='datePublished'></div>"],
+			['span', "<span itemprop='datePublished'></span>"],
+			['meta', "<meta itemprop='datePublished' content=''>"],
+		];
+	}
+
+	/**
+	 * @param $type
+	 * @param $expected
+	 *
+	 * @since        4.0
+	 *
+	 * @dataProvider displayTypes
+	 */
+	public function testDisplayTypes($type, $expected)
+	{
+		$microdata = new MicrodataStub('Article', true, [
+			'Article' => [
+				'extends'    => 'Thing',
+				'properties' => [
+					'datePublished' => [
+						'expectedTypes' => ['Date']
+					]
+				]
+			]
+		]);
+
+		// Test for a simple display
+		$html = $microdata
+			->property('datePublished')
+			->display($type);
+
+		$this->assertEquals($expected, $html);
+	}
+
+	/**
+	 * @since 4.0
+	 *
+	 * @return array
+	 */
+	public function displayTypesWithContent(): array
+	{
+		return [
+			['inline', 'Some content', "itemprop='datePublished'"],
+			['div', 'Some content', "<div itemprop='datePublished'>Some content</div>"],
+			['span', 'Some content', "<span itemprop='datePublished'>Some content</span>"],
+			['meta', 'Some content', "<meta itemprop='datePublished' content='Some content'>"],
+		];
+	}
+
+	/**
+	 * @param $type
+	 * @param $content
+	 * @param $expected
+	 *
+	 * @since        4.0
+	 *
+	 * @dataProvider displayTypesWithContent
+	 */
+	public function testDisplayTypesWithContent($type, $content, $expected)
+	{
+		$microdata = new MicrodataStub('Article', true, [
+			'Article' => [
+				'extends'    => 'Thing',
+				'properties' => [
+					'datePublished' => [
+						'expectedTypes' => ['Date']
+					]
+				]
+			]
+		]);
+
+		// Test for a simple display
+		$html = $microdata
+			->content($content)
+			->property('datePublished')
+			->display($type);
+
+		$this->assertEquals($expected, $html);
+	}
+
+	/**
+	 * Test the isTypeAvailable() function
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function testIsTypeAvailable()
+	{
+		$this->assertTrue(MicrodataStub::isTypeAvailable('Article'));
+		$this->assertFalse(MicrodataStub::isTypeAvailable('DoesNotExist'));
+	}
+
+	/**
+	 * Test the isPropertyInType() function
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function testIsPropertyInType()
+	{
+		MicrodataStub::setTypes([
+			'Article' => [
+				'extends'    => '',
+				'properties' => [
+					'datePublished' => [
+						'expectedTypes' => ['Date']
+					]
+				]
+			]
+		]);
+
+		$this->assertTrue(MicrodataStub::isPropertyInType('Article', 'datePublished'));
+		$this->assertFalse(MicrodataStub::isPropertyInType('Article', 'aPropertyThatDoesNotExist'));
+		$this->assertFalse(MicrodataStub::isPropertyInType('aTypeThatDoesNotExist', 'aPropertyThatDoesNotExist'));
+	}
+
+	/**
+	 * Test the expectedDisplayType() function
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function testExpectedDisplayType()
+	{
+		$microdata = new MicrodataStub;
+		$microdata::setTypes([
+			'Article' => [
+				'extends'    => '',
+				'properties' => [
+					'articleBody'   => [
+						'expectedTypes' => ['Text']
+					],
+					'about'         => [
+						'expectedTypes' => ['Thing']
+					],
+					'datePublished' => [
+						'expectedTypes' => ['Date']
+					]
+				]
+			]
+		]);
+
+		// Use reflection to test protected method (its easier than testing this using the public interface)
+		$reflectionClass = new ReflectionClass($microdata);
+		$method          = $reflectionClass->getMethod('getExpectedDisplayType');
+		$method->setAccessible(true);
+
+		$this->assertEquals('normal', $method->invoke($microdata, 'Article', 'articleBody'));
+		$this->assertEquals('nested', $method->invoke($microdata, 'Article', 'about'));
+		$this->assertEquals('meta', $method->invoke($microdata, 'Article', 'datePublished'));
+	}
+
+	/**
+	 * Test the displayScope() function
+	 *
+	 * @since   3.2
+	 */
+	public function testDisplayScope()
+	{
+		$type      = 'Article';
+		$microdata = new MicrodataStub($type, true, [
+			'Article' => [
+				'extends'    => '',
+				'properties' => []
+			]
+		]);
+
+		$this->assertEquals("itemscope itemtype='https://schema.org/$type'", $microdata->displayScope());
+	}
+
+	/**
+	 * Test the displayScope() function
+	 *
+	 * @since   3.2
+	 */
+	public function testDisplayScopeIsEmptyWhenDisabled()
+	{
+		$type      = 'Article';
+		$microdata = new MicrodataStub($type, false);
+
+		$this->assertEquals("", $microdata->displayScope());
+	}
+
+	/**
+	 * Test the getAvailableTypes() function
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function testGetAvailableTypes()
+	{
+		$microdata = new MicrodataStub;
+		$microdata::setTypes([
+			'Article' => [
+				'extends'    => '',
+				'properties' => [
+					'articleBody'   => [
+						'expectedTypes' => ['Text']
+					],
+					'about'         => [
+						'expectedTypes' => ['Thing']
+					],
+					'datePublished' => [
+						'expectedTypes' => ['Date']
+					]
+				]
+			]
+		]);
+
+		$types = $microdata::getAvailableTypes();
+
+		$this->assertCount(1, $types);
+		$this->assertEquals('Article', $types[0]);
+	}
+
+	/**
+	 * Test the static htmlMeta() function
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function testHtmlMeta()
+	{
+		$scope    = 'Article';
+		$content  = 'anything';
+		$property = 'datePublished';
+
+		// Test with all params
+		$this->assertEquals(
+			"<meta itemscope itemtype='https://schema.org/$scope' itemprop='$property' content='$content'>",
+			MicrodataStub::htmlMeta($content, $property, $scope)
+		);
+
+		// Test with the $inverse mode
+		$this->assertEquals(
+			"<meta itemprop='$property' itemscope itemtype='https://schema.org/$scope' content='$content'>",
+			MicrodataStub::htmlMeta($content, $property, $scope, true)
+		);
+
+		// Test without the $scope
+		$this->assertEquals(
+			"<meta itemprop='$property' content='$content'>",
+			MicrodataStub::htmlMeta($content, $property)
+		);
+	}
+
+	/**
+	 * Test the htmlDiv() function
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function testHtmlDiv()
+	{
+		// Setup
+		$scope    = 'Article';
+		$content  = 'microdata';
+		$property = 'about';
+
+		// Test with all params
+		$this->assertEquals(
+			"<div itemscope itemtype='https://schema.org/$scope' itemprop='$property'>$content</div>",
+			MicrodataStub::htmlDiv($content, $property, $scope)
+
+		);
+
+		// Test with the $inverse mode
+		$this->assertEquals(
+			"<div itemprop='$property' itemscope itemtype='https://schema.org/$scope'>$content</div>",
+			MicrodataStub::htmlDiv($content, $property, $scope, true)
+
+		);
+
+		// Test without the $scope
+		$this->assertEquals(
+			"<div itemprop='$property'>$content</div>",
+			MicrodataStub::htmlDiv($content, $property)
+
+		);
+
+		// Test without the $property
+		$this->assertEquals(
+			"<div itemprop='$property' itemscope itemtype='https://schema.org/$scope'>$content</div>",
+			MicrodataStub::htmlDiv($content, $property, $scope, true)
+
+		);
+
+		// Test without the $scope, $property
+		$this->assertEquals(
+			"<div>$content</div>",
+			MicrodataStub::htmlDiv($content)
+		);
+	}
+
+	/**
+	 * Test the htmlSpan() function
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function testHtmlSpan()
+	{
+		// Setup
+		$scope    = 'Article';
+		$content  = 'anything';
+		$property = 'about';
+
+		// Test with all params
+		$this->assertEquals(
+			"<span itemscope itemtype='https://schema.org/$scope' itemprop='$property'>$content</span>",
+			MicrodataStub::htmlSpan($content, $property, $scope)
+		);
+
+		// Test with the inverse mode
+		$this->assertEquals(
+			"<span itemprop='$property' itemscope itemtype='https://schema.org/$scope'>$content</span>",
+			MicrodataStub::htmlSpan($content, $property, $scope, true)
+		);
+
+		// Test without the $scope
+		$this->assertEquals(
+			"<span itemprop='$property'>$content</span>",
+			MicrodataStub::htmlSpan($content, $property)
+		);
+
+		// Test without the $property
+		$this->assertEquals(
+			"<span itemprop='$property' itemscope itemtype='https://schema.org/$scope'>$content</span>",
+			MicrodataStub::htmlSpan($content, $property, $scope, true)
+
+		);
+
+		// Test without the $scope, $property
+		$this->assertEquals(
+			"<span>$content</span>",
+			MicrodataStub::htmlSpan($content)
+		);
+	}
+
+}
+
+class MicrodataStub extends Microdata
+{
+	/**
+	 * MicrodataStub constructor.
+	 *
+	 * Set the types to avoid file_get_contents
+	 *
+	 * @param string $type
+	 * @param bool   $flag
+	 * @param array  $types
+	 */
+	public function __construct($type = '', $flag = true, $types = [])
+	{
+		self::$types = $types;
+
+		parent::__construct($type, $flag);
+	}
+
+	/**
+	 * Public test helper to set the types
+	 *
+	 * @param $types
+	 */
+	public static function setTypes($types)
+	{
+		self::$types = $types;
+	}
+
+	/**
+	 * Override the loadTypes methid
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0
+	 */
+	protected static function loadTypes()
+	{
+		// DO nothing, use the already loaded types to avoid filesystem access during tests
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Object/CMSObjectTest.php b/tests/Unit/Libraries/Cms/Object/CMSObjectTest.php
new file mode 100644
index 0000000000000..3d6b3476c08fd
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Object/CMSObjectTest.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Base
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Object;
+
+use Exception;
+use Joomla\CMS\Object\CMSObject;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for JObject.
+ * Generated by PHPUnit on 2009-09-24 at 17:15:16.
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Object
+ * @since       1.7.0
+ */
+class CMSObjectTest extends UnitTestCase
+{
+	/**
+	 * Tests the object constructor.
+	 *
+	 * @group     JObject
+	 * @covers    JObject::__construct
+	 * @return void
+	 */
+	public function testIsConstructable()
+	{
+		$object = new CMSObject(['property1' => 'value1', 'property2' => 5]);
+
+		$this->assertEquals('value1', $object->get('property1'));
+	}
+
+	/**
+	 * Tests setting the default for a property of the object.
+	 *
+	 * @group     JObject
+	 * @covers    JObject::def
+	 * @return void
+	 */
+	public function testDef()
+	{
+		$object = new CMSObject;
+
+		$object->def("check");
+		$this->assertEquals(null, $object->def("check"));
+		$object->def("check", "paint");
+		$object->def("check", "forced");
+		$this->assertEquals("paint", $object->def("check"));
+		$this->assertNotEquals("forced", $object->def("check"));
+	}
+
+	/**
+	 * Tests getting a property of the object.
+	 *
+	 * @group     JObject
+	 * @covers    JObject::get
+	 * @return void
+	 */
+	public function testGet()
+	{
+		$object = new CMSObject;
+
+		$object->goo = 'car';
+		$this->assertEquals('car', $object->get('goo', 'fudge'));
+		$this->assertEquals('fudge', $object->get('foo', 'fudge'));
+		$this->assertNotEquals(null, $object->get('foo', 'fudge'));
+		$this->assertNull($object->get('boo'));
+	}
+
+	/**
+	 * Tests getting the properties of the object.
+	 *
+	 * @group     JObject
+	 * @covers    JObject::getProperties
+	 * @return void
+	 */
+	public function testGetProperties()
+	{
+		$object = new CMSObject([
+			'_privateproperty1' => 'valuep1',
+			'property1'         => 'value1',
+			'property2'         => 5
+		]);
+		$this->assertEquals(
+			[
+				'_errors'           => [],
+				'_privateproperty1' => 'valuep1',
+				'property1'         => 'value1',
+				'property2'         => 5
+			],
+			$object->getProperties(false),
+			'Should get all properties, including private ones'
+		);
+		$this->assertEquals(
+			[
+				'property1' => 'value1',
+				'property2' => 5
+			],
+			$object->getProperties(),
+			'Should get all public properties'
+		);
+	}
+
+	/**
+	 * Tests getting a single error.
+	 *
+	 * @group     JObject
+	 * @covers    JObject::getError
+	 * @return void
+	 */
+	public function testGetError()
+	{
+		$object = new CMSObject;
+
+		$object->setError(1234);
+		$object->setError('Second Test Error');
+		$object->setError('Third Test Error');
+		$this->assertEquals(
+			1234,
+			$object->getError(0, false),
+			'Should return the test error as number'
+		);
+		$this->assertEquals(
+			'Second Test Error',
+			$object->getError(1),
+			'Should return the second test error'
+		);
+		$this->assertEquals(
+			'Third Test Error',
+			$object->getError(),
+			'Should return the third test error'
+		);
+		$this->assertFalse(
+			$object->getError(20),
+			'Should return false, since the error does not exist'
+		);
+
+		$exception = new Exception('error');
+		$object->setError($exception);
+		$this->assertThat(
+			$object->getError(3, true),
+			$this->equalTo('error')
+		);
+	}
+
+	/**
+	 * Tests getting the array of errors.
+	 *
+	 * @group     JObject
+	 * @covers    JObject::getErrors
+	 * @return void
+	 */
+	public function testGetErrors()
+	{
+		$object = new CMSObject;
+
+		$errors = [1234, 'Second Test Error', 'Third Test Error'];
+
+		foreach ($errors as $error)
+		{
+			$object->setError($error);
+		}
+		$this->assertAttributeEquals(
+			$object->getErrors(),
+			'_errors',
+			$object
+		);
+		$this->assertEquals(
+			$errors,
+			$object->getErrors(),
+			'Should return every error set'
+		);
+	}
+
+	/**
+	 * Tests setting a property.
+	 *
+	 * @group     JObject
+	 * @covers    JObject::set
+	 * @return void
+	 */
+	public function testSet()
+	{
+		$object = new CMSObject;
+
+		$this->assertEquals(null, $object->set("foo", "imintheair"));
+		$this->assertEquals("imintheair", $object->set("foo", "nojibberjabber"));
+		$this->assertEquals("nojibberjabber", $object->foo);
+	}
+
+	/**
+	 * Tests setting multiple properties.
+	 *
+	 * @group     JObject
+	 * @covers    JObject::setProperties
+	 * @return void
+	 */
+	public function testSetProperties()
+	{
+		$object = new CMSObject;
+		$a = ["foo" => "ghost", "knife" => "stewie"];
+		$f = "foo";
+
+		$this->assertEquals(true, $object->setProperties($a));
+		$this->assertEquals(false, $object->setProperties($f));
+		$this->assertEquals("ghost", $object->foo);
+		$this->assertEquals("stewie", $object->knife);
+	}
+
+	/**
+	 * Tests setting an error.
+	 *
+	 * @group     JObject
+	 * @covers    JObject::setError
+	 * @return void
+	 */
+	public function testSetError()
+	{
+		$object = new CMSObject;
+		$object->setError('A Test Error');
+		$this->assertAttributeEquals(
+			array('A Test Error'),
+			'_errors',
+			$object
+		);
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Toolbar/Button/CustomButtonTest.php b/tests/Unit/Libraries/Cms/Toolbar/Button/CustomButtonTest.php
new file mode 100644
index 0000000000000..4ff607ff2af7b
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Toolbar/Button/CustomButtonTest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package	    Joomla.UnitTest
+ * @subpackage  Toolbar
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license	    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Toolbar\Button;
+
+use Joomla\CMS\Toolbar\Button\CustomButton;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for CustomButton.
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Toolbar
+ * @since       3.0
+ */
+class CustomButtonTest extends UnitTestCase
+{
+	/**
+	 * Tests the fetchButton method
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testFetchButton()
+	{
+		$button = new CustomButton;
+		$html = '<div class="custom-button"><a href="#">My Custom Button</a></div>';
+
+		$this->assertEquals($html, $button->fetchButton('Custom', $html));
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/Toolbar/ToolbarTest.php b/tests/Unit/Libraries/Cms/Toolbar/ToolbarTest.php
new file mode 100644
index 0000000000000..251df8942386e
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Toolbar/ToolbarTest.php
@@ -0,0 +1,295 @@
+<?php
+/**
+ * @package        Joomla.UnitTest
+ * @subpackage     Toolbar
+ *
+ * @copyright      Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license        GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms\Toolbar;
+
+use InvalidArgumentException;
+use Joomla\CMS\Toolbar\Toolbar;
+use Joomla\CMS\Toolbar\ToolbarButton;
+use Joomla\CMS\Toolbar\ToolbarFactoryInterface;
+
+/**
+ * Test class for Toolbar.
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Toolbar
+ * @since       3.0
+ */
+class ToolbarTest extends \PHPUnit\Framework\TestCase
+{
+	/**
+	 * Tests the constructor
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testIsConstructable()
+	{
+		$this->assertInstanceOf(Toolbar::class, $this->createToolbar());
+	}
+
+	/**
+	 * Tests the appendButton method
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testAppendButtonWithToolbarButtonReturnsButton()
+	{
+		$toolbar = $this->createToolbar();
+
+		$button = $this->createMock(ToolbarButton::class);
+		$button->expects($this->once())
+			->method('setParent')
+			->with($toolbar);
+
+		$this->assertEquals($button, $toolbar->appendButton($button));
+	}
+
+	/**
+	 * Tests the appendButton method
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testAppendButtonWithStringsReturnsTrue()
+	{
+		$toolbar = $this->createToolbar();
+
+		$this->assertTrue($toolbar->appendButton('Separator', 'divider'));
+	}
+
+	/**
+	 * Tests the getItems method
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testGetItemsReturnsArray()
+	{
+		$toolbar = $this->createToolbar();
+
+		$this->assertTrue(is_array($toolbar->getItems()));
+	}
+
+	/**
+	 * Tests the getItems method
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testGetItemsReturnsButtons()
+	{
+		$toolbar = $this->createToolbar();
+		$button1 = $this->createMock(ToolbarButton::class);
+		$button2 = $this->createMock(ToolbarButton::class);
+
+		$toolbar->appendButton($button1);
+		$toolbar->appendButton($button2);
+
+		$buttons = $toolbar->getItems();
+
+		$this->assertCount(2, $buttons);
+		$this->assertEquals($button1, $buttons[0]);
+		$this->assertEquals($button2, $buttons[1]);
+	}
+
+	/**
+	 * Tests the prependButton method
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testPrependButtonWithToolbarButton()
+	{
+		$toolbar = $this->createToolbar();
+		$toolbar->setItems([
+			$this->createMock(ToolbarButton::class),
+			$this->createMock(ToolbarButton::class),
+		]);
+
+		$button = $this->createMock(ToolbarButton::class);
+		$button->expects($this->once())
+			->method('setParent')
+			->with($toolbar);
+
+		$this->assertEquals($button, $toolbar->prependButton($button));
+		$this->assertEquals($button, $toolbar->getItems()[0]);
+	}
+
+	/**
+	 * Tests the prependButton method
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testPrependButtonWithStrings()
+	{
+		$toolbar = $this->createToolbar();
+		$toolbar->setItems([
+			$this->createMock(ToolbarButton::class),
+			$this->createMock(ToolbarButton::class),
+		]);
+
+		$button = ['Separator', 'spacer', 25];
+
+		$this->assertTrue($toolbar->prependButton(...$button));
+		$this->assertEquals($button, $toolbar->getItems()[0]);
+	}
+
+	public function testRenderButton()
+	{
+		$button     = ['Separator', 'spacer'];
+		$renderedButton = 'some-html';
+		$buttonMock = $this->createMock(ToolbarButton::class);
+		$buttonMock
+			->expects($this->once())
+			->method('setParent');
+		$buttonMock
+			->expects($this->once())
+			->method('render')
+			->with($button)
+			->willReturn($renderedButton);
+		$toolbarFactoryMock = $this->createMock(ToolbarFactoryInterface::class);
+		$toolbarFactoryMock
+			->expects($this->once())
+			->method('createButton')
+			->willReturn($buttonMock);
+
+		$toolbar = new Toolbar('my-toolbar', $toolbarFactoryMock);
+
+		$this->assertEquals($renderedButton, $toolbar->renderButton($button));
+	}
+
+	/**
+	 * @expectedException \UnexpectedValueException
+	 */
+	public function testRenderButtonThrowsUnexpectedValueException()
+	{
+		$button     = ['Separator', 'spacer'];
+		$toolbarFactoryMock = $this->createMock(ToolbarFactoryInterface::class);
+		$toolbarFactoryMock
+			->expects($this->once())
+			->method('createButton')
+			->willThrowException(new InvalidArgumentException);
+
+		$toolbar = new Toolbar('my-toolbar', $toolbarFactoryMock);
+
+		$toolbar->renderButton($button);
+	}
+
+	/**
+	 * Tests Load a button
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testLoadButtonTypeReturnsButton()
+	{
+		$buttonMock         = $this->createMock(ToolbarButton::class);
+		$toolbarFactoryMock = $this->createMock(ToolbarFactoryInterface::class);
+		$toolbarFactoryMock
+			->expects($this->once())
+			->method('createButton')
+			->willReturn($buttonMock);
+
+		$toolbar = new Toolbar('my-toolbar', $toolbarFactoryMock);
+
+		$this->assertEquals($buttonMock, $toolbar->loadButtonType('Separator'));
+	}
+
+	/**
+	 * Tests Load a button
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testLoadButtonTypeRetunsFalseForUnkownButtonTypes()
+	{
+		$toolbarFactoryMock = $this->createMock(ToolbarFactoryInterface::class);
+		$toolbarFactoryMock
+			->expects($this->once())
+			->method('createButton')
+			->willThrowException(new InvalidArgumentException);
+
+		$toolbar = new Toolbar('my-toolbar', $toolbarFactoryMock);
+
+		$this->assertFalse($toolbar->loadButtonType('INVALID'));
+	}
+
+	/**
+	 * Tests the addButtonPath method with an array parameter
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testAddButtonPathWithArray()
+	{
+		$toolbar = $this->createToolbar();
+
+		$initialValue = $toolbar->getButtonPath();
+		$initialCount = count($initialValue);
+		$toolbar->addButtonPath(['MyTestPath1', 'MyTestPath2']);
+		$newValue = $toolbar->getButtonPath();
+
+		$this->assertEquals('MyTestPath2' . DIRECTORY_SEPARATOR, $newValue[0]);
+		$this->assertEquals('MyTestPath1' . DIRECTORY_SEPARATOR, $newValue[1]);
+		for ($i = 0; $i < $initialCount; $i++)
+		{
+			$this->assertEquals($initialValue[$i], $newValue[$i+2]);
+		}
+	}
+
+	/**
+	 * Tests the addButtonPath method with a string parameter
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testAddButtonPathWithString()
+	{
+		$toolbar = $this->createToolbar();
+
+		$initialValue = $toolbar->getButtonPath();
+		$initialCount = count($initialValue);
+		$toolbar->addButtonPath('MyTestPath');
+		$newValue = $toolbar->getButtonPath();
+
+		$this->assertEquals('MyTestPath' . DIRECTORY_SEPARATOR, $newValue[0]);
+		for ($i = 0; $i < $initialCount; $i++)
+		{
+			$this->assertEquals($initialValue[$i], $newValue[$i + 1]);
+		}
+	}
+
+	/**
+	 * Helper function to create a toolbar
+	 *
+	 * @param string $name
+	 *
+	 * @return Toolbar
+	 */
+	protected function createToolbar($name = 'my-toolbar'): Toolbar
+	{
+		$toolbarFactoryMock = $this->createMock(ToolbarFactoryInterface::class);
+
+		return new Toolbar($name, $toolbarFactoryMock);
+	}
+}
diff --git a/tests/Unit/Libraries/Cms/VersionTest.php b/tests/Unit/Libraries/Cms/VersionTest.php
new file mode 100644
index 0000000000000..28495c8ecc85c
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/VersionTest.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * @package	    Joomla.UnitTest
+ * @subpackage  Version
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license	    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Tests\Unit\Libraries\Cms;
+
+use Joomla\CMS\Version;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for Version.
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Version
+ * @since       3.0
+ */
+class VersionTest extends UnitTestCase
+{
+	/**
+	 * @var    Version
+	 * @since  3.0
+	 */
+	protected $version;
+
+	/**
+	 * Sets up the fixture, for example, opens a network connection.
+	 * This method is called before a test is executed.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	protected function setUp()
+	{
+		$this->version = new Version;
+	}
+
+	/**
+	 * Overrides the parent tearDown method.
+	 *
+	 * @return  void
+	 *
+	 * @see     \PHPUnit\Framework\TestCase::tearDown()
+	 * @since   3.6
+	 */
+	protected function tearDown()
+	{
+		unset($this->version);
+		parent::tearDown();
+	}
+
+	/**
+	 * Tests the isCompatible method
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testIsCompatible()
+	{
+		$this->assertTrue($this->version->isCompatible('2.5'));
+	}
+
+	/**
+	 * Tests the getHelpVersion method
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testGetHelpVersion()
+	{
+		$this->assertInternalType('string', $this->version->getHelpVersion());
+	}
+
+	/**
+	 * Tests the getShortVersion method
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testGetShortVersion()
+	{
+		$this->assertEquals(JVERSION, $this->version->getShortVersion());
+	}
+
+	/**
+	 * Tests the getLongVersion method
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testGetLongVersion()
+	{
+		$this->assertInternalType('string', $this->version->getLongVersion());
+	}
+
+	/**
+	 * Tests the getUserAgent method for a mask not containing the Mozilla version string
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testGetUserAgentForMaskNotContainingMozillaVersion()
+	{
+		$this->assertNotContains('Mozilla/5.0 ', $this->version->getUserAgent('', false, true));
+	}
+
+	/**
+	 * Tests the getUserAgent method for a mask containing the Mozilla version string
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testGetUserAgentForMaskContainingMozillaVersion()
+	{
+		$this->assertContains('Mozilla/5.0 ', $this->version->getUserAgent('', true, true));
+	}
+
+	/**
+	 * Tests the getUserAgent method for a null component string
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testGetUserAgentForEmptyComponentString()
+	{
+		$this->assertContains('Framework', $this->version->getUserAgent('', false, true));
+	}
+
+	/**
+	 * Tests the getUserAgent method for a component string matching the specified option
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function testGetUserAgentForComponentMatchingTheSpecifiedOption()
+	{
+		$this->assertContains('Component_test', $this->version->getUserAgent('Component_test', false, true));
+	}
+}
diff --git a/tests/Unit/README.md b/tests/Unit/README.md
new file mode 100644
index 0000000000000..39f0a9d6e13b7
--- /dev/null
+++ b/tests/Unit/README.md
@@ -0,0 +1,11 @@
+# Unit Tests for Joomla 4.0
+
+This folder contains the unit tests for the Joomla CMS. The tests are run with phpunit and the actual tests.
+
+## How to run the tests
+
+When you are checking out the current development branch of 4.0 and run `composer install`, your system is automatically set up to run the tests. The steps thus are the following:
+
+1. Checkout the current Joomla 4.0 development branch from Github. (https://github.com/joomla/joomla-cms.git Branch `4.0-dev`)
+2. Run `composer install` in the root of your checkout.
+3. Run `libraries/vendor/bin/phpunit`.
diff --git a/tests/Unit/UnitTestCase.php b/tests/Unit/UnitTestCase.php
new file mode 100644
index 0000000000000..a6a4fad61dbcd
--- /dev/null
+++ b/tests/Unit/UnitTestCase.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package    Joomla.UnitTest
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ * @link       http://www.phpunit.de/manual/current/en/installation.html
+ */
+
+namespace Joomla\Tests\Unit;
+
+/**
+ * Base Unit Test case for common behaviour across unit tests
+ */
+abstract class UnitTestCase extends \PHPUnit\Framework\TestCase
+{
+
+}
diff --git a/tests/Unit/bootstrap.php b/tests/Unit/bootstrap.php
new file mode 100644
index 0000000000000..450db1c7ac901
--- /dev/null
+++ b/tests/Unit/bootstrap.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Prepares a minimalist framework for unit testing.
+ *
+ * @package    Joomla.UnitTest
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ * @link       http://www.phpunit.de/manual/current/en/installation.html
+ */
+
+define('_JEXEC', 1);
+
+// Maximise error reporting.
+ini_set('zend.ze1_compatibility_mode', '0');
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
+// Set fixed precision value to avoid round related issues
+ini_set('precision', 14);
+
+/*
+ * Ensure that required path constants are defined.  These can be overridden within the phpunit.xml file
+ * if you chose to create a custom version of that file.
+ */
+$rootDirectory = getcwd();
+
+if (!defined('JPATH_BASE'))
+{
+	define('JPATH_BASE', $rootDirectory);
+}
+if (!defined('JPATH_ROOT'))
+{
+	define('JPATH_ROOT', JPATH_BASE);
+}
+if (!defined('JPATH_PLATFORM'))
+{
+	define('JPATH_PLATFORM', JPATH_BASE . '/libraries');
+}
+if (!defined('JPATH_LIBRARIES'))
+{
+	define('JPATH_LIBRARIES', JPATH_BASE . '/libraries');
+}
+if (!defined('JPATH_CACHE'))
+{
+	define('JPATH_CACHE', JPATH_BASE . '/cache');
+}
+if (!defined('JPATH_CONFIGURATION'))
+{
+	define('JPATH_CONFIGURATION', JPATH_BASE);
+}
+if (!defined('JPATH_SITE'))
+{
+	define('JPATH_SITE', JPATH_ROOT);
+}
+if (!defined('JPATH_ADMINISTRATOR'))
+{
+	define('JPATH_ADMINISTRATOR', JPATH_ROOT . '/administrator');
+}
+if (!defined('JPATH_INSTALLATION'))
+{
+	define('JPATH_INSTALLATION', JPATH_ROOT . '/installation');
+}
+if (!defined('JPATH_MANIFESTS'))
+{
+	define('JPATH_MANIFESTS', JPATH_ADMINISTRATOR . '/manifests');
+}
+if (!defined('JPATH_PLUGINS'))
+{
+	define('JPATH_PLUGINS', JPATH_BASE . '/plugins');
+}
+if (!defined('JPATH_THEMES'))
+{
+	define('JPATH_THEMES', JPATH_BASE . '/templates');
+}
+if (!defined('JDEBUG'))
+{
+	define('JDEBUG', false);
+}
+
+// Import the library loader if necessary.
+if (!class_exists('JLoader'))
+{
+	require_once JPATH_PLATFORM . '/loader.php';
+
+	// If JLoader still does not exist panic.
+	if (!class_exists('JLoader'))
+	{
+		throw new RuntimeException('Joomla Platform not loaded.');
+	}
+}
+
+// Setup the autoloaders.
+JLoader::setup();
+
+// Register the library base path for CMS libraries.
+JLoader::registerPrefix('J', JPATH_PLATFORM . '/cms', false, true);
+
+// Create the Composer autoloader
+/** @var \Composer\Autoload\ClassLoader $loader */
+$loader = require JPATH_LIBRARIES . '/vendor/autoload.php';
+$loader->unregister();
+
+// Decorate Composer autoloader
+spl_autoload_register([new JClassLoader($loader), 'loadClass'], true, true);
+
+// Register the class aliases for Framework classes that have replaced their Platform equivilents
+require_once JPATH_LIBRARIES . '/classmap.php';
+
+// Define the Joomla version if not already defined.
+defined('JVERSION') or define('JVERSION', (new JVersion)->getShortVersion());
diff --git a/tests/javascript/joomla-switcher/fixtures/fixture.html b/tests/javascript/joomla-switcher/fixtures/fixture.html
new file mode 100644
index 0000000000000..c10a6afa1688c
--- /dev/null
+++ b/tests/javascript/joomla-switcher/fixtures/fixture.html
@@ -0,0 +1,6 @@
+<div id="basic-switch">
+    <joomla-field-switcher id="jform_sef" off-text="No" on-text="Yes" type="success">
+        <input name="switcher" id="sw1" value="0" type="radio" checked>
+        <input name="switcher" id="sw2" value="1" type="radio">
+    </joomla-field-switcher>
+</div>
diff --git a/tests/javascript/joomla-switcher/joomla-switcher.spec.js b/tests/javascript/joomla-switcher/joomla-switcher.spec.js
new file mode 100644
index 0000000000000..e7593a0e36509
--- /dev/null
+++ b/tests/javascript/joomla-switcher/joomla-switcher.spec.js
@@ -0,0 +1,68 @@
+/**
+ * @package     Joomla.Tests
+ * @subpackage  JavaScript Tests
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * @since       4.0.0
+ * @version     1.0.0
+ */
+describe('Joomla switcher tests', () => {
+  // Set up the script
+  beforeEach(() => {
+    fixture.setBase('tests/javascript/joomla-switcher')
+    html_fixture = fixture.load('fixtures/fixture.html');
+    window.fix = html_fixture[0];
+  });
+
+  afterEach(() => {
+    fixture.cleanup();
+  });
+
+  describe('Joomla switcher first option preselected', () => {
+    it('Should have a constructor name: JoomlaSwitcherElement', () => {
+      const switcher = fix.querySelector('joomla-field-switcher');
+      expect(switcher.constructor.name).toBe('JoomlaSwitcherElement');
+    });
+
+    it('Joomla switcher have 5 spans inside', () => {
+      console.log(fix)
+      const switcher = fix.querySelector('joomla-field-switcher');
+      const container = switcher.querySelector('fieldset.switcher');
+      const spans = [].slice.call(switcher.querySelectorAll('span'));
+      expect(spans.length).toBe(4) && expect(container.length).toBe(1);
+    });
+
+    it('Joomla switcher have 1st span with aria-checked true', () => {
+      const switcher = fix.querySelector('joomla-field-switcher');
+      const container = switcher.querySelector('fieldset.switcher');
+      expect(container.getAttribute('aria-checked')).toBe('true');
+    });
+
+    it('Joomla switcher have 1st span to have class active', () => {
+      const switcher = fix.querySelector('joomla-field-switcher');
+      const span = switcher.querySelector('span.switcher-label-0');
+      expect(span.classList.contains('active')).toBe(true);
+    });
+
+    it('Joomla switcher have 2nd span not to have class active', () => {
+      const switcher = fix.querySelector('joomla-field-switcher');
+      const span = switcher.querySelector('span.switcher-label-1');
+      expect(span.classList.contains('active')).toBe(false);
+    });
+
+    it('Joomla switcher on click change state', () => {
+      const clickable = fix.querySelector('input#sw1');
+      const switcher = fix.querySelector('joomla-field-switcher');
+      const span0 = switcher.querySelector('span.switcher-label-0');
+      const span1 = switcher.querySelector('span.switcher-label-1');
+      const container = switcher.querySelector('fieldset.switcher');
+      clickable.click();
+      expect(container.getAttribute('aria-checked')).toBe('true');
+      expect(span0.classList.contains('active')).toBe(false);
+      expect(span1.classList.contains('active')).toBe(true);
+    });
+  });
+
+});
diff --git a/tests/javascript/karma.conf.js b/tests/javascript/karma.conf.js
new file mode 100644
index 0000000000000..0f4213473088d
--- /dev/null
+++ b/tests/javascript/karma.conf.js
@@ -0,0 +1,87 @@
+// Karma configuration
+module.exports = function (config) {
+  config.set({
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: __dirname.replace('tests/javascript', ''),
+
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['fixture', 'jasmine'],
+
+    //
+
+    // list of files / patterns to load in the browser
+    files: [
+      './**/fixtures/*.html',
+
+      // Include the webcomponents polyfills
+      { pattern: 'node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js', loaded: true, served: true, watch: false },
+      // Load web components polyfill
+      { pattern: 'media/vendor/webcomponentsjs/js/webcomponents-sd-ce-pf.js', loaded: true, served: true, watch: false },
+
+      // Load the files to test against
+      { pattern: 'media/system/css/fields/joomla-field-switcher.css', loaded: true, served: true, watch: false },
+      { pattern: 'media/system/js/fields/joomla-field-switcher-es5.js', loaded: true, served: true, watch: false },
+
+
+      // Load the tests definitions files
+      'tests/javascript/joomla-switcher/*.spec.js',
+
+    ],
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+    preprocessors: {
+      '**/system/js/*.js': ['coverage'],
+      '**/*.html': ['html2js'],
+      '**/*.json': ['json_fixtures'],
+    },
+
+    // coverage reporter configuration
+    coverageReporter: {
+      type: 'html',
+      dir: 'build/coverage-js/'
+    },
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ['verbose', 'progress', 'coverage'],
+
+    // web server port
+    port: 9876,
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.INFO,
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: true,
+
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    browsers: ['Firefox'],
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: false,
+
+    // list of plugins
+    plugins: [
+      'karma-fixture',
+      'karma-html2js-preprocessor',
+      'karma-json-fixtures-preprocessor',
+      'karma-jasmine',
+      'karma-firefox-launcher',
+      'karma-coverage',
+      'karma-verbose-reporter'
+    ],
+
+    // Concurrency level
+    // how many browser should be started simultaneous
+    concurrency: Infinity
+  });
+};